From 365b37bb18e40acb014cd7ad45fcafc528e2e10a Mon Sep 17 00:00:00 2001 From: Jay Freeman Date: Wed, 26 Jan 2011 22:26:07 +0000 Subject: Checkpoint this crazy mess of gdb. git-svn-id: http://svn.telesphoreo.org/trunk@740 514c082c-b64e-11dc-b46d-3d985efe055d --- data/gdb/_metadata/version | 2 +- data/gdb/duplicates.diff | 36 ++++++++++++++++++++++++++++++++++++ data/gdb/gdb-1128.tar.gz | Bin 17831170 -> 0 bytes data/gdb/gdb-1461.tgz | Bin 0 -> 17957290 bytes data/gdb/gdbserver.diff | 21 --------------------- data/gdb/make.sh | 2 +- data/gdb/mig.diff | 34 +++++++++++++++++----------------- data/gdb/strip.diff | 8 -------- 8 files changed, 55 insertions(+), 48 deletions(-) create mode 100644 data/gdb/duplicates.diff delete mode 100644 data/gdb/gdb-1128.tar.gz create mode 100644 data/gdb/gdb-1461.tgz delete mode 100644 data/gdb/gdbserver.diff (limited to 'data') diff --git a/data/gdb/_metadata/version b/data/gdb/_metadata/version index 3ff08f728..8c4a5f494 100644 --- a/data/gdb/_metadata/version +++ b/data/gdb/_metadata/version @@ -1 +1 @@ -1128 +1461 diff --git a/data/gdb/duplicates.diff b/data/gdb/duplicates.diff new file mode 100644 index 000000000..23bd02324 --- /dev/null +++ b/data/gdb/duplicates.diff @@ -0,0 +1,36 @@ +diff -ru gdb-1461/src/bfd/mach-o.c gdb-1461+iPhone/src/bfd/mach-o.c +--- gdb-1461/src/bfd/mach-o.c 2009-07-23 23:52:42.000000000 +0000 ++++ gdb-1461+iPhone/src/bfd/mach-o.c 2010-03-29 06:59:49.000000000 +0000 +@@ -264,7 +264,7 @@ + #define BFD_GETL32(addr) ((((((unsigned long) addr[3] << 8) | addr[2]) << 8) | addr[1]) << 8 | addr[0]) + #define BFD_GETL64(addr) ((((((((((unsigned long long) addr[7] << 8) | addr[6]) << 8) | addr[5]) << 8 | addr[4]) << 8 | addr[3]) << 8 | addr[2]) << 8 | addr[1]) << 8 | addr[0]) + +-unsigned char macosx_symbol_types[256]; ++static unsigned char macosx_symbol_types[256]; + + static unsigned char + bfd_mach_o_symbol_type_base (unsigned char macho_type) +diff -ru gdb-1461/src/gdb/macosx/macosx-tdep.c gdb-1461+iPhone/src/gdb/macosx/macosx-tdep.c +--- gdb-1461/src/gdb/macosx/macosx-tdep.c 2009-11-06 22:25:10.000000000 +0000 ++++ gdb-1461+iPhone/src/gdb/macosx/macosx-tdep.c 2010-03-29 06:59:38.000000000 +0000 +@@ -131,7 +131,7 @@ + #define BFD_GETL32(addr) ((((((uint32_t) addr[3] << 8) | addr[2]) << 8) | addr[1]) << 8 | addr[0]) + #define BFD_GETL64(addr) ((((((((((uint64_t) addr[7] << 8) | addr[6]) << 8) | addr[5]) << 8 | addr[4]) << 8 | addr[3]) << 8 | addr[2]) << 8 | addr[1]) << 8 | addr[0]) + +-unsigned char macosx_symbol_types[256]; ++static unsigned char macosx_symbol_types[256]; + + static unsigned char + macosx_symbol_type_base (macho_type) +diff -ru gdb-1461/src/gdb/xcoffread.c gdb-1461+iPhone/src/gdb/xcoffread.c +--- gdb-1461/src/gdb/xcoffread.c 2008-08-06 23:00:53.000000000 +0000 ++++ gdb-1461+iPhone/src/gdb/xcoffread.c 2010-03-29 07:31:55.000000000 +0000 +@@ -122,7 +122,7 @@ + /* Nonzero if within a function (so symbols should be local, + if nothing says specifically). */ + +-int within_function; ++extern int within_function; + + /* Size of a COFF symbol. I think it is always 18, so I'm not sure + there is any reason not to just use a #define, but might as well diff --git a/data/gdb/gdb-1128.tar.gz b/data/gdb/gdb-1128.tar.gz deleted file mode 100644 index ac25d91c9..000000000 Binary files a/data/gdb/gdb-1128.tar.gz and /dev/null differ diff --git a/data/gdb/gdb-1461.tgz b/data/gdb/gdb-1461.tgz new file mode 100644 index 000000000..a077cb616 Binary files /dev/null and b/data/gdb/gdb-1461.tgz differ diff --git a/data/gdb/gdbserver.diff b/data/gdb/gdbserver.diff deleted file mode 100644 index f3242c4cb..000000000 --- a/data/gdb/gdbserver.diff +++ /dev/null @@ -1,21 +0,0 @@ -diff -ru gdb-962/src/gdb/configure.ac gdb-962+iPhone/src/gdb/configure.ac ---- gdb-962/src/gdb/configure.ac 2008-03-05 23:09:41.000000000 +0000 -+++ gdb-962+iPhone/src/gdb/configure.ac 2008-11-11 05:45:29.000000000 +0000 -@@ -1681,16 +1681,7 @@ - AC_CONFIG_SUBDIRS(multi-ice) - fi - --# We only build gdbserver automatically if host and target are the same. --if test "x$target" = "x$host"; then -- AC_MSG_CHECKING(whether gdbserver is supported on this host) -- if test "x$build_gdbserver" = xyes; then -- AC_MSG_RESULT(yes) -- AC_CONFIG_SUBDIRS(gdbserver) -- else -- AC_MSG_RESULT(no) -- fi --fi -+AC_CONFIG_SUBDIRS(gdbserver) - - # We build rdi-share on ARM-based targets, as instructed by configure.tgt. - if test "x$build_rdi_share" = xyes; then diff --git a/data/gdb/make.sh b/data/gdb/make.sh index d6a7b335e..f72ed7297 100644 --- a/data/gdb/make.sh +++ b/data/gdb/make.sh @@ -14,5 +14,5 @@ for bin in ar nm ranlib size strings strip; do pkg: rm -f "/usr/bin/${bin}" done pkg: rm -f /usr/lib/libiberty.a -ldid -S"${PKG_DATA}/gdb.xml" "${PKG_DEST}/usr/bin/gdb"{,server} +ldid -S"${PKG_DATA}/gdb.xml" "${PKG_DEST}/usr/bin/gdb" pkg: rm -rf /usr/share/locale diff --git a/data/gdb/mig.diff b/data/gdb/mig.diff index a13474d55..ba58fe4b7 100644 --- a/data/gdb/mig.diff +++ b/data/gdb/mig.diff @@ -1,36 +1,36 @@ -diff -ru gdb-1119/src/gdb/config/arm/macosx.mh gdb-1119+iPhone/src/gdb/config/arm/macosx.mh ---- gdb-1119/src/gdb/config/arm/macosx.mh 2008-11-18 19:02:00.000000000 +0000 -+++ gdb-1119+iPhone/src/gdb/config/arm/macosx.mh 2009-07-07 11:00:43.000000000 +0000 -@@ -50,7 +50,7 @@ +diff -ru gdb-1461/src/gdb/config/arm/macosx.mh gdb-1461+iPhone/src/gdb/config/arm/macosx.mh +--- gdb-1461/src/gdb/config/arm/macosx.mh 2009-07-23 23:52:47.000000000 +0000 ++++ gdb-1461+iPhone/src/gdb/config/arm/macosx.mh 2010-03-29 05:59:07.000000000 +0000 +@@ -54,7 +54,7 @@ _all: all excServer.c excUser.c: macosx.defs -- $(NEXT_ROOT)/usr/bin/mig -arch armv6 -I. $< +- xcrun -sdk "$(SDKROOT)" mig -arch armv6 -isysroot "$(SDKROOT)" -I. $< + mig -arch armv6 -I. $< clean:: rm -f excServer.c excUser.c exc.h -diff -ru gdb-1119/src/gdb/config/i386/macosx.mh gdb-1119+iPhone/src/gdb/config/i386/macosx.mh ---- gdb-1119/src/gdb/config/i386/macosx.mh 2008-11-18 19:02:01.000000000 +0000 -+++ gdb-1119+iPhone/src/gdb/config/i386/macosx.mh 2009-07-07 11:00:46.000000000 +0000 -@@ -56,7 +56,7 @@ +diff -ru gdb-1461/src/gdb/config/i386/macosx.mh gdb-1461+iPhone/src/gdb/config/i386/macosx.mh +--- gdb-1461/src/gdb/config/i386/macosx.mh 2009-06-05 17:44:20.000000000 +0000 ++++ gdb-1461+iPhone/src/gdb/config/i386/macosx.mh 2010-03-29 05:41:09.000000000 +0000 +@@ -60,7 +60,7 @@ _all: all $(MACH_EXC_SERVER_PREFACE)excServer.c $(MACH_EXC_SERVER_PREFACE)excUser.c: macosx.defs -- $(NEXT_ROOT)/usr/bin/mig -arch i386 -I. $< -+ mig -arch i386 -I. $< +- $(SDKROOT)/usr/bin/mig -I. $< ++ mig -I. $< clean:: rm -f $(MACH_EXC_SERVER_PREFACE)excServer.c $(MACH_EXC_SERVER_PREFACE)excUser.c $(MACH_EXC_SERVER_PREFACE)exc.h -diff -ru gdb-1119/src/gdb/config/powerpc/macosx.mh gdb-1119+iPhone/src/gdb/config/powerpc/macosx.mh ---- gdb-1119/src/gdb/config/powerpc/macosx.mh 2008-11-18 19:02:01.000000000 +0000 -+++ gdb-1119+iPhone/src/gdb/config/powerpc/macosx.mh 2009-07-07 11:00:50.000000000 +0000 -@@ -60,7 +60,7 @@ +diff -ru gdb-1461/src/gdb/config/powerpc/macosx.mh gdb-1461+iPhone/src/gdb/config/powerpc/macosx.mh +--- gdb-1461/src/gdb/config/powerpc/macosx.mh 2009-06-05 17:44:20.000000000 +0000 ++++ gdb-1461+iPhone/src/gdb/config/powerpc/macosx.mh 2010-03-29 05:41:03.000000000 +0000 +@@ -62,7 +62,7 @@ _all: all $(MACH_EXC_SERVER_PREFACE)excServer.c $(MACH_EXC_SERVER_PREFACE)excUser.c: macosx.defs -- $(NEXT_ROOT)/usr/bin/mig -arch ppc -I. $< -+ mig -arch ppc -I. $< +- $(SDKROOT)/usr/bin/mig -I. $< ++ mig -I. $< clean:: rm -f $(MACH_EXC_SERVER_PREFACE)excServer.c $(MACH_EXC_SERVER_PREFACE)excUser.c $(MACH_EXC_SERVER_PREFACE)exc.h diff --git a/data/gdb/strip.diff b/data/gdb/strip.diff index 365f0f326..dfabb9850 100644 --- a/data/gdb/strip.diff +++ b/data/gdb/strip.diff @@ -43,14 +43,6 @@ diff -ru gdb-1119/Makefile gdb-1119+iPhone/Makefile cp $(DSTROOT)/$(LIBEXEC_GDB_DIR)/gdb-$${target} \ $(SYMROOT)/$(LIBEXEC_GDB_DIR)/gdb-$${target}; \ if echo $${target} | egrep '^[^-]*-apple-darwin' > /dev/null; then \ -@@ -722,7 +722,6 @@ - set -e; for dstroot in $(SYMROOT) $(DSTROOT); do \ - $(INSTALL) -c -m 755 $(OBJROOT)/$(ARM_TARGET)--$(ARM_TARGET)/gdb/gdbserver/gdbserver $${dstroot}/usr/bin/gdbserver; \ - done -- strip -S $(DSTROOT)/usr/bin/gdbserver - - install-binutils-macosx: - @@ -730,7 +729,7 @@ instname=`echo $${i} | sed -e 's/\\-new//'`; \ lipo -create $(patsubst %,$(OBJROOT)/%/binutils/$${i},$(NATIVE_TARGETS)) \ -- cgit v1.2.3