1 Index: gdb-7.9.90.20150709/gdb/solib-svr4.c
2 ===================================================================
3 --- gdb-7.9.90.20150709.orig/gdb/solib-svr4.c 2015-07-09 18:18:54.526417766 +0200
4 +++ gdb-7.9.90.20150709/gdb/solib-svr4.c 2015-07-09 18:19:33.074746586 +0200
5 @@ -1381,14 +1381,27 @@ svr4_read_so_list (CORE_ADDR lm, CORE_AD
9 - struct bfd_build_id *build_id;
10 + struct bfd_build_id *build_id = NULL;
12 strncpy (newobj->so_original_name, buffer, SO_NAME_MAX_PATH_SIZE - 1);
13 newobj->so_original_name[SO_NAME_MAX_PATH_SIZE - 1] = '\0';
14 /* May get overwritten below. */
15 strcpy (newobj->so_name, newobj->so_original_name);
17 - build_id = build_id_addr_get (newobj->lm_info->l_ld);
18 + /* In the case the main executable was found according to its build-id
19 + (from a core file) prevent loading a different build of a library
20 + with accidentally the same SO_NAME.
22 + It suppresses bogus backtraces (and prints "??" there instead) if
23 + the on-disk files no longer match the running program version.
25 + If the main executable was not loaded according to its build-id do
26 + not do any build-id checking of the libraries. There may be missing
27 + build-ids dumped in the core file and we would map all the libraries
28 + to the only existing file loaded that time - the executable. */
29 + if (symfile_objfile != NULL
30 + && (symfile_objfile->flags & OBJF_BUILD_ID_CORE_LOADED) != 0)
31 + build_id = build_id_addr_get (newobj->lm_info->l_ld);
34 char *name, *build_id_filename;
35 @@ -1403,23 +1416,7 @@ svr4_read_so_list (CORE_ADDR lm, CORE_AD
40 - debug_print_missing (newobj->so_name, build_id_filename);
42 - /* In the case the main executable was found according to
43 - its build-id (from a core file) prevent loading
44 - a different build of a library with accidentally the
47 - It suppresses bogus backtraces (and prints "??" there
48 - instead) if the on-disk files no longer match the
49 - running program version. */
51 - if (symfile_objfile != NULL
52 - && (symfile_objfile->flags
53 - & OBJF_BUILD_ID_CORE_LOADED) != 0)
54 - newobj->so_name[0] = 0;
56 + debug_print_missing (newobj->so_name, build_id_filename);
58 xfree (build_id_filename);