--- a/components/gdb/patches/gdb.solib-svr4.patch	Wed Nov 06 14:12:13 2013 -0800
+++ b/components/gdb/patches/gdb.solib-svr4.patch	Fri Nov 08 08:16:59 2013 -0800
@@ -1,15 +1,13 @@
---- gdb-6.8/gdb/solib-svr4.c.orig	Fri Jul 10 12:25:23 2009
-+++ gdb-6.8/gdb/solib-svr4.c	Fri Jul 10 12:25:34 2009
-@@ -1649,6 +1649,12 @@
-   if (strcmp (gdb->so_original_name, "/usr/lib/ld.so.1") == 0
-       && strcmp (inferior->so_original_name, "/lib/ld.so.1") == 0)
+--- gdb-7.6/gdb/solib-svr4.c	2013-01-31 05:52:52.000000000 -0800
++++ gdb-7.6/gdb/solib-svr4.c	2013-07-10 23:32:20.908310500 -0700
+@@ -125,6 +125,10 @@
+       && strcmp (inferior_so_name, "/lib/ld.so.1") == 0)
      return 1;
-+  if (strcmp (gdb->so_original_name, "/usr/lib/amd64/ld.so.1") == 0
-+      && strcmp (inferior->so_original_name, "/lib/amd64/ld.so.1") == 0)
+ 
++  if (strcmp (gdb_so_name, "/usr/lib/amd64/ld.so.1") == 0
++      && strcmp (inferior_so_name, "/lib/amd64/ld.so.1") == 0)
 +    return 1;
-+  if (strcmp (gdb->so_original_name, "/usr/lib/sparcv9/ld.so.1") == 0
-+      && strcmp (inferior->so_original_name, "/lib/sparcv9/ld.so.1") == 0)
-+    return 1;
- 
-   return 0;
- }
++
+   /* Similarly, we observed the same issue with sparc64, but with
+      different locations.  */
+   if (strcmp (gdb_so_name, "/usr/lib/sparcv9/ld.so.1") == 0