--- a/components/gdb/Makefile	Fri Nov 15 07:14:12 2013 -0800
+++ b/components/gdb/Makefile	Fri Nov 15 07:44:49 2013 -0800
@@ -39,16 +39,16 @@
 include ../../make-rules/configure.mk
 include ../../make-rules/ips.mk
 
-# GDB wants the GNU utilities
-PATH=/usr/gnu/bin:/usr/bin:/usr/perl5/bin
-
 # There are a large number of macros in the GCB code written
 # specifically for GCC's preprocessor. Studio does not expand
 # these macros the same way GCC does, and the resulting gdb is
 # not usable. Building gdb with a GCC >= 4.7.2 produces very
 # good results, even on SPARC.
-CC = /usr/gcc/4.7/bin/gcc
-CXX = /usr/gcc/4.7/bin/g++
+COMPILER=gcc
+GCCHOME=/usr/gcc/4.7
+
+# GDB wants the GNU utilities
+PATH=/usr/gnu/bin:$(GCCHOME)/bin:/usr/bin:/usr/perl5/bin
 
 CFLAGS_sparc =	-g -O2 -mcpu=ultrasparc -mtune=ultrasparc
 CFLAGS_sparc +=	-mno-unaligned-doubles
@@ -69,7 +69,6 @@
 CONFIGURE_ENV += CPPFLAGS="`echo $(CPPFLAGS)`"
 CONFIGURE_ENV += LDFLAGS="`echo $(LDFLAGS)`"
 
-CONFIGURE_OPTIONS += --with-system-readline
 CONFIGURE_OPTIONS += --with-x=no
 CONFIGURE_OPTIONS += --with-curses
 CONFIGURE_OPTIONS += --disable-werror

--- a/components/gdb/patches/gdb.target.c.patch	Fri Nov 15 07:14:12 2013 -0800
+++ b/components/gdb/patches/gdb.target.c.patch	Fri Nov 15 07:44:49 2013 -0800
@@ -1,20 +1,26 @@
 --- gdb-7.6/gdb/target.c	2013-03-11 05:22:20.000000000 -0700
-+++ gdb-7.6/gdb/target.c	2013-07-11 00:14:34.536673600 -0700
[email protected]@ -4208,7 +4208,7 @@
++++ gdb-7.6/gdb/target.c	2013-10-31 08:06:41.106242317 -0700
[email protected]@ -4208,7 +4208,10 @@
  
    for (t = current_target.beneath; t != NULL; t = t->beneath)
      if (t->to_disable_btrace != NULL)
 -      return t->to_disable_btrace (btinfo);
++    {
 +      t->to_disable_btrace (btinfo);
++      return;
++    }
  
    tcomplain ();
  }
[email protected]@ -4222,7 +4222,7 @@
[email protected]@ -4222,7 +4225,10 @@
  
    for (t = current_target.beneath; t != NULL; t = t->beneath)
      if (t->to_teardown_btrace != NULL)
 -      return t->to_teardown_btrace (btinfo);
++    {
 +      t->to_teardown_btrace (btinfo);
++      return;
++    }
  
    tcomplain ();
  }