Commit f46b9cda authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

toolchain/gdb: remove broken snapshot support

parent a4c81306
Loading
Loading
Loading
Loading
+0 −5
Original line number Diff line number Diff line
@@ -57,10 +57,6 @@ choice
		bool "gdb 6.8"
		depends on !BR2_avr32

	config BR2_GDB_VERSION_SNAPSHOT
		bool "gdb snapshot"
		depends on !BR2_avr32 && !BR2_nios2

endchoice

config BR2_GDB_VERSION
@@ -72,4 +68,3 @@ config BR2_GDB_VERSION
	default "6.6"      if BR2_GDB_VERSION_6_6
	default "6.7.1"    if BR2_GDB_VERSION_6_7_1
	default "6.8"      if BR2_GDB_VERSION_6_8
	default "snapshot" if BR2_GDB_VERSION_SNAPSHOT
+0 −10
Original line number Diff line number Diff line
@@ -6,15 +6,6 @@
GDB_VERSION:=$(strip $(subst ",, $(BR2_GDB_VERSION)))
#"))

ifeq ($(GDB_VERSION),snapshot)
# Be aware that this changes daily....
GDB_SITE:=ftp://sources.redhat.com/pub/gdb/snapshots/current
GDB_SOURCE:=gdb.tar.bz2
GDB_CAT:=$(BZCAT)
GDB_DIR:=$(TOOL_BUILD_DIR)/gdb-$(GDB_VERSION)
GDB_PATCH_DIR:=toolchain/gdb/$(GDB_VERSION)
else

GDB_OFFICIAL_VERSION:=$(GDB_VERSION)$(VENDOR_SUFFIX)$(VENDOR_GDB_RELEASE)

GDB_SOURCE:=gdb-$(GDB_OFFICIAL_VERSION).tar.bz2
@@ -38,7 +29,6 @@ endif
ifeq ($(GDB_VERSION),6.3)
DISABLE_GDBMI:=--disable-gdbmi
endif
endif

$(DL_DIR)/$(GDB_SOURCE):
	$(call DOWNLOAD,$(GDB_SITE),$(GDB_SOURCE))
+0 −94
Original line number Diff line number Diff line
diff -urN gdb-6.3.50.20050915/bfd/config.bfd gdb-6.3.50.20050915-patched/bfd/config.bfd
--- gdb-6.3.50.20050915/bfd/config.bfd	2005-08-30 11:06:00.000000000 -0500
+++ gdb-6.3.50.20050915-patched/bfd/config.bfd	2005-09-15 20:08:49.000000000 -0500
@@ -725,7 +725,7 @@
     targ_defvec=hp300hpux_vec
     targ_underscore=yes
     ;;
-  m68*-*-linux*aout*)
+  m68*-*-linux*aout* | m68*-*-linux-uclibc*)
     targ_defvec=m68klinux_vec
     targ_selvecs=bfd_elf32_m68k_vec
     targ_underscore=yes
diff -urN gdb-6.3.50.20050915/bfd/configure gdb-6.3.50.20050915-patched/bfd/configure
--- gdb-6.3.50.20050915/bfd/configure	2005-08-26 04:47:43.000000000 -0500
+++ gdb-6.3.50.20050915-patched/bfd/configure	2005-09-15 20:09:54.000000000 -0500
@@ -3585,6 +3585,11 @@
   lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
   ;;
 
+linux-uclibc*)
+  lt_cv_deplibs_check_method=pass_all
+  lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
+  ;;
+
 netbsd* | knetbsd*-gnu)
   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
     lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
diff -urN gdb-6.3.50.20050915/libtool.m4 gdb-6.3.50.20050915-patched/libtool.m4
--- gdb-6.3.50.20050915/libtool.m4	2005-07-15 21:36:38.000000000 -0500
+++ gdb-6.3.50.20050915-patched/libtool.m4	2005-09-15 20:13:33.000000000 -0500
@@ -653,6 +653,11 @@
   fi
   ;;
 
+linux-uclibc*)
+  lt_cv_deplibs_check_method=pass_all  
+  lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
+  ;;
+
 newsos6)
   [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)']
   lt_cv_file_magic_cmd=/usr/bin/file
diff -urN gdb-6.3.50.20050915/ltconfig gdb-6.3.50.20050915-patched/ltconfig
--- gdb-6.3.50.20050915/ltconfig	2005-07-15 21:36:38.000000000 -0500
+++ gdb-6.3.50.20050915-patched/ltconfig	2005-09-15 21:23:35.000000000 -0500
@@ -602,7 +602,7 @@
 
 # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
 case $host_os in
-linux-gnu*) ;;
+linux-gnu*|linux-uclibc*) ;;
 linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
 esac
 
@@ -1270,6 +1270,24 @@
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
+linux-uclibc*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+  soname_spec='${libname}${release}.so$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  # Note: copied from linux-gnu, and may not be appropriate.
+  hardcode_into_libs=yes
+  # Assume using the uClibc dynamic linker.
+  dynamic_linker="uClibc ld.so"
+  ;;
+
 netbsd*)
   need_lib_prefix=no
   need_version=no
diff -urN gdb-6.3.50.20050915/opcodes/configure gdb-6.3.50.20050915-patched/opcodes/configure
--- gdb-6.3.50.20050915/opcodes/configure	2005-08-17 22:49:00.000000000 -0500
+++ gdb-6.3.50.20050915-patched/opcodes/configure	2005-09-15 21:22:20.000000000 -0500
@@ -3596,6 +3596,11 @@
   fi
   ;;
 
+linux-uclibc*)
+  lt_cv_deplibs_check_method=pass_all
+  lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
+  ;;
+
 newsos6)
   lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
   lt_cv_file_magic_cmd=/usr/bin/file
+0 −16
Original line number Diff line number Diff line
diff -urN gdb-6.3.50.20050915/readline/configure gdb-6.3.50.20050915-patched/readline/configure
--- gdb-6.3.50.20050915/readline/configure	2005-07-03 03:22:47.000000000 -0500
+++ gdb-6.3.50.20050915-patched/readline/configure	2005-09-15 22:25:00.000000000 -0500
@@ -6723,7 +6723,12 @@
 
 
 echo "$as_me:$LINENO: checking for mbstate_t" >&5
+echo $ECHO_N "bash_cv_have_mbstate_t=$bash_cv_have_mbstate_t" >&6
 echo $ECHO_N "checking for mbstate_t... $ECHO_C" >&6
+if test "${bash_cv_have_mbstate_t+set}" != set; then
+  bash_cv_have_mbstate_t=yes
+  echo $ECHO_N "WARNING!! forcing to yes!!! $ECHO_C" >&6
+fi
 if test "${bash_cv_have_mbstate_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
+0 −30
Original line number Diff line number Diff line
Sometime around 2.4.22-23, the mips pt_regs.h fields were reordered, breaking
coredump handling by gdb for current kernels.  Update the hardcoded constants
to reflect the change.
--
diff -urN gdb-6.3.50.20050915/gdb/mips-linux-tdep.c gdb-6.3.50.20050915-patched/gdb/mips-linux-tdep.c
--- gdb-6.3.50.20050915/gdb/mips-linux-tdep.c	2005-04-02 16:59:34.000000000 -0600
+++ gdb-6.3.50.20050915-patched/gdb/mips-linux-tdep.c	2005-09-15 22:33:13.000000000 -0500
@@ -54,12 +54,22 @@
 
 #define EF_REG0			6
 #define EF_REG31		37
+
+#if 0
 #define EF_LO			38
 #define EF_HI			39
 #define EF_CP0_EPC		40
 #define EF_CP0_BADVADDR		41
 #define EF_CP0_STATUS		42
 #define EF_CP0_CAUSE		43
+#else
+#define EF_CP0_STATUS		38
+#define EF_LO			39
+#define EF_HI			40
+#define EF_CP0_BADVADDR		41
+#define EF_CP0_CAUSE		42
+#define EF_CP0_EPC		43
+#endif
 
 #define EF_SIZE			180
 
Loading