1 Index: gdb-7.6/gdb/corelow.c
2 ===================================================================
3 --- gdb-7.6.orig/gdb/corelow.c 2013-01-31 19:37:37.000000000 +0100
4 +++ gdb-7.6/gdb/corelow.c 2013-07-17 05:28:49.277203536 +0200
10 +#include "elf/common.h"
15 @@ -271,6 +274,53 @@ add_to_thread_list (bfd *abfd, asection
16 inferior_ptid = ptid; /* Yes, make it current. */
19 +static int build_id_core_loads = 1;
22 +build_id_locate_exec (int from_tty)
25 + struct elf_build_id *build_id;
26 + char *execfilename, *debug_filename;
27 + char *build_id_filename;
28 + struct cleanup *back_to;
30 + if (exec_bfd != NULL || symfile_objfile != NULL)
33 + if (target_auxv_search (¤t_target, AT_ENTRY, &at_entry) <= 0)
36 + build_id = build_id_addr_get (at_entry);
37 + if (build_id == NULL)
39 + back_to = make_cleanup (xfree, build_id);
41 + /* SYMFILE_OBJFILE should refer to the main executable (not only to its
42 + separate debug info file). gcc44+ keeps .eh_frame only in the main
43 + executable without its duplicate .debug_frame in the separate debug info
44 + file - such .eh_frame would not be found if SYMFILE_OBJFILE would refer
45 + directly to the separate debug info file. */
47 + execfilename = build_id_to_filename (build_id, &build_id_filename, 0);
48 + make_cleanup (xfree, build_id_filename);
50 + if (execfilename != NULL)
52 + make_cleanup (xfree, execfilename);
53 + exec_file_attach (execfilename, from_tty);
54 + symbol_file_add_main (execfilename, from_tty);
55 + if (symfile_objfile != NULL)
56 + symfile_objfile->flags |= OBJF_BUILD_ID_CORE_LOADED;
59 + debug_print_missing (_("the main executable file"), build_id_filename);
61 + do_cleanups (back_to);
63 + /* No automatic SOLIB_ADD as the libraries would get read twice. */
66 /* This routine opens and sets up the core file bfd. */
69 @@ -409,6 +459,14 @@ core_open (char *filename, int from_tty)
70 switch_to_thread (thread->ptid);
73 + /* Find the build_id identifiers. If it gets executed after
74 + POST_CREATE_INFERIOR we would clash with asking to discard the already
75 + loaded VDSO symbols. If it gets executed before bfd_map_over_sections
76 + INFERIOR_PTID is still not set and libthread_db initialization crashes on
77 + PID == 0 in ps_pglobal_lookup. */
78 + if (build_id_core_loads != 0)
79 + build_id_locate_exec (from_tty);
81 post_create_inferior (&core_ops, from_tty);
83 /* Now go through the target stack looking for threads since there
84 @@ -978,4 +1036,11 @@ _initialize_corelow (void)
87 add_target (&core_ops);
89 + add_setshow_boolean_cmd ("build-id-core-loads", class_files,
90 + &build_id_core_loads, _("\
91 +Set whether CORE-FILE loads the build-id associated files automatically."), _("\
92 +Show whether CORE-FILE loads the build-id associated files automatically."),
94 + &setlist, &showlist);
96 Index: gdb-7.6/gdb/doc/gdb.texinfo
97 ===================================================================
98 --- gdb-7.6.orig/gdb/doc/gdb.texinfo 2013-07-17 05:28:48.882203384 +0200
99 +++ gdb-7.6/gdb/doc/gdb.texinfo 2013-07-17 05:28:49.286203539 +0200
100 @@ -16831,6 +16831,27 @@ information files.
104 +You can also adjust the current verbosity of the @dfn{build id} locating.
108 +@kindex set build-id-verbose
109 +@item set build-id-verbose 0
110 +No additional messages are printed.
112 +@item set build-id-verbose 1
113 +Missing separate debug filenames are printed.
115 +@item set build-id-verbose 2
116 +Missing separate debug filenames are printed and also all the parsing of the
117 +binaries to find their @dfn{build id} content is printed.
119 +@kindex show build-id-verbose
120 +@item show build-id-verbose
121 +Show the current verbosity value for the @dfn{build id} content locating.
125 @cindex @code{.gnu_debuglink} sections
126 @cindex debug link sections
127 A debug link is a special section of the executable file named
128 Index: gdb-7.6/gdb/solib-svr4.c
129 ===================================================================
130 --- gdb-7.6.orig/gdb/solib-svr4.c 2013-01-31 14:52:52.000000000 +0100
131 +++ gdb-7.6/gdb/solib-svr4.c 2013-07-17 05:28:49.287203539 +0200
132 @@ -1224,9 +1224,52 @@ svr4_read_so_list (CORE_ADDR lm, struct
136 - strncpy (new->so_name, buffer, SO_NAME_MAX_PATH_SIZE - 1);
137 - new->so_name[SO_NAME_MAX_PATH_SIZE - 1] = '\0';
138 - strcpy (new->so_original_name, new->so_name);
140 + struct elf_build_id *build_id;
142 + strncpy (new->so_original_name, buffer, SO_NAME_MAX_PATH_SIZE - 1);
143 + new->so_original_name[SO_NAME_MAX_PATH_SIZE - 1] = '\0';
144 + /* May get overwritten below. */
145 + strcpy (new->so_name, new->so_original_name);
147 + build_id = build_id_addr_get (new->lm_info->l_ld);
148 + if (build_id != NULL)
150 + char *name, *build_id_filename;
152 + /* Missing the build-id matching separate debug info file
153 + would be handled while SO_NAME gets loaded. */
154 + name = build_id_to_filename (build_id, &build_id_filename, 0);
157 + strncpy (new->so_name, name, SO_NAME_MAX_PATH_SIZE - 1);
158 + new->so_name[SO_NAME_MAX_PATH_SIZE - 1] = '\0';
163 + debug_print_missing (new->so_name, build_id_filename);
165 + /* In the case the main executable was found according to
166 + its build-id (from a core file) prevent loading
167 + a different build of a library with accidentally the
170 + It suppresses bogus backtraces (and prints "??" there
171 + instead) if the on-disk files no longer match the
172 + running program version. */
174 + if (symfile_objfile != NULL
175 + && (symfile_objfile->flags
176 + & OBJF_BUILD_ID_CORE_LOADED) != 0)
177 + new->so_name[0] = 0;
180 + xfree (build_id_filename);
187 /* If this entry has no name, or its name matches the name
188 Index: gdb-7.6/gdb/elfread.c
189 ===================================================================
190 --- gdb-7.6.orig/gdb/elfread.c 2013-03-18 10:20:02.000000000 +0100
191 +++ gdb-7.6/gdb/elfread.c 2013-07-17 05:31:21.242256141 +0200
193 #include "regcache.h"
197 +#include "gdbcore.h"
199 +#include "observer.h"
200 +#include <sys/stat.h>
202 extern void _initialize_elfread (void);
204 @@ -1068,10 +1073,59 @@ elf_gnu_ifunc_resolver_return_stop (stru
205 update_breakpoint_locations (b, sals, sals_end);
208 -/* Locate NT_GNU_BUILD_ID from ABFD and return its content. */
209 +#define BUILD_ID_VERBOSE_NONE 0
210 +#define BUILD_ID_VERBOSE_FILENAMES 1
211 +#define BUILD_ID_VERBOSE_BINARY_PARSE 2
212 +static int build_id_verbose = BUILD_ID_VERBOSE_FILENAMES;
214 +show_build_id_verbose (struct ui_file *file, int from_tty,
215 + struct cmd_list_element *c, const char *value)
217 + fprintf_filtered (file, _("Verbosity level of the build-id locator is %s.\n"),
221 +/* Locate NT_GNU_BUILD_ID and return its matching debug filename.
222 + FIXME: NOTE decoding should be unified with the BFD core notes decoding. */
224 +static struct elf_build_id *
225 +build_id_buf_get (bfd *templ, gdb_byte *buf, bfd_size_type size)
230 + while (p < buf + size)
232 + /* FIXME: bad alignment assumption. */
233 + Elf_External_Note *xnp = (Elf_External_Note *) p;
234 + size_t namesz = H_GET_32 (templ, xnp->namesz);
235 + size_t descsz = H_GET_32 (templ, xnp->descsz);
236 + bfd_byte *descdata = xnp->name + BFD_ALIGN (namesz, 4);
238 + if (H_GET_32 (templ, xnp->type) == NT_GNU_BUILD_ID
239 + && namesz == sizeof "GNU"
240 + && memcmp (xnp->name, "GNU", sizeof "GNU") == 0)
242 + size_t size = descsz;
243 + gdb_byte *data = (void *) descdata;
244 + struct elf_build_id *retval;
246 + retval = xmalloc (sizeof *retval - 1 + size);
247 + retval->size = size;
248 + memcpy (retval->data, data, size);
252 + p = descdata + BFD_ALIGN (descsz, 4);
257 +/* Separate debuginfo files have corrupted PHDR but SHDR is correct there.
258 + Locate NT_GNU_BUILD_ID from ABFD and return its content. */
260 static const struct elf_build_id *
261 -build_id_bfd_get (bfd *abfd)
262 +build_id_bfd_shdr_get (bfd *abfd)
264 if (!bfd_check_format (abfd, bfd_object)
265 || bfd_get_flavour (abfd) != bfd_target_elf_flavour
266 @@ -1081,6 +1135,348 @@ build_id_bfd_get (bfd *abfd)
267 return elf_tdata (abfd)->build_id;
270 +/* Core files may have missing (corrupt) SHDR but PDHR is correct there.
271 + bfd_elf_bfd_from_remote_memory () has too much overhead by
272 + allocating/reading all the available ELF PT_LOADs. */
274 +static struct elf_build_id *
275 +build_id_phdr_get (bfd *templ, bfd_vma loadbase, unsigned e_phnum,
276 + Elf_Internal_Phdr *i_phdr)
279 + struct elf_build_id *retval = NULL;
281 + for (i = 0; i < e_phnum; i++)
282 + if (i_phdr[i].p_type == PT_NOTE && i_phdr[i].p_filesz > 0)
284 + Elf_Internal_Phdr *hdr = &i_phdr[i];
288 + buf = xmalloc (hdr->p_filesz);
289 + err = target_read_memory (loadbase + i_phdr[i].p_vaddr, buf,
292 + retval = build_id_buf_get (templ, buf, hdr->p_filesz);
296 + if (retval != NULL)
302 +/* First we validate the file by reading in the ELF header and checking
303 + the magic number. */
305 +static inline bfd_boolean
306 +elf_file_p (Elf64_External_Ehdr *x_ehdrp64)
308 + gdb_assert (sizeof (Elf64_External_Ehdr) >= sizeof (Elf32_External_Ehdr));
309 + gdb_assert (offsetof (Elf64_External_Ehdr, e_ident)
310 + == offsetof (Elf32_External_Ehdr, e_ident));
311 + gdb_assert (sizeof (((Elf64_External_Ehdr *) 0)->e_ident)
312 + == sizeof (((Elf32_External_Ehdr *) 0)->e_ident));
314 + return ((x_ehdrp64->e_ident[EI_MAG0] == ELFMAG0)
315 + && (x_ehdrp64->e_ident[EI_MAG1] == ELFMAG1)
316 + && (x_ehdrp64->e_ident[EI_MAG2] == ELFMAG2)
317 + && (x_ehdrp64->e_ident[EI_MAG3] == ELFMAG3));
320 +/* Translate an ELF file header in external format into an ELF file header in
321 + internal format. */
323 +#define H_GET_WORD(bfd, ptr) (is64 ? H_GET_64 (bfd, (ptr)) \
324 + : H_GET_32 (bfd, (ptr)))
325 +#define H_GET_SIGNED_WORD(bfd, ptr) (is64 ? H_GET_S64 (bfd, (ptr)) \
326 + : H_GET_S32 (bfd, (ptr)))
329 +elf_swap_ehdr_in (bfd *abfd,
330 + const Elf64_External_Ehdr *src64,
331 + Elf_Internal_Ehdr *dst)
333 + int is64 = bfd_get_arch_size (abfd) == 64;
334 +#define SRC(field) (is64 ? src64->field \
335 + : ((const Elf32_External_Ehdr *) src64)->field)
337 + int signed_vma = get_elf_backend_data (abfd)->sign_extend_vma;
338 + memcpy (dst->e_ident, SRC (e_ident), EI_NIDENT);
339 + dst->e_type = H_GET_16 (abfd, SRC (e_type));
340 + dst->e_machine = H_GET_16 (abfd, SRC (e_machine));
341 + dst->e_version = H_GET_32 (abfd, SRC (e_version));
343 + dst->e_entry = H_GET_SIGNED_WORD (abfd, SRC (e_entry));
345 + dst->e_entry = H_GET_WORD (abfd, SRC (e_entry));
346 + dst->e_phoff = H_GET_WORD (abfd, SRC (e_phoff));
347 + dst->e_shoff = H_GET_WORD (abfd, SRC (e_shoff));
348 + dst->e_flags = H_GET_32 (abfd, SRC (e_flags));
349 + dst->e_ehsize = H_GET_16 (abfd, SRC (e_ehsize));
350 + dst->e_phentsize = H_GET_16 (abfd, SRC (e_phentsize));
351 + dst->e_phnum = H_GET_16 (abfd, SRC (e_phnum));
352 + dst->e_shentsize = H_GET_16 (abfd, SRC (e_shentsize));
353 + dst->e_shnum = H_GET_16 (abfd, SRC (e_shnum));
354 + dst->e_shstrndx = H_GET_16 (abfd, SRC (e_shstrndx));
359 +/* Translate an ELF program header table entry in external format into an
360 + ELF program header table entry in internal format. */
363 +elf_swap_phdr_in (bfd *abfd,
364 + const Elf64_External_Phdr *src64,
365 + Elf_Internal_Phdr *dst)
367 + int is64 = bfd_get_arch_size (abfd) == 64;
368 +#define SRC(field) (is64 ? src64->field \
369 + : ((const Elf32_External_Phdr *) src64)->field)
371 + int signed_vma = get_elf_backend_data (abfd)->sign_extend_vma;
373 + dst->p_type = H_GET_32 (abfd, SRC (p_type));
374 + dst->p_flags = H_GET_32 (abfd, SRC (p_flags));
375 + dst->p_offset = H_GET_WORD (abfd, SRC (p_offset));
378 + dst->p_vaddr = H_GET_SIGNED_WORD (abfd, SRC (p_vaddr));
379 + dst->p_paddr = H_GET_SIGNED_WORD (abfd, SRC (p_paddr));
383 + dst->p_vaddr = H_GET_WORD (abfd, SRC (p_vaddr));
384 + dst->p_paddr = H_GET_WORD (abfd, SRC (p_paddr));
386 + dst->p_filesz = H_GET_WORD (abfd, SRC (p_filesz));
387 + dst->p_memsz = H_GET_WORD (abfd, SRC (p_memsz));
388 + dst->p_align = H_GET_WORD (abfd, SRC (p_align));
393 +#undef H_GET_SIGNED_WORD
396 +static Elf_Internal_Phdr *
397 +elf_get_phdr (bfd *templ, bfd_vma ehdr_vma, unsigned *e_phnum_pointer,
398 + bfd_vma *loadbase_pointer)
400 + /* sizeof (Elf64_External_Ehdr) >= sizeof (Elf32_External_Ehdr) */
401 + Elf64_External_Ehdr x_ehdr64; /* Elf file header, external form */
402 + Elf_Internal_Ehdr i_ehdr; /* Elf file header, internal form */
403 + bfd_size_type x_phdrs_size;
404 + gdb_byte *x_phdrs_ptr;
405 + Elf_Internal_Phdr *i_phdrs;
411 + gdb_assert (templ != NULL);
412 + gdb_assert (sizeof (Elf64_External_Ehdr) >= sizeof (Elf32_External_Ehdr));
414 + /* Read in the ELF header in external format. */
415 + err = target_read_memory (ehdr_vma, (bfd_byte *) &x_ehdr64, sizeof x_ehdr64);
418 + if (build_id_verbose >= BUILD_ID_VERBOSE_BINARY_PARSE)
419 + warning (_("build-id: Error reading ELF header at address 0x%lx"),
420 + (unsigned long) ehdr_vma);
424 + /* Now check to see if we have a valid ELF file, and one that BFD can
425 + make use of. The magic number must match, the address size ('class')
426 + and byte-swapping must match our XVEC entry. */
428 + if (! elf_file_p (&x_ehdr64)
429 + || x_ehdr64.e_ident[EI_VERSION] != EV_CURRENT
430 + || !((bfd_get_arch_size (templ) == 64
431 + && x_ehdr64.e_ident[EI_CLASS] == ELFCLASS64)
432 + || (bfd_get_arch_size (templ) == 32
433 + && x_ehdr64.e_ident[EI_CLASS] == ELFCLASS32)))
435 + if (build_id_verbose >= BUILD_ID_VERBOSE_BINARY_PARSE)
436 + warning (_("build-id: Unrecognized ELF header at address 0x%lx"),
437 + (unsigned long) ehdr_vma);
441 + /* Check that file's byte order matches xvec's */
442 + switch (x_ehdr64.e_ident[EI_DATA])
444 + case ELFDATA2MSB: /* Big-endian */
445 + if (! bfd_header_big_endian (templ))
447 + if (build_id_verbose >= BUILD_ID_VERBOSE_BINARY_PARSE)
448 + warning (_("build-id: Unrecognized "
449 + "big-endian ELF header at address 0x%lx"),
450 + (unsigned long) ehdr_vma);
454 + case ELFDATA2LSB: /* Little-endian */
455 + if (! bfd_header_little_endian (templ))
457 + if (build_id_verbose >= BUILD_ID_VERBOSE_BINARY_PARSE)
458 + warning (_("build-id: Unrecognized "
459 + "little-endian ELF header at address 0x%lx"),
460 + (unsigned long) ehdr_vma);
464 + case ELFDATANONE: /* No data encoding specified */
465 + default: /* Unknown data encoding specified */
466 + if (build_id_verbose >= BUILD_ID_VERBOSE_BINARY_PARSE)
467 + warning (_("build-id: Unrecognized "
468 + "ELF header endianity at address 0x%lx"),
469 + (unsigned long) ehdr_vma);
473 + elf_swap_ehdr_in (templ, &x_ehdr64, &i_ehdr);
475 + /* The file header tells where to find the program headers.
476 + These are what we use to actually choose what to read. */
478 + if (i_ehdr.e_phentsize != (bfd_get_arch_size (templ) == 64
479 + ? sizeof (Elf64_External_Phdr)
480 + : sizeof (Elf32_External_Phdr))
481 + || i_ehdr.e_phnum == 0)
483 + if (build_id_verbose >= BUILD_ID_VERBOSE_BINARY_PARSE)
484 + warning (_("build-id: Invalid ELF program headers from the ELF header "
485 + "at address 0x%lx"), (unsigned long) ehdr_vma);
489 + x_phdrs_size = (bfd_get_arch_size (templ) == 64 ? sizeof (Elf64_External_Phdr)
490 + : sizeof (Elf32_External_Phdr));
492 + i_phdrs = xmalloc (i_ehdr.e_phnum * (sizeof *i_phdrs + x_phdrs_size));
493 + x_phdrs_ptr = (void *) &i_phdrs[i_ehdr.e_phnum];
494 + err = target_read_memory (ehdr_vma + i_ehdr.e_phoff, (bfd_byte *) x_phdrs_ptr,
495 + i_ehdr.e_phnum * x_phdrs_size);
499 + if (build_id_verbose >= BUILD_ID_VERBOSE_BINARY_PARSE)
500 + warning (_("build-id: Error reading "
501 + "ELF program headers at address 0x%lx"),
502 + (unsigned long) (ehdr_vma + i_ehdr.e_phoff));
506 + loadbase = ehdr_vma;
508 + for (i = 0; i < i_ehdr.e_phnum; ++i)
510 + elf_swap_phdr_in (templ, (Elf64_External_Phdr *)
511 + (x_phdrs_ptr + i * x_phdrs_size), &i_phdrs[i]);
512 + /* IA-64 vDSO may have two mappings for one segment, where one mapping
513 + is executable only, and one is read only. We must not use the
514 + executable one (PF_R is the first one, PF_X the second one). */
515 + if (i_phdrs[i].p_type == PT_LOAD && (i_phdrs[i].p_flags & PF_R))
517 + /* Only the first PT_LOAD segment indicates the file bias.
518 + Next segments may have P_VADDR arbitrarily higher.
519 + If the first segment has P_VADDR zero any next segment must not
520 + confuse us, the first one sets LOADBASE certainly enough. */
521 + if (!loadbase_set && i_phdrs[i].p_offset == 0)
523 + loadbase = ehdr_vma - i_phdrs[i].p_vaddr;
529 + if (build_id_verbose >= BUILD_ID_VERBOSE_BINARY_PARSE)
530 + warning (_("build-id: Found ELF header at address 0x%lx, loadbase 0x%lx"),
531 + (unsigned long) ehdr_vma, (unsigned long) loadbase);
533 + *e_phnum_pointer = i_ehdr.e_phnum;
534 + *loadbase_pointer = loadbase;
538 +/* BUILD_ID_ADDR_GET gets ADDR located somewhere in the object.
539 + Find the first section before ADDR containing an ELF header.
540 + We rely on the fact the sections from multiple files do not mix.
541 + FIXME: We should check ADDR is contained _inside_ the section with possibly
542 + missing content (P_FILESZ < P_MEMSZ). These omitted sections are currently
543 + hidden by _BFD_ELF_MAKE_SECTION_FROM_PHDR. */
545 +static CORE_ADDR build_id_addr;
546 +struct build_id_addr_sect
548 + struct build_id_addr_sect *next;
551 +static struct build_id_addr_sect *build_id_addr_sect;
553 +static void build_id_addr_candidate (bfd *abfd, asection *sect, void *obj)
555 + if (build_id_addr >= bfd_section_vma (abfd, sect))
557 + struct build_id_addr_sect *candidate;
559 + candidate = xmalloc (sizeof *candidate);
560 + candidate->next = build_id_addr_sect;
561 + build_id_addr_sect = candidate;
562 + candidate->sect = sect;
566 +struct elf_build_id *
567 +build_id_addr_get (CORE_ADDR addr)
569 + struct build_id_addr_sect *candidate;
570 + struct elf_build_id *retval = NULL;
571 + Elf_Internal_Phdr *i_phdr = NULL;
572 + bfd_vma loadbase = 0;
573 + unsigned e_phnum = 0;
575 + if (core_bfd == NULL)
578 + build_id_addr = addr;
579 + gdb_assert (build_id_addr_sect == NULL);
580 + bfd_map_over_sections (core_bfd, build_id_addr_candidate, NULL);
582 + /* Sections are sorted in the high-to-low VMAs order.
583 + Stop the search on the first ELF header we find.
584 + Do not continue the search even if it does not contain NT_GNU_BUILD_ID. */
586 + for (candidate = build_id_addr_sect; candidate != NULL;
587 + candidate = candidate->next)
589 + i_phdr = elf_get_phdr (core_bfd,
590 + bfd_section_vma (core_bfd, candidate->sect),
591 + &e_phnum, &loadbase);
592 + if (i_phdr != NULL)
596 + if (i_phdr != NULL)
598 + retval = build_id_phdr_get (core_bfd, loadbase, e_phnum, i_phdr);
602 + while (build_id_addr_sect != NULL)
604 + candidate = build_id_addr_sect;
605 + build_id_addr_sect = candidate->next;
612 /* Return if FILENAME has NT_GNU_BUILD_ID matching the CHECK value. */
615 @@ -1095,7 +1491,7 @@ build_id_verify (const char *filename, c
619 - found = build_id_bfd_get (abfd);
620 + found = build_id_bfd_shdr_get (abfd);
623 warning (_("File \"%s\" has no build-id, file skipped"), filename);
624 @@ -1112,16 +1508,53 @@ build_id_verify (const char *filename, c
628 -build_id_to_debug_filename (const struct elf_build_id *build_id)
629 +link_resolve (const char *symlink, int level)
631 + char buf[PATH_MAX + 1], *target, *retval;
635 + return xstrdup (symlink);
637 + got = readlink (symlink, buf, sizeof (buf));
638 + if (got < 0 || got >= sizeof (buf))
639 + return xstrdup (symlink);
642 + if (IS_ABSOLUTE_PATH (buf))
643 + target = xstrdup (buf);
646 + char *dir = ldirname (symlink);
649 + return xstrdup (symlink);
650 + target = xstrprintf ("%s"
651 +#ifndef HAVE_DOS_BASED_FILE_SYSTEM
653 +#else /* HAVE_DOS_BASED_FILE_SYSTEM */
655 +#endif /* HAVE_DOS_BASED_FILE_SYSTEM */
659 + retval = link_resolve (target, level + 1);
665 +build_id_to_filename (const struct elf_build_id *build_id, char **link_return,
666 + int add_debug_suffix)
668 char *link, *debugdir, *retval = NULL;
669 + char *link_all = NULL;
670 VEC (char_ptr) *debugdir_vec;
671 struct cleanup *back_to;
674 /* DEBUG_FILE_DIRECTORY/.build-id/ab/cdef */
675 - link = alloca (strlen (debug_file_directory) + (sizeof "/.build-id/" - 1) + 1
676 - + 2 * build_id->size + (sizeof ".debug" - 1) + 1);
677 + link = xmalloc (strlen (debug_file_directory) + 2 * build_id->size + 50);
679 /* Keep backward compatibility so that DEBUG_FILE_DIRECTORY being "" will
680 cause "/.build-id/..." lookups. */
681 @@ -1134,7 +1567,10 @@ build_id_to_debug_filename (const struct
682 size_t debugdir_len = strlen (debugdir);
683 const gdb_byte *data = build_id->data;
684 size_t size = build_id->size;
687 + struct stat statbuf_trash;
688 + /* Initialize it just to avoid a GCC false warning. */
689 + char *s, *link0 = NULL, *link0_resolved;
691 memcpy (link, debugdir, debugdir_len);
692 s = &link[debugdir_len];
693 @@ -1148,37 +1584,256 @@ build_id_to_debug_filename (const struct
696 s += sprintf (s, "%02x", (unsigned) *data++);
697 - strcpy (s, ".debug");
699 - /* lrealpath() is expensive even for the usually non-existent files. */
700 - if (access (link, F_OK) == 0)
701 - retval = lrealpath (link);
702 + for (seqno = 0;; seqno++)
708 + /* There can be multiple build-id symlinks pointing to real files
709 + with the same build-id (such as hard links). Some of the real
710 + files may not be installed. */
712 + s2 = s + sprintf (s, ".%u", seqno);
717 + if (add_debug_suffix)
718 + strcpy (s2, ".debug");
724 + /* If none of the real files is found report as missing file
725 + always the non-.%u-suffixed file. */
726 + link0 = xstrdup (link);
729 + /* `access' automatically dereferences LINK. */
730 + if (lstat (link, &statbuf_trash) != 0)
732 + /* Stop increasing SEQNO. */
736 + retval = lrealpath (link);
738 + if (retval != NULL && !build_id_verify (retval, build_id))
748 + if (retval != NULL)
750 + /* LINK_ALL is not used below in this non-NULL RETVAL case. */
755 + /* If the symlink has target request to install the target.
756 + BASE-debuginfo.rpm contains the symlink but BASE.rpm may be missing.
757 + https://bugzilla.redhat.com/show_bug.cgi?id=981154 */
758 + link0_resolved = link_resolve (link0, 0);
761 - if (retval != NULL && !build_id_verify (retval, build_id))
762 + if (link_all == NULL)
763 + link_all = xstrdup (link0_resolved);
768 + size_t len_orig = strlen (link_all);
770 + link_all = xrealloc (link_all,
771 + len_orig + 1 + strlen (link0_resolved) + 1);
773 + /* Use whitespace instead of DIRNAME_SEPARATOR to be compatible with
774 + its possible use as an argument for installation command. */
775 + link_all[len_orig] = ' ';
777 + strcpy (&link_all[len_orig + 1], link0_resolved);
779 + xfree (link0_resolved);
782 + if (link_return != NULL)
787 + *link_return = link;
792 + *link_return = link_all;
799 do_cleanups (back_to);
803 +/* This MISSING_FILEPAIR_HASH tracker is used only for the duplicite messages
804 + Try to install the hash file ...
807 +struct missing_filepair
814 +static struct htab *missing_filepair_hash;
815 +static struct obstack missing_filepair_obstack;
818 +missing_filepair_xcalloc (size_t nmemb, size_t nmemb_size)
821 + size_t size = nmemb * nmemb_size;
823 + retval = obstack_alloc (&missing_filepair_obstack, size);
824 + memset (retval, 0, size);
829 +missing_filepair_hash_func (const struct missing_filepair *elem)
831 + hashval_t retval = 0;
833 + retval ^= htab_hash_string (elem->binary);
834 + if (elem->debug != NULL)
835 + retval ^= htab_hash_string (elem->debug);
841 +missing_filepair_eq (const struct missing_filepair *elem1,
842 + const struct missing_filepair *elem2)
844 + return strcmp (elem1->binary, elem2->binary) == 0
845 + && ((elem1->debug == NULL) == (elem2->debug == NULL))
846 + && (elem1->debug == NULL || strcmp (elem1->debug, elem2->debug) == 0);
850 +missing_filepair_change (void)
852 + if (missing_filepair_hash != NULL)
854 + obstack_free (&missing_filepair_obstack, NULL);
855 + /* All their memory came just from missing_filepair_OBSTACK. */
856 + missing_filepair_hash = NULL;
861 +debug_print_executable_changed (void)
863 + missing_filepair_change ();
866 +/* Notify user the file BINARY with (possibly NULL) associated separate debug
867 + information file DEBUG is missing. DEBUG may or may not be the build-id
868 + file such as would be:
869 + /usr/lib/debug/.build-id/dd/b1d2ce632721c47bb9e8679f369e2295ce71be.debug
873 +debug_print_missing (const char *binary, const char *debug)
875 + size_t binary_len0 = strlen (binary) + 1;
876 + size_t debug_len0 = debug ? strlen (debug) + 1 : 0;
877 + struct missing_filepair missing_filepair_find;
878 + struct missing_filepair *missing_filepair;
879 + struct missing_filepair **slot;
881 + if (build_id_verbose < BUILD_ID_VERBOSE_FILENAMES)
884 + if (missing_filepair_hash == NULL)
886 + obstack_init (&missing_filepair_obstack);
887 + missing_filepair_hash = htab_create_alloc (64,
888 + (hashval_t (*) (const void *)) missing_filepair_hash_func,
889 + (int (*) (const void *, const void *)) missing_filepair_eq, NULL,
890 + missing_filepair_xcalloc, NULL);
893 + /* Use MISSING_FILEPAIR_FIND first instead of calling obstack_alloc with
894 + obstack_free in the case of a (rare) match. The problem is ALLOC_F for
895 + MISSING_FILEPAIR_HASH allocates from MISSING_FILEPAIR_OBSTACK maintenance
896 + structures for MISSING_FILEPAIR_HASH. Calling obstack_free would possibly
897 + not to free only MISSING_FILEPAIR but also some such structures (allocated
898 + during the htab_find_slot call). */
900 + missing_filepair_find.binary = (char *) binary;
901 + missing_filepair_find.debug = (char *) debug;
902 + slot = (struct missing_filepair **) htab_find_slot (missing_filepair_hash,
903 + &missing_filepair_find,
906 + /* While it may be still printed duplicitely with the missing debuginfo file
907 + * it is due to once printing about the binary file build-id link and once
908 + * about the .debug file build-id link as both the build-id symlinks are
909 + * located in the debuginfo package. */
914 + missing_filepair = obstack_alloc (&missing_filepair_obstack,
915 + sizeof (*missing_filepair) - 1
916 + + binary_len0 + debug_len0);
917 + missing_filepair->binary = missing_filepair->data;
918 + memcpy (missing_filepair->binary, binary, binary_len0);
921 + missing_filepair->debug = missing_filepair->binary + binary_len0;
922 + memcpy (missing_filepair->debug, debug, debug_len0);
925 + missing_filepair->debug = NULL;
927 + *slot = missing_filepair;
929 + /* We do not collect and flush these messages as each such message
930 + already requires its own separate lines. */
932 + fprintf_unfiltered (gdb_stdlog,
933 + _("Missing separate debuginfo for %s\n"), binary);
935 + fprintf_unfiltered (gdb_stdlog, _("Try to install the hash file %s\n"),
940 -find_separate_debug_file_by_buildid (struct objfile *objfile)
941 +find_separate_debug_file_by_buildid (struct objfile *objfile,
942 + char **build_id_filename_return)
944 const struct elf_build_id *build_id;
946 - build_id = build_id_bfd_get (objfile->obfd);
947 + if (build_id_filename_return)
948 + *build_id_filename_return = NULL;
950 + build_id = build_id_bfd_shdr_get (objfile->obfd);
951 if (build_id != NULL)
955 - build_id_name = build_id_to_debug_filename (build_id);
956 + build_id_name = build_id_to_filename (build_id, build_id_filename_return,
958 /* Prevent looping on a stripped .debug file. */
959 if (build_id_name != NULL
960 && filename_cmp (build_id_name, objfile->name) == 0)
961 @@ -1188,7 +1843,7 @@ find_separate_debug_file_by_buildid (str
962 xfree (build_id_name);
964 else if (build_id_name != NULL)
965 - return build_id_name;
966 + return build_id_name;
970 @@ -1426,9 +2081,10 @@ elf_symfile_read (struct objfile *objfil
971 && objfile->separate_debug_objfile == NULL
972 && objfile->separate_debug_objfile_backlink == NULL)
975 + char *debugfile, *build_id_filename;
977 - debugfile = find_separate_debug_file_by_buildid (objfile);
978 + debugfile = find_separate_debug_file_by_buildid (objfile,
979 + &build_id_filename);
981 if (debugfile == NULL)
982 debugfile = find_separate_debug_file_by_debuglink (objfile);
983 @@ -1442,6 +2098,12 @@ elf_symfile_read (struct objfile *objfil
984 symbol_file_add_separate (abfd, symfile_flags, objfile);
985 do_cleanups (cleanup);
987 + /* Check if any separate debug info has been extracted out. */
988 + else if (bfd_get_section_by_name (objfile->obfd, ".gnu_debuglink")
990 + debug_print_missing (objfile->name, build_id_filename);
992 + xfree (build_id_filename);
996 @@ -1761,4 +2423,16 @@ _initialize_elfread (void)
998 elf_objfile_gnu_ifunc_cache_data = register_objfile_data ();
999 gnu_ifunc_fns_p = &elf_gnu_ifunc_fns;
1001 + add_setshow_zinteger_cmd ("build-id-verbose", no_class, &build_id_verbose,
1003 +Set debugging level of the build-id locator."), _("\
1004 +Show debugging level of the build-id locator."), _("\
1005 +Level 1 (default) enables printing the missing debug filenames,\n\
1006 +level 2 also prints the parsing of binaries to find the identificators."),
1008 + show_build_id_verbose,
1009 + &setlist, &showlist);
1011 + observer_attach_executable_changed (debug_print_executable_changed);
1013 Index: gdb-7.6/gdb/symfile.h
1014 ===================================================================
1015 --- gdb-7.6.orig/gdb/symfile.h 2013-02-03 17:20:18.000000000 +0100
1016 +++ gdb-7.6/gdb/symfile.h 2013-07-17 05:28:49.291203541 +0200
1017 @@ -593,6 +593,12 @@ void free_symfile_segment_data (struct s
1019 extern struct cleanup *increment_reading_symtab (void);
1021 +/* build-id support. */
1022 +extern struct elf_build_id *build_id_addr_get (CORE_ADDR addr);
1023 +extern char *build_id_to_filename (const struct elf_build_id *build_id,
1024 + char **link_return, int add_debug_suffix);
1025 +extern void debug_print_missing (const char *binary, const char *debug);
1027 /* From dwarf2read.c */
1029 /* Names for a dwarf2 debugging section. The field NORMAL is the normal
1030 Index: gdb-7.6/gdb/testsuite/lib/gdb.exp
1031 ===================================================================
1032 --- gdb-7.6.orig/gdb/testsuite/lib/gdb.exp 2013-07-17 05:28:48.334203172 +0200
1033 +++ gdb-7.6/gdb/testsuite/lib/gdb.exp 2013-07-17 05:28:49.292203541 +0200
1034 @@ -1482,6 +1482,16 @@ proc default_gdb_start { } {
1035 warning "Couldn't set the width to 0."
1038 + # Turn off the missing warnings as the testsuite does not expect it.
1039 + send_gdb "set build-id-verbose 0\n"
1041 + -re "$gdb_prompt $" {
1042 + verbose "Disabled the missing debug infos warnings." 2
1045 + warning "Could not disable the missing debug infos warnings.."
1051 Index: gdb-7.6/gdb/testsuite/lib/mi-support.exp
1052 ===================================================================
1053 --- gdb-7.6.orig/gdb/testsuite/lib/mi-support.exp 2013-01-22 00:57:59.000000000 +0100
1054 +++ gdb-7.6/gdb/testsuite/lib/mi-support.exp 2013-07-17 05:28:49.292203541 +0200
1055 @@ -212,6 +212,16 @@ proc default_mi_gdb_start { args } {
1056 warning "Couldn't set the width to 0."
1059 + # Turn off the missing warnings as the testsuite does not expect it.
1060 + send_gdb "190-gdb-set build-id-verbose 0\n"
1062 + -re ".*190-gdb-set build-id-verbose 0\r\n190\\\^done\r\n$mi_gdb_prompt$" {
1063 + verbose "Disabled the missing debug infos warnings." 2
1066 + warning "Could not disable the missing debug infos warnings.."
1069 # If allowing the inferior to have its own PTY then assign the inferior
1070 # its own terminal device here.
1071 if { $separate_inferior_pty } {
1072 Index: gdb-7.6/gdb/objfiles.h
1073 ===================================================================
1074 --- gdb-7.6.orig/gdb/objfiles.h 2013-02-28 20:00:31.000000000 +0100
1075 +++ gdb-7.6/gdb/objfiles.h 2013-07-17 05:28:49.293203542 +0200
1076 @@ -432,6 +432,10 @@ struct objfile
1078 #define OBJF_MAINLINE (1 << 5)
1080 +/* This file was loaded according to the BUILD_ID_CORE_LOADS rules. */
1082 +#define OBJF_BUILD_ID_CORE_LOADED (1 << 12)
1084 /* The object file that contains the runtime common minimal symbols
1085 for SunOS4. Note that this objfile has no associated BFD. */
1087 Index: gdb-7.6/gdb/testsuite/gdb.base/corefile.exp
1088 ===================================================================
1089 --- gdb-7.6.orig/gdb/testsuite/gdb.base/corefile.exp 2013-01-01 07:33:25.000000000 +0100
1090 +++ gdb-7.6/gdb/testsuite/gdb.base/corefile.exp 2013-07-17 05:28:49.293203542 +0200
1091 @@ -256,3 +256,33 @@ if ![is_remote target] {
1097 +# Test auto-loading of binary files through build-id from the core file.
1098 +set buildid [build_id_debug_filename_get $binfile]
1099 +set wholetest "binfile found by build-id"
1100 +if {$buildid == ""} {
1101 + untested "$wholetest (binary has no build-id)"
1106 + regsub {\.debug$} $buildid {} buildid
1107 + set debugdir ${objdir}/${subdir}/${testfile}-debugdir
1108 + file delete -force -- $debugdir
1109 + file mkdir $debugdir/[file dirname $buildid]
1110 + file copy $binfile $debugdir/$buildid
1112 + set test "show debug-file-directory"
1113 + gdb_test_multiple $test $test {
1114 + -re "The directory where separate debug symbols are searched for is \"(.*)\"\\.\r\n$gdb_prompt $" {
1115 + set debugdir_orig $expect_out(1,string)
1119 + gdb_test_no_output "set debug-file-directory $debugdir:$debugdir_orig" "set debug-file-directory"
1120 + gdb_test "show build-id-core-loads" {Whether CORE-FILE loads the build-id associated files automatically is on\.}
1121 + gdb_test "core-file $corefile" "\r\nProgram terminated with .*" "core-file without executable"
1122 + gdb_test "info files" "Local exec file:\r\n\[ \t\]*`[string_to_regexp $debugdir/$buildid]', file type .*"