patch ../102429103.patch

diff --git a/README.google b/README.google
index 1e722c0c223a0d390f521401b04ea56267e1ad5f..c4cbbb236a30340cccd4002eb2a4864126854aed 100644 (file)
--- a/README.google
+++ b/README.google
@@ -197,3 +197,14 @@ they are an ongoing maintenance burden.
 +
 +      include/
 +      * dwarf2.def (DW_AT_str_offsets_base): New attribute.
+--- README.google      2015-09-05 17:04:41.000000000 -0700
++++ README.google      2015-09-05 18:02:29.000000000 -0700
++
++2015-09-05  Doug Evans  <google.com>
++
++      Upstream PR libc/13097, local ref# 17474967
++      * solib-svr4.c (svr4_read_so_list): Ignore linux-vdso.so.1
++      and linux-gate.so.1.
++
++      Upstream PR libc/13097, local ref# 17474967
++      * solib-svr4.c (svr4_read_so_list): Ignore linux-vdso64.so.1, for ppc.

diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c
index 909dfb708d51fe296d75c97e27f7d1b0d05e426c..cca51b3748e3e133ad0e8a16e259af51d7d189ef 100644 (file)
--- a/gdb/solib-svr4.c
+++ b/gdb/solib-svr4.c
@@ -1392,6 +1392,21 @@ svr4_read_so_list (CORE_ADDR lm, CORE_ADDR prev_lm,
          continue;
        }
 
+      /* GOOGLE LOCAL: Work around upstream bug 13097, local ref# 17474967.
+        The dynamic linker used to name the vsyscall page as "",
+        now it gives us "linux-vdso.so.1".  */
+#define LINUX_VDSO_NAME "linux-vdso.so.1"
+#define LINUX_GATE_NAME "linux-gate.so.1"
+#define LINUX_VDSO64_NAME "linux-vdso64.so.1" /* for ppc */
+      if (strcmp (new->so_name, LINUX_VDSO_NAME) == 0
+         || strcmp (new->so_name, LINUX_GATE_NAME) == 0
+         || strcmp (new->so_name, LINUX_VDSO64_NAME) == 0)
+       {
+         do_cleanups (old_chain);
+         continue;
+       }
+      /* END GOOGLE LOCAL */
+
       discard_cleanups (old_chain);
       newobj->next = 0;
       **link_ptr_ptr = newobj;