Merge branch 'master' of git+ssh://openadk.org/git/openadk

6 files changed, 41 insertions, 5 deletions

diff --git a/package/gdb/Makefile b/package/gdb/Makefile
index 85a40b195..3670f731e 100644
--- a/package/gdb/Makefile
+++ b/package/gdb/Makefile
@@ -6,7 +6,7 @@ include ${TOPDIR}/toolchain/gdb/Makefile.inc
 
 PKG_DESCR:=		GNU debugger
 PKG_SECTION:=		debug
-PKG_DEPENDS:=		libthread-db libncurses libiconv libexpat
+PKG_DEPENDS:=		libthread-db libncurses libiconv libexpat libgcc
 PKG_BUILDDEP:=		ncurses readline libiconv expat
 PKG_NOPARALLEL:=	1
 
@@ -18,6 +18,7 @@ $(eval $(call PKG_template,GDB,gdb,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},
 
 ifeq ($(ADK_STATIC),y)
 TARGET_CFLAGS+=         -static
+CONFIGURE_ARGS+=	--enable-static
 endif
 
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
@@ -27,14 +28,11 @@ CONFIGURE_ARGS+=	--without-uiout --enable-gdbmi \
 			--without-included-gettext --disable-sim \
 			--with-curses --disable-werror \
 			--disable-gdbserver \
-			--enable-static --without-python
+			--without-python
 XAKE_FLAGS+=		LDFLAGS='${TARGET_LDFLAGS}'
 # disable honour cflags stuff
 XAKE_FLAGS+=		GCC_HONOUR_COPTS:=s
 
-pre-build:
-	@-rm $(STAGING_TARGET_DIR)/lib/libiberty.a $(STAGING_TARGET_DIR)/usr/lib/libiberty.a
-
 post-install:
 	${INSTALL_DIR} ${IDIR_GDB}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/gdb ${IDIR_GDB}/usr/bin/
diff --git a/package/gdb/patches/patch-gdb_common_gdb_thread_db_h b/package/gdb/patches/patch-gdb_common_gdb_thread_db_h
index 12ab8ebaf..ddcea422f 100644
--- a/package/gdb/patches/patch-gdb_common_gdb_thread_db_h
+++ b/package/gdb/patches/patch-gdb_common_gdb_thread_db_h
@@ -1,3 +1,5 @@
+* added from https://github.com/rofl0r/sabotage
+
 --- gdb-7.6.orig/gdb/common/gdb_thread_db.h	2013-01-01 07:32:54.000000000 +0100
 +++ gdb-7.6/gdb/common/gdb_thread_db.h	2013-08-13 16:37:40.000000000 +0200
 @@ -1,17 +1,6 @@
diff --git a/package/gdb/patches/patch-gdb_common_linux-ptrace_h b/package/gdb/patches/patch-gdb_common_linux-ptrace_h
index cc6556d0a..51e2c3637 100644
--- a/package/gdb/patches/patch-gdb_common_linux-ptrace_h
+++ b/package/gdb/patches/patch-gdb_common_linux-ptrace_h
@@ -1,3 +1,5 @@
+* added from https://github.com/rofl0r/sabotage
+
 --- gdb-7.6.orig/gdb/common/linux-ptrace.h	2013-01-01 07:32:54.000000000 +0100
 +++ gdb-7.6/gdb/common/linux-ptrace.h	2013-08-13 17:10:13.000000000 +0200
 @@ -20,6 +20,7 @@
diff --git a/package/gdb/patches/patch-gdb_common_signals_c b/package/gdb/patches/patch-gdb_common_signals_c
index 666e37430..114f5b867 100644
--- a/package/gdb/patches/patch-gdb_common_signals_c
+++ b/package/gdb/patches/patch-gdb_common_signals_c
@@ -1,3 +1,5 @@
+* added from https://github.com/rofl0r/sabotage
+
 --- gdb-7.5.orig/gdb/common/signals.c	2012-05-24 18:51:37.000000000 +0200
 +++ gdb-7.5/gdb/common/signals.c	2012-10-01 14:44:23.000000000 +0200
 @@ -346,6 +346,8 @@ gdb_signal_from_host (int hostsig)
diff --git a/package/gdb/patches/patch-gdb_linux-nat_c b/package/gdb/patches/patch-gdb_linux-nat_c
index 50ba9bf6c..9ba7254ca 100644
--- a/package/gdb/patches/patch-gdb_linux-nat_c
+++ b/package/gdb/patches/patch-gdb_linux-nat_c
@@ -1,3 +1,5 @@
+* added from https://github.com/rofl0r/sabotage
+
 --- gdb-7.6.orig/gdb/linux-nat.c	2013-02-13 15:59:49.000000000 +0100
 +++ gdb-7.6/gdb/linux-nat.c	2013-08-13 17:01:09.000000000 +0200
 @@ -79,6 +79,14 @@
diff --git a/package/gdb/src/gdb/sgidefs.h b/package/gdb/src/gdb/sgidefs.h
new file mode 100644
index 000000000..a6d250ab7
--- /dev/null
+++ b/package/gdb/src/gdb/sgidefs.h
@@ -0,0 +1,30 @@
+#ifndef _SGIDEFS_H
+#define _SGIDEFS_H
+
+/* MIPS ABI crap that GLIBC puts into /include
+by default, and GDB depends on it happily. */
+
+#define _MIPS_ISA_MIPS1 1
+#define _MIPS_ISA_MIPS2 2
+#define _MIPS_ISA_MIPS3 3
+#define _MIPS_ISA_MIPS4 4
+#define _MIPS_ISA_MIPS5 5
+#define _MIPS_ISA_MIPS32 6
+#define _MIPS_ISA_MIPS64 7
+
+#ifndef _ABIO32
+#define _ABIO32 1
+#endif
+#define _MIPS_SIM_ABI32 _ABIO32
+
+#ifndef _ABIN32
+#define _ABIN32 2
+#endif
+#define _MIPS_SIM_NABI32 _ABIN32
+
+#ifndef _ABI64
+#define _ABI64 3
+#endif
+#define _MIPS_SIM_ABI64 _ABI64
+
+#endif