From 87d3bc8621f68dd7bf5ac493c32aab2c26c7a6a1 Mon Sep 17 00:00:00 2001 From: Doug Evans Date: Thu, 10 Dec 2015 12:00:31 -0800 Subject: [PATCH] patch ../102429103.patch --- README.google | 11 +++++++++++ gdb/solib-svr4.c | 15 +++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/README.google b/README.google index 1e722c0c223..c4cbbb236a3 100644 --- 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 ++ ++ 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 909dfb708d5..cca51b3748e 100644 --- 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; -- 2.47.2