gdb: decouple toolchain and package, add special package for microblaze, looks cleaner to me

5 files changed, 6 insertions, 44 deletions

diff --git a/package/gdbserver/Makefile b/package/gdbserver/Makefile
index d2bfad2a9..d2b7ace8d 100644
--- a/package/gdbserver/Makefile
+++ b/package/gdbserver/Makefile
@@ -2,13 +2,18 @@
 # material, please see the LICENCE file in the top-level directory.
 
 include ${ADK_TOPDIR}/rules.mk
-include ${ADK_TOPDIR}/toolchain/gdb/Makefile.inc
 
 PKG_NAME:=		gdbserver
+PKG_VERSION:=		7.11.1
+PKG_RELEASE:=		1
+PKG_HASH:=		e9216da4e3755e9f414c1aa0026b626251dfc57ffe572a266e98da4f6988fc70
 PKG_DESCR:=		remote programm debugger utility
 PKG_SECTION:=		app/debug
+PKG_SITES:=		${MASTER_SITE_GNU:=gdb/}
 PKG_DEPENDS:=		libthread-db
+
 PKG_LIBC_DEPENDS:=	!musl
+PKG_ARCH_DEPENDS:=	!microblaze
 
 ifeq ($(ADK_TOOLCHAIN_GDB_6_7_1),y)
 DISTFILES:=		gdb-6.7.1-avr32-2.1.5.tar.bz2
diff --git a/package/gdbserver/patches/7.8.2/patch-gdb_common_linux-ptrace_c b/package/gdbserver/patches/7.8.2/patch-gdb_common_linux-ptrace_c
deleted file mode 100644
index aec39df40..000000000
--- a/package/gdbserver/patches/7.8.2/patch-gdb_common_linux-ptrace_c
+++ /dev/null
@@ -1,10 +0,0 @@
---- gdb-7.8.orig/gdb/common/linux-ptrace.c	2014-07-29 14:37:42.000000000 +0200
-+++ gdb-7.8/gdb/common/linux-ptrace.c	2014-09-05 00:52:41.353409084 +0200
-@@ -23,6 +23,7 @@
- #include <string.h>
- #endif
- 
-+#include <sched.h>
- #include "linux-ptrace.h"
- #include "linux-procfs.h"
- #include "nat/linux-waitpid.h"
diff --git a/package/gdbserver/patches/7.8.2/patch-gdb_common_linux-ptrace_h b/package/gdbserver/patches/7.8.2/patch-gdb_common_linux-ptrace_h
deleted file mode 100644
index 1f8e5b9b4..000000000
--- a/package/gdbserver/patches/7.8.2/patch-gdb_common_linux-ptrace_h
+++ /dev/null
@@ -1,11 +0,0 @@
---- gdb-7.8.orig/gdb/common/linux-ptrace.h	2014-07-29 14:37:42.000000000 +0200
-+++ gdb-7.8/gdb/common/linux-ptrace.h	2014-10-04 08:25:08.000000000 +0200
-@@ -23,7 +23,7 @@ struct buffer;
- #include <sys/ptrace.h>
- 
- #ifdef __UCLIBC__
--#if !(defined(__UCLIBC_HAS_MMU__) || defined(__ARCH_HAS_MMU__))
-+#if !defined(__UCLIBC_HAS_MMU__)
- /* PTRACE_TEXT_ADDR and friends.  */
- #include <asm/ptrace.h>
- #define HAS_NOMMU
diff --git a/package/gdbserver/patches/7.8.2/patch-gdb_gdbserver_linux-low_c b/package/gdbserver/patches/7.8.2/patch-gdb_gdbserver_linux-low_c
deleted file mode 100644
index ccb61c3a0..000000000
--- a/package/gdbserver/patches/7.8.2/patch-gdb_gdbserver_linux-low_c
+++ /dev/null
@@ -1,22 +0,0 @@
---- gdb-7.8.orig/gdb/gdbserver/linux-low.c	2014-07-29 14:37:42.000000000 +0200
-+++ gdb-7.8/gdb/gdbserver/linux-low.c	2014-09-05 00:47:25.427321525 +0200
-@@ -4933,15 +4933,15 @@ static int
- linux_read_offsets (CORE_ADDR *text_p, CORE_ADDR *data_p)
- {
-   unsigned long text, text_end, data;
--  int pid = lwpid_of (get_thread_lwp (current_inferior));
-+  int pid = lwpid_of (current_inferior);
- 
-   errno = 0;
- 
--  text = ptrace (PTRACE_PEEKUSER, pid, (PTRACE_TYPE_ARG3) PT_TEXT_ADDR,
-+  text = ptrace (PTRACE_PEEKUSER, pid, (PTRACE_TYPE_ARG3) (PT_TEXT_ADDR),
- 		 (PTRACE_TYPE_ARG4) 0);
--  text_end = ptrace (PTRACE_PEEKUSER, pid, (PTRACE_TYPE_ARG3) PT_TEXT_END_ADDR,
-+  text_end = ptrace (PTRACE_PEEKUSER, pid, (PTRACE_TYPE_ARG3) (PT_TEXT_END_ADDR),
- 		     (PTRACE_TYPE_ARG4) 0);
--  data = ptrace (PTRACE_PEEKUSER, pid, (PTRACE_TYPE_ARG3) PT_DATA_ADDR,
-+  data = ptrace (PTRACE_PEEKUSER, pid, (PTRACE_TYPE_ARG3) (PT_DATA_ADDR),
- 		 (PTRACE_TYPE_ARG4) 0);
- 
-   if (errno == 0)
diff --git a/package/gdbserver/patches/7.11.1/nommu.patch b/package/gdbserver/patches/nommu.patch
index 9db54501f..9db54501f 100644
--- a/package/gdbserver/patches/7.11.1/nommu.patch
+++ b/package/gdbserver/patches/nommu.patch