]>
Commit | Line | Data |
---|---|---|
4b0e5c1b AM |
1 | From FEDORA_PATCHES Mon Sep 17 00:00:00 2001 |
2 | From: Fedora GDB patches <invalid@email.com> | |
3 | Date: Fri, 27 Oct 2017 21:07:50 +0200 | |
4 | Subject: gdb-6.6-buildid-locate.patch | |
5 | ||
4b0e5c1b AM |
6 | ;; New locating of the matching binaries from the pure core file (build-id). |
7 | ;;=push+jan | |
4b0e5c1b AM |
8 | |
9 | diff --git a/gdb/build-id.c b/gdb/build-id.c | |
4b0e5c1b AM |
10 | --- a/gdb/build-id.c |
11 | +++ b/gdb/build-id.c | |
324d13e1 | 12 | @@ -26,11 +26,67 @@ |
321e94d6 BS |
13 | #include "objfiles.h" |
14 | #include "filenames.h" | |
324d13e1 | 15 | #include "gdbcore.h" |
3a58abaf | 16 | +#include "libbfd.h" |
51a5ef0f PS |
17 | +#include "gdbcore.h" |
18 | +#include "gdbcmd.h" | |
ed003b1c | 19 | +#include "observable.h" |
324d13e1 JR |
20 | +#include "elf/external.h" |
21 | +#include "elf/internal.h" | |
22 | +#include "elf/common.h" | |
23 | +#include "elf-bfd.h" | |
6ed6bacf | 24 | +#include <sys/stat.h> |
321e94d6 | 25 | + |
3a58abaf AM |
26 | +#define BUILD_ID_VERBOSE_NONE 0 |
27 | +#define BUILD_ID_VERBOSE_FILENAMES 1 | |
28 | +#define BUILD_ID_VERBOSE_BINARY_PARSE 2 | |
29 | +static int build_id_verbose = BUILD_ID_VERBOSE_FILENAMES; | |
30 | +static void | |
31 | +show_build_id_verbose (struct ui_file *file, int from_tty, | |
32 | + struct cmd_list_element *c, const char *value) | |
33 | +{ | |
34 | + fprintf_filtered (file, _("Verbosity level of the build-id locator is %s.\n"), | |
35 | + value); | |
36 | +} | |
6ed6bacf AM |
37 | +/* Locate NT_GNU_BUILD_ID and return its matching debug filename. |
38 | + FIXME: NOTE decoding should be unified with the BFD core notes decoding. */ | |
b1b25d28 | 39 | + |
324d13e1 | 40 | +static struct bfd_build_id * |
3a58abaf AM |
41 | +build_id_buf_get (bfd *templ, gdb_byte *buf, bfd_size_type size) |
42 | +{ | |
43 | + bfd_byte *p; | |
44 | + | |
45 | + p = buf; | |
46 | + while (p < buf + size) | |
47 | + { | |
48 | + /* FIXME: bad alignment assumption. */ | |
49 | + Elf_External_Note *xnp = (Elf_External_Note *) p; | |
50 | + size_t namesz = H_GET_32 (templ, xnp->namesz); | |
51 | + size_t descsz = H_GET_32 (templ, xnp->descsz); | |
321e94d6 | 52 | + bfd_byte *descdata = (gdb_byte *) xnp->name + BFD_ALIGN (namesz, 4); |
3a58abaf AM |
53 | + |
54 | + if (H_GET_32 (templ, xnp->type) == NT_GNU_BUILD_ID | |
55 | + && namesz == sizeof "GNU" | |
56 | + && memcmp (xnp->name, "GNU", sizeof "GNU") == 0) | |
57 | + { | |
58 | + size_t size = descsz; | |
140f8057 | 59 | + gdb_byte *data = (gdb_byte *) descdata; |
324d13e1 | 60 | + struct bfd_build_id *retval; |
3a58abaf | 61 | + |
140f8057 | 62 | + retval = (struct bfd_build_id *) xmalloc (sizeof *retval - 1 + size); |
3a58abaf AM |
63 | + retval->size = size; |
64 | + memcpy (retval->data, data, size); | |
324d13e1 | 65 | + |
3a58abaf AM |
66 | + return retval; |
67 | + } | |
68 | + p = descdata + BFD_ALIGN (descsz, 4); | |
69 | + } | |
70 | + return NULL; | |
71 | +} | |
324d13e1 JR |
72 | |
73 | /* See build-id.h. */ | |
74 | ||
75 | const struct bfd_build_id * | |
03ffe914 | 76 | -build_id_bfd_get (bfd *abfd) |
3a58abaf AM |
77 | +build_id_bfd_shdr_get (bfd *abfd) |
78 | { | |
324d13e1 JR |
79 | if (!bfd_check_format (abfd, bfd_object)) |
80 | return NULL; | |
4b0e5c1b | 81 | @@ -42,6 +98,348 @@ build_id_bfd_get (bfd *abfd) |
324d13e1 | 82 | return NULL; |
3a58abaf AM |
83 | } |
84 | ||
85 | +/* Core files may have missing (corrupt) SHDR but PDHR is correct there. | |
86 | + bfd_elf_bfd_from_remote_memory () has too much overhead by | |
87 | + allocating/reading all the available ELF PT_LOADs. */ | |
88 | + | |
324d13e1 | 89 | +static struct bfd_build_id * |
3a58abaf AM |
90 | +build_id_phdr_get (bfd *templ, bfd_vma loadbase, unsigned e_phnum, |
91 | + Elf_Internal_Phdr *i_phdr) | |
92 | +{ | |
93 | + int i; | |
324d13e1 | 94 | + struct bfd_build_id *retval = NULL; |
3a58abaf AM |
95 | + |
96 | + for (i = 0; i < e_phnum; i++) | |
97 | + if (i_phdr[i].p_type == PT_NOTE && i_phdr[i].p_filesz > 0) | |
98 | + { | |
99 | + Elf_Internal_Phdr *hdr = &i_phdr[i]; | |
100 | + gdb_byte *buf; | |
101 | + int err; | |
102 | + | |
140f8057 | 103 | + buf = (gdb_byte *) xmalloc (hdr->p_filesz); |
3a58abaf AM |
104 | + err = target_read_memory (loadbase + i_phdr[i].p_vaddr, buf, |
105 | + hdr->p_filesz); | |
106 | + if (err == 0) | |
107 | + retval = build_id_buf_get (templ, buf, hdr->p_filesz); | |
108 | + else | |
109 | + retval = NULL; | |
110 | + xfree (buf); | |
111 | + if (retval != NULL) | |
112 | + break; | |
113 | + } | |
114 | + return retval; | |
115 | +} | |
116 | + | |
117 | +/* First we validate the file by reading in the ELF header and checking | |
118 | + the magic number. */ | |
119 | + | |
120 | +static inline bfd_boolean | |
121 | +elf_file_p (Elf64_External_Ehdr *x_ehdrp64) | |
122 | +{ | |
123 | + gdb_assert (sizeof (Elf64_External_Ehdr) >= sizeof (Elf32_External_Ehdr)); | |
124 | + gdb_assert (offsetof (Elf64_External_Ehdr, e_ident) | |
125 | + == offsetof (Elf32_External_Ehdr, e_ident)); | |
126 | + gdb_assert (sizeof (((Elf64_External_Ehdr *) 0)->e_ident) | |
127 | + == sizeof (((Elf32_External_Ehdr *) 0)->e_ident)); | |
128 | + | |
129 | + return ((x_ehdrp64->e_ident[EI_MAG0] == ELFMAG0) | |
130 | + && (x_ehdrp64->e_ident[EI_MAG1] == ELFMAG1) | |
131 | + && (x_ehdrp64->e_ident[EI_MAG2] == ELFMAG2) | |
132 | + && (x_ehdrp64->e_ident[EI_MAG3] == ELFMAG3)); | |
133 | +} | |
134 | + | |
135 | +/* Translate an ELF file header in external format into an ELF file header in | |
136 | + internal format. */ | |
137 | + | |
138 | +#define H_GET_WORD(bfd, ptr) (is64 ? H_GET_64 (bfd, (ptr)) \ | |
139 | + : H_GET_32 (bfd, (ptr))) | |
140 | +#define H_GET_SIGNED_WORD(bfd, ptr) (is64 ? H_GET_S64 (bfd, (ptr)) \ | |
141 | + : H_GET_S32 (bfd, (ptr))) | |
142 | + | |
143 | +static void | |
144 | +elf_swap_ehdr_in (bfd *abfd, | |
145 | + const Elf64_External_Ehdr *src64, | |
146 | + Elf_Internal_Ehdr *dst) | |
147 | +{ | |
148 | + int is64 = bfd_get_arch_size (abfd) == 64; | |
149 | +#define SRC(field) (is64 ? src64->field \ | |
150 | + : ((const Elf32_External_Ehdr *) src64)->field) | |
151 | + | |
152 | + int signed_vma = get_elf_backend_data (abfd)->sign_extend_vma; | |
153 | + memcpy (dst->e_ident, SRC (e_ident), EI_NIDENT); | |
154 | + dst->e_type = H_GET_16 (abfd, SRC (e_type)); | |
155 | + dst->e_machine = H_GET_16 (abfd, SRC (e_machine)); | |
156 | + dst->e_version = H_GET_32 (abfd, SRC (e_version)); | |
157 | + if (signed_vma) | |
158 | + dst->e_entry = H_GET_SIGNED_WORD (abfd, SRC (e_entry)); | |
159 | + else | |
160 | + dst->e_entry = H_GET_WORD (abfd, SRC (e_entry)); | |
161 | + dst->e_phoff = H_GET_WORD (abfd, SRC (e_phoff)); | |
162 | + dst->e_shoff = H_GET_WORD (abfd, SRC (e_shoff)); | |
163 | + dst->e_flags = H_GET_32 (abfd, SRC (e_flags)); | |
164 | + dst->e_ehsize = H_GET_16 (abfd, SRC (e_ehsize)); | |
165 | + dst->e_phentsize = H_GET_16 (abfd, SRC (e_phentsize)); | |
166 | + dst->e_phnum = H_GET_16 (abfd, SRC (e_phnum)); | |
167 | + dst->e_shentsize = H_GET_16 (abfd, SRC (e_shentsize)); | |
168 | + dst->e_shnum = H_GET_16 (abfd, SRC (e_shnum)); | |
169 | + dst->e_shstrndx = H_GET_16 (abfd, SRC (e_shstrndx)); | |
170 | + | |
171 | +#undef SRC | |
172 | +} | |
173 | + | |
174 | +/* Translate an ELF program header table entry in external format into an | |
175 | + ELF program header table entry in internal format. */ | |
176 | + | |
a7de96f0 | 177 | +static void |
3a58abaf AM |
178 | +elf_swap_phdr_in (bfd *abfd, |
179 | + const Elf64_External_Phdr *src64, | |
180 | + Elf_Internal_Phdr *dst) | |
181 | +{ | |
182 | + int is64 = bfd_get_arch_size (abfd) == 64; | |
183 | +#define SRC(field) (is64 ? src64->field \ | |
184 | + : ((const Elf32_External_Phdr *) src64)->field) | |
185 | + | |
186 | + int signed_vma = get_elf_backend_data (abfd)->sign_extend_vma; | |
187 | + | |
188 | + dst->p_type = H_GET_32 (abfd, SRC (p_type)); | |
189 | + dst->p_flags = H_GET_32 (abfd, SRC (p_flags)); | |
190 | + dst->p_offset = H_GET_WORD (abfd, SRC (p_offset)); | |
191 | + if (signed_vma) | |
192 | + { | |
193 | + dst->p_vaddr = H_GET_SIGNED_WORD (abfd, SRC (p_vaddr)); | |
194 | + dst->p_paddr = H_GET_SIGNED_WORD (abfd, SRC (p_paddr)); | |
195 | + } | |
196 | + else | |
197 | + { | |
198 | + dst->p_vaddr = H_GET_WORD (abfd, SRC (p_vaddr)); | |
199 | + dst->p_paddr = H_GET_WORD (abfd, SRC (p_paddr)); | |
200 | + } | |
201 | + dst->p_filesz = H_GET_WORD (abfd, SRC (p_filesz)); | |
202 | + dst->p_memsz = H_GET_WORD (abfd, SRC (p_memsz)); | |
203 | + dst->p_align = H_GET_WORD (abfd, SRC (p_align)); | |
204 | + | |
205 | +#undef SRC | |
206 | +} | |
207 | + | |
208 | +#undef H_GET_SIGNED_WORD | |
209 | +#undef H_GET_WORD | |
210 | + | |
211 | +static Elf_Internal_Phdr * | |
212 | +elf_get_phdr (bfd *templ, bfd_vma ehdr_vma, unsigned *e_phnum_pointer, | |
213 | + bfd_vma *loadbase_pointer) | |
214 | +{ | |
215 | + /* sizeof (Elf64_External_Ehdr) >= sizeof (Elf32_External_Ehdr) */ | |
216 | + Elf64_External_Ehdr x_ehdr64; /* Elf file header, external form */ | |
217 | + Elf_Internal_Ehdr i_ehdr; /* Elf file header, internal form */ | |
218 | + bfd_size_type x_phdrs_size; | |
219 | + gdb_byte *x_phdrs_ptr; | |
220 | + Elf_Internal_Phdr *i_phdrs; | |
221 | + int err; | |
222 | + unsigned int i; | |
223 | + bfd_vma loadbase; | |
224 | + int loadbase_set; | |
225 | + | |
226 | + gdb_assert (templ != NULL); | |
227 | + gdb_assert (sizeof (Elf64_External_Ehdr) >= sizeof (Elf32_External_Ehdr)); | |
228 | + | |
229 | + /* Read in the ELF header in external format. */ | |
230 | + err = target_read_memory (ehdr_vma, (bfd_byte *) &x_ehdr64, sizeof x_ehdr64); | |
231 | + if (err) | |
232 | + { | |
233 | + if (build_id_verbose >= BUILD_ID_VERBOSE_BINARY_PARSE) | |
234 | + warning (_("build-id: Error reading ELF header at address 0x%lx"), | |
235 | + (unsigned long) ehdr_vma); | |
236 | + return NULL; | |
237 | + } | |
238 | + | |
239 | + /* Now check to see if we have a valid ELF file, and one that BFD can | |
240 | + make use of. The magic number must match, the address size ('class') | |
241 | + and byte-swapping must match our XVEC entry. */ | |
242 | + | |
243 | + if (! elf_file_p (&x_ehdr64) | |
244 | + || x_ehdr64.e_ident[EI_VERSION] != EV_CURRENT | |
245 | + || !((bfd_get_arch_size (templ) == 64 | |
246 | + && x_ehdr64.e_ident[EI_CLASS] == ELFCLASS64) | |
247 | + || (bfd_get_arch_size (templ) == 32 | |
248 | + && x_ehdr64.e_ident[EI_CLASS] == ELFCLASS32))) | |
249 | + { | |
250 | + if (build_id_verbose >= BUILD_ID_VERBOSE_BINARY_PARSE) | |
251 | + warning (_("build-id: Unrecognized ELF header at address 0x%lx"), | |
252 | + (unsigned long) ehdr_vma); | |
253 | + return NULL; | |
254 | + } | |
255 | + | |
256 | + /* Check that file's byte order matches xvec's */ | |
257 | + switch (x_ehdr64.e_ident[EI_DATA]) | |
258 | + { | |
259 | + case ELFDATA2MSB: /* Big-endian */ | |
260 | + if (! bfd_header_big_endian (templ)) | |
261 | + { | |
262 | + if (build_id_verbose >= BUILD_ID_VERBOSE_BINARY_PARSE) | |
263 | + warning (_("build-id: Unrecognized " | |
264 | + "big-endian ELF header at address 0x%lx"), | |
265 | + (unsigned long) ehdr_vma); | |
266 | + return NULL; | |
267 | + } | |
268 | + break; | |
269 | + case ELFDATA2LSB: /* Little-endian */ | |
270 | + if (! bfd_header_little_endian (templ)) | |
271 | + { | |
272 | + if (build_id_verbose >= BUILD_ID_VERBOSE_BINARY_PARSE) | |
273 | + warning (_("build-id: Unrecognized " | |
274 | + "little-endian ELF header at address 0x%lx"), | |
275 | + (unsigned long) ehdr_vma); | |
276 | + return NULL; | |
277 | + } | |
278 | + break; | |
279 | + case ELFDATANONE: /* No data encoding specified */ | |
280 | + default: /* Unknown data encoding specified */ | |
281 | + if (build_id_verbose >= BUILD_ID_VERBOSE_BINARY_PARSE) | |
282 | + warning (_("build-id: Unrecognized " | |
283 | + "ELF header endianity at address 0x%lx"), | |
284 | + (unsigned long) ehdr_vma); | |
285 | + return NULL; | |
286 | + } | |
287 | + | |
288 | + elf_swap_ehdr_in (templ, &x_ehdr64, &i_ehdr); | |
289 | + | |
290 | + /* The file header tells where to find the program headers. | |
291 | + These are what we use to actually choose what to read. */ | |
292 | + | |
293 | + if (i_ehdr.e_phentsize != (bfd_get_arch_size (templ) == 64 | |
294 | + ? sizeof (Elf64_External_Phdr) | |
295 | + : sizeof (Elf32_External_Phdr)) | |
296 | + || i_ehdr.e_phnum == 0) | |
297 | + { | |
298 | + if (build_id_verbose >= BUILD_ID_VERBOSE_BINARY_PARSE) | |
299 | + warning (_("build-id: Invalid ELF program headers from the ELF header " | |
300 | + "at address 0x%lx"), (unsigned long) ehdr_vma); | |
301 | + return NULL; | |
302 | + } | |
303 | + | |
304 | + x_phdrs_size = (bfd_get_arch_size (templ) == 64 ? sizeof (Elf64_External_Phdr) | |
305 | + : sizeof (Elf32_External_Phdr)); | |
306 | + | |
140f8057 JR |
307 | + i_phdrs = (Elf_Internal_Phdr *) xmalloc (i_ehdr.e_phnum * (sizeof *i_phdrs + x_phdrs_size)); |
308 | + x_phdrs_ptr = (gdb_byte *) &i_phdrs[i_ehdr.e_phnum]; | |
3a58abaf AM |
309 | + err = target_read_memory (ehdr_vma + i_ehdr.e_phoff, (bfd_byte *) x_phdrs_ptr, |
310 | + i_ehdr.e_phnum * x_phdrs_size); | |
311 | + if (err) | |
312 | + { | |
313 | + free (i_phdrs); | |
314 | + if (build_id_verbose >= BUILD_ID_VERBOSE_BINARY_PARSE) | |
315 | + warning (_("build-id: Error reading " | |
316 | + "ELF program headers at address 0x%lx"), | |
317 | + (unsigned long) (ehdr_vma + i_ehdr.e_phoff)); | |
318 | + return NULL; | |
319 | + } | |
320 | + | |
321 | + loadbase = ehdr_vma; | |
322 | + loadbase_set = 0; | |
323 | + for (i = 0; i < i_ehdr.e_phnum; ++i) | |
324 | + { | |
325 | + elf_swap_phdr_in (templ, (Elf64_External_Phdr *) | |
326 | + (x_phdrs_ptr + i * x_phdrs_size), &i_phdrs[i]); | |
327 | + /* IA-64 vDSO may have two mappings for one segment, where one mapping | |
328 | + is executable only, and one is read only. We must not use the | |
329 | + executable one (PF_R is the first one, PF_X the second one). */ | |
330 | + if (i_phdrs[i].p_type == PT_LOAD && (i_phdrs[i].p_flags & PF_R)) | |
331 | + { | |
332 | + /* Only the first PT_LOAD segment indicates the file bias. | |
333 | + Next segments may have P_VADDR arbitrarily higher. | |
334 | + If the first segment has P_VADDR zero any next segment must not | |
335 | + confuse us, the first one sets LOADBASE certainly enough. */ | |
336 | + if (!loadbase_set && i_phdrs[i].p_offset == 0) | |
337 | + { | |
338 | + loadbase = ehdr_vma - i_phdrs[i].p_vaddr; | |
339 | + loadbase_set = 1; | |
340 | + } | |
341 | + } | |
342 | + } | |
343 | + | |
344 | + if (build_id_verbose >= BUILD_ID_VERBOSE_BINARY_PARSE) | |
345 | + warning (_("build-id: Found ELF header at address 0x%lx, loadbase 0x%lx"), | |
346 | + (unsigned long) ehdr_vma, (unsigned long) loadbase); | |
347 | + | |
348 | + *e_phnum_pointer = i_ehdr.e_phnum; | |
349 | + *loadbase_pointer = loadbase; | |
350 | + return i_phdrs; | |
351 | +} | |
352 | + | |
353 | +/* BUILD_ID_ADDR_GET gets ADDR located somewhere in the object. | |
354 | + Find the first section before ADDR containing an ELF header. | |
355 | + We rely on the fact the sections from multiple files do not mix. | |
356 | + FIXME: We should check ADDR is contained _inside_ the section with possibly | |
357 | + missing content (P_FILESZ < P_MEMSZ). These omitted sections are currently | |
358 | + hidden by _BFD_ELF_MAKE_SECTION_FROM_PHDR. */ | |
359 | + | |
360 | +static CORE_ADDR build_id_addr; | |
361 | +struct build_id_addr_sect | |
362 | + { | |
363 | + struct build_id_addr_sect *next; | |
364 | + asection *sect; | |
365 | + }; | |
366 | +static struct build_id_addr_sect *build_id_addr_sect; | |
367 | + | |
368 | +static void build_id_addr_candidate (bfd *abfd, asection *sect, void *obj) | |
369 | +{ | |
370 | + if (build_id_addr >= bfd_section_vma (abfd, sect)) | |
371 | + { | |
372 | + struct build_id_addr_sect *candidate; | |
373 | + | |
140f8057 | 374 | + candidate = (struct build_id_addr_sect *) xmalloc (sizeof *candidate); |
3a58abaf AM |
375 | + candidate->next = build_id_addr_sect; |
376 | + build_id_addr_sect = candidate; | |
377 | + candidate->sect = sect; | |
378 | + } | |
379 | +} | |
380 | + | |
324d13e1 | 381 | +struct bfd_build_id * |
3a58abaf AM |
382 | +build_id_addr_get (CORE_ADDR addr) |
383 | +{ | |
384 | + struct build_id_addr_sect *candidate; | |
324d13e1 | 385 | + struct bfd_build_id *retval = NULL; |
3a58abaf AM |
386 | + Elf_Internal_Phdr *i_phdr = NULL; |
387 | + bfd_vma loadbase = 0; | |
388 | + unsigned e_phnum = 0; | |
389 | + | |
390 | + if (core_bfd == NULL) | |
391 | + return NULL; | |
392 | + | |
393 | + build_id_addr = addr; | |
394 | + gdb_assert (build_id_addr_sect == NULL); | |
395 | + bfd_map_over_sections (core_bfd, build_id_addr_candidate, NULL); | |
396 | + | |
397 | + /* Sections are sorted in the high-to-low VMAs order. | |
398 | + Stop the search on the first ELF header we find. | |
399 | + Do not continue the search even if it does not contain NT_GNU_BUILD_ID. */ | |
400 | + | |
401 | + for (candidate = build_id_addr_sect; candidate != NULL; | |
402 | + candidate = candidate->next) | |
403 | + { | |
404 | + i_phdr = elf_get_phdr (core_bfd, | |
405 | + bfd_section_vma (core_bfd, candidate->sect), | |
406 | + &e_phnum, &loadbase); | |
407 | + if (i_phdr != NULL) | |
408 | + break; | |
409 | + } | |
410 | + | |
411 | + if (i_phdr != NULL) | |
412 | + { | |
413 | + retval = build_id_phdr_get (core_bfd, loadbase, e_phnum, i_phdr); | |
414 | + xfree (i_phdr); | |
415 | + } | |
416 | + | |
417 | + while (build_id_addr_sect != NULL) | |
418 | + { | |
419 | + candidate = build_id_addr_sect; | |
420 | + build_id_addr_sect = candidate->next; | |
421 | + xfree (candidate); | |
422 | + } | |
423 | + | |
424 | + return retval; | |
425 | +} | |
426 | + | |
321e94d6 | 427 | /* See build-id.h. */ |
3a58abaf | 428 | |
321e94d6 | 429 | int |
4b0e5c1b | 430 | @@ -50,7 +448,7 @@ build_id_verify (bfd *abfd, size_t check_len, const bfd_byte *check) |
324d13e1 | 431 | const struct bfd_build_id *found; |
321e94d6 | 432 | int retval = 0; |
3a58abaf AM |
433 | |
434 | - found = build_id_bfd_get (abfd); | |
435 | + found = build_id_bfd_shdr_get (abfd); | |
436 | ||
437 | if (found == NULL) | |
321e94d6 | 438 | warning (_("File \"%s\" has no build-id, file skipped"), |
ed003b1c | 439 | @@ -65,11 +463,50 @@ build_id_verify (bfd *abfd, size_t check_len, const bfd_byte *check) |
321e94d6 | 440 | return retval; |
3a58abaf AM |
441 | } |
442 | ||
321e94d6 | 443 | +static char * |
03ffe914 JR |
444 | +link_resolve (const char *symlink, int level) |
445 | +{ | |
446 | + char buf[PATH_MAX + 1], *target, *retval; | |
447 | + ssize_t got; | |
448 | + | |
449 | + if (level > 10) | |
450 | + return xstrdup (symlink); | |
451 | + | |
452 | + got = readlink (symlink, buf, sizeof (buf)); | |
453 | + if (got < 0 || got >= sizeof (buf)) | |
454 | + return xstrdup (symlink); | |
455 | + buf[got] = '\0'; | |
456 | + | |
457 | + if (IS_ABSOLUTE_PATH (buf)) | |
458 | + target = xstrdup (buf); | |
459 | + else | |
460 | + { | |
140f8057 | 461 | + const std::string dir (ldirname (symlink)); |
03ffe914 | 462 | + |
03ffe914 JR |
463 | + target = xstrprintf ("%s" |
464 | +#ifndef HAVE_DOS_BASED_FILE_SYSTEM | |
465 | + "/" | |
466 | +#else /* HAVE_DOS_BASED_FILE_SYSTEM */ | |
467 | + "\\" | |
468 | +#endif /* HAVE_DOS_BASED_FILE_SYSTEM */ | |
140f8057 | 469 | + "%s", dir.c_str(), buf); |
03ffe914 JR |
470 | + } |
471 | + | |
472 | + retval = link_resolve (target, level + 1); | |
473 | + xfree (target); | |
474 | + return retval; | |
475 | +} | |
476 | + | |
321e94d6 BS |
477 | /* See build-id.h. */ |
478 | ||
140f8057 | 479 | gdb_bfd_ref_ptr |
321e94d6 BS |
480 | -build_id_to_debug_bfd (size_t build_id_len, const bfd_byte *build_id) |
481 | +build_id_to_debug_bfd (size_t build_id_len, const bfd_byte *build_id, | |
482 | + char **link_return, int add_debug_suffix) | |
3a58abaf | 483 | { |
ed003b1c AM |
484 | + char *debugdir; |
485 | + std::string link, link_all; | |
486 | + struct cleanup *back_to; | |
487 | + int ix; | |
140f8057 | 488 | gdb_bfd_ref_ptr abfd; |
ab050a48 BZ |
489 | |
490 | /* Keep backward compatibility so that DEBUG_FILE_DIRECTORY being "" will | |
ed003b1c AM |
491 | @@ -82,63 +519,296 @@ build_id_to_debug_bfd (size_t build_id_len, const bfd_byte *build_id) |
492 | { | |
321e94d6 BS |
493 | const gdb_byte *data = build_id; |
494 | size_t size = build_id_len; | |
ed003b1c AM |
495 | + char *filename = NULL; |
496 | + struct cleanup *inner; | |
6ed6bacf AM |
497 | + unsigned seqno; |
498 | + struct stat statbuf_trash; | |
ed003b1c AM |
499 | + std::string link0; |
500 | ||
501 | - std::string link = debugdir.get (); | |
502 | + link = debugdir.get (); | |
503 | link += "/.build-id/"; | |
6ed6bacf | 504 | |
ed003b1c AM |
505 | if (size > 0) |
506 | { | |
507 | size--; | |
508 | - string_appendf (link, "%02x/", (unsigned) *data++); | |
509 | + string_appendf (link, "%02x", (unsigned) *data++); | |
510 | } | |
511 | - | |
512 | + if (size > 0) | |
513 | + link += "/"; | |
ab050a48 | 514 | while (size-- > 0) |
ed003b1c | 515 | string_appendf (link, "%02x", (unsigned) *data++); |
4b0e5c1b | 516 | |
ed003b1c AM |
517 | - link += ".debug"; |
518 | - | |
4b0e5c1b | 519 | if (separate_debug_file_debug) |
ed003b1c | 520 | printf_unfiltered (_(" Trying %s\n"), link.c_str ()); |
321e94d6 BS |
521 | |
522 | - /* lrealpath() is expensive even for the usually non-existent files. */ | |
ed003b1c AM |
523 | - gdb::unique_xmalloc_ptr<char> filename; |
524 | - if (access (link.c_str (), F_OK) == 0) | |
525 | - filename.reset (lrealpath (link.c_str ())); | |
526 | - | |
527 | - if (filename == NULL) | |
528 | - continue; | |
4b0e5c1b AM |
529 | + for (seqno = 0;; seqno++) |
530 | + { | |
6ed6bacf AM |
531 | + if (seqno) |
532 | + { | |
533 | + /* There can be multiple build-id symlinks pointing to real files | |
534 | + with the same build-id (such as hard links). Some of the real | |
535 | + files may not be installed. */ | |
536 | + | |
ed003b1c | 537 | + string_appendf (link, ".%u", seqno); |
6ed6bacf | 538 | + } |
6ed6bacf AM |
539 | + |
540 | + if (add_debug_suffix) | |
ed003b1c | 541 | + link += ".debug"; |
03ffe914 JR |
542 | + |
543 | + if (!seqno) | |
544 | + { | |
545 | + /* If none of the real files is found report as missing file | |
546 | + always the non-.%u-suffixed file. */ | |
ed003b1c | 547 | + link0 = link; |
03ffe914 JR |
548 | + } |
549 | + | |
6ed6bacf | 550 | + /* `access' automatically dereferences LINK. */ |
ed003b1c | 551 | + if (lstat (link.c_str (), &statbuf_trash) != 0) |
6ed6bacf AM |
552 | + { |
553 | + /* Stop increasing SEQNO. */ | |
554 | + break; | |
555 | + } | |
556 | + | |
ed003b1c | 557 | + filename = lrealpath (link.c_str ()); |
321e94d6 BS |
558 | + if (filename == NULL) |
559 | + continue; | |
6ed6bacf | 560 | + |
321e94d6 | 561 | + /* We expect to be silent on the non-existing files. */ |
324d13e1 JR |
562 | + inner = make_cleanup (xfree, filename); |
563 | + abfd = gdb_bfd_open (filename, gnutarget, -1); | |
564 | + do_cleanups (inner); | |
140f8057 JR |
565 | + |
566 | + if (abfd == NULL) | |
567 | + continue; | |
4b0e5c1b | 568 | + |
140f8057 JR |
569 | + if (build_id_verify (abfd.get(), build_id_len, build_id)) |
570 | + break; | |
4b0e5c1b | 571 | + |
140f8057 | 572 | + abfd.release (); |
4b0e5c1b | 573 | + |
321e94d6 | 574 | + filename = NULL; |
ab050a48 | 575 | + } |
b1b25d28 | 576 | |
ed003b1c AM |
577 | - /* We expect to be silent on the non-existing files. */ |
578 | - abfd = gdb_bfd_open (filename.get (), gnutarget, -1); | |
321e94d6 | 579 | + if (filename != NULL) |
03ffe914 | 580 | + { |
321e94d6 | 581 | + /* LINK_ALL is not used below in this non-NULL FILENAME case. */ |
a7de96f0 | 582 | + break; |
03ffe914 | 583 | + } |
140f8057 | 584 | |
ed003b1c AM |
585 | - if (abfd == NULL) |
586 | - continue; | |
03ffe914 JR |
587 | + /* If the symlink has target request to install the target. |
588 | + BASE-debuginfo.rpm contains the symlink but BASE.rpm may be missing. | |
589 | + https://bugzilla.redhat.com/show_bug.cgi?id=981154 */ | |
ed003b1c | 590 | + std::string link0_resolved (link_resolve (link0.c_str (), 0)); |
4b0e5c1b | 591 | |
ed003b1c AM |
592 | - if (build_id_verify (abfd.get(), build_id_len, build_id)) |
593 | - break; | |
594 | + if (link_all.empty ()) | |
321e94d6 | 595 | + link_all = link0_resolved; |
03ffe914 | 596 | + else |
321e94d6 | 597 | + { |
03ffe914 JR |
598 | + /* Use whitespace instead of DIRNAME_SEPARATOR to be compatible with |
599 | + its possible use as an argument for installation command. */ | |
ed003b1c | 600 | + link_all += " " + link0_resolved; |
321e94d6 | 601 | + } |
a7de96f0 | 602 | + } |
ed003b1c AM |
603 | |
604 | - abfd.release (); | |
3a58abaf | 605 | + if (link_return != NULL) |
ab050a48 | 606 | + { |
321e94d6 | 607 | + if (abfd != NULL) |
03ffe914 | 608 | + { |
ed003b1c | 609 | + *link_return = xstrdup (link.c_str ()); |
03ffe914 | 610 | + } |
ab050a48 | 611 | + else |
03ffe914 | 612 | + { |
ed003b1c | 613 | + *link_return = xstrdup (link_all.c_str ()); |
03ffe914 | 614 | + } |
a7de96f0 | 615 | } |
a7de96f0 | 616 | |
321e94d6 | 617 | return abfd; |
a7de96f0 PS |
618 | } |
619 | ||
321e94d6 | 620 | +char * |
324d13e1 | 621 | +build_id_to_filename (const struct bfd_build_id *build_id, char **link_return) |
321e94d6 | 622 | +{ |
140f8057 | 623 | + gdb_bfd_ref_ptr abfd; |
321e94d6 BS |
624 | + char *result; |
625 | + | |
626 | + abfd = build_id_to_debug_bfd (build_id->size, build_id->data, link_return, 0); | |
627 | + if (abfd == NULL) | |
628 | + return NULL; | |
629 | + | |
630 | + result = xstrdup (bfd_get_filename (abfd)); | |
140f8057 | 631 | + abfd.release (); |
321e94d6 BS |
632 | + return result; |
633 | +} | |
634 | + | |
3a58abaf AM |
635 | +/* This MISSING_FILEPAIR_HASH tracker is used only for the duplicite messages |
636 | + Try to install the hash file ... | |
637 | + avoidance. */ | |
638 | + | |
639 | +struct missing_filepair | |
640 | + { | |
641 | + char *binary; | |
642 | + char *debug; | |
643 | + char data[1]; | |
644 | + }; | |
645 | + | |
646 | +static struct htab *missing_filepair_hash; | |
647 | +static struct obstack missing_filepair_obstack; | |
648 | + | |
649 | +static void * | |
650 | +missing_filepair_xcalloc (size_t nmemb, size_t nmemb_size) | |
651 | +{ | |
652 | + void *retval; | |
653 | + size_t size = nmemb * nmemb_size; | |
654 | + | |
655 | + retval = obstack_alloc (&missing_filepair_obstack, size); | |
656 | + memset (retval, 0, size); | |
a7de96f0 PS |
657 | + return retval; |
658 | +} | |
659 | + | |
3a58abaf AM |
660 | +static hashval_t |
661 | +missing_filepair_hash_func (const struct missing_filepair *elem) | |
662 | +{ | |
663 | + hashval_t retval = 0; | |
664 | + | |
665 | + retval ^= htab_hash_string (elem->binary); | |
666 | + if (elem->debug != NULL) | |
667 | + retval ^= htab_hash_string (elem->debug); | |
668 | + | |
669 | + return retval; | |
670 | +} | |
671 | + | |
672 | +static int | |
673 | +missing_filepair_eq (const struct missing_filepair *elem1, | |
674 | + const struct missing_filepair *elem2) | |
675 | +{ | |
676 | + return strcmp (elem1->binary, elem2->binary) == 0 | |
7566401a ER |
677 | + && ((elem1->debug == NULL) == (elem2->debug == NULL)) |
678 | + && (elem1->debug == NULL || strcmp (elem1->debug, elem2->debug) == 0); | |
3a58abaf AM |
679 | +} |
680 | + | |
681 | +static void | |
682 | +missing_filepair_change (void) | |
683 | +{ | |
684 | + if (missing_filepair_hash != NULL) | |
685 | + { | |
686 | + obstack_free (&missing_filepair_obstack, NULL); | |
687 | + /* All their memory came just from missing_filepair_OBSTACK. */ | |
688 | + missing_filepair_hash = NULL; | |
689 | + } | |
690 | +} | |
691 | + | |
692 | +static void | |
693 | +debug_print_executable_changed (void) | |
694 | +{ | |
695 | + missing_filepair_change (); | |
696 | +} | |
697 | + | |
698 | +/* Notify user the file BINARY with (possibly NULL) associated separate debug | |
699 | + information file DEBUG is missing. DEBUG may or may not be the build-id | |
700 | + file such as would be: | |
701 | + /usr/lib/debug/.build-id/dd/b1d2ce632721c47bb9e8679f369e2295ce71be.debug | |
702 | + */ | |
703 | + | |
704 | +void | |
705 | +debug_print_missing (const char *binary, const char *debug) | |
706 | +{ | |
707 | + size_t binary_len0 = strlen (binary) + 1; | |
708 | + size_t debug_len0 = debug ? strlen (debug) + 1 : 0; | |
7566401a | 709 | + struct missing_filepair missing_filepair_find; |
3a58abaf AM |
710 | + struct missing_filepair *missing_filepair; |
711 | + struct missing_filepair **slot; | |
712 | + | |
713 | + if (build_id_verbose < BUILD_ID_VERBOSE_FILENAMES) | |
714 | + return; | |
715 | + | |
716 | + if (missing_filepair_hash == NULL) | |
717 | + { | |
718 | + obstack_init (&missing_filepair_obstack); | |
719 | + missing_filepair_hash = htab_create_alloc (64, | |
720 | + (hashval_t (*) (const void *)) missing_filepair_hash_func, | |
721 | + (int (*) (const void *, const void *)) missing_filepair_eq, NULL, | |
722 | + missing_filepair_xcalloc, NULL); | |
723 | + } | |
724 | + | |
7566401a ER |
725 | + /* Use MISSING_FILEPAIR_FIND first instead of calling obstack_alloc with |
726 | + obstack_free in the case of a (rare) match. The problem is ALLOC_F for | |
727 | + MISSING_FILEPAIR_HASH allocates from MISSING_FILEPAIR_OBSTACK maintenance | |
728 | + structures for MISSING_FILEPAIR_HASH. Calling obstack_free would possibly | |
729 | + not to free only MISSING_FILEPAIR but also some such structures (allocated | |
730 | + during the htab_find_slot call). */ | |
731 | + | |
732 | + missing_filepair_find.binary = (char *) binary; | |
733 | + missing_filepair_find.debug = (char *) debug; | |
734 | + slot = (struct missing_filepair **) htab_find_slot (missing_filepair_hash, | |
735 | + &missing_filepair_find, | |
736 | + INSERT); | |
737 | + | |
738 | + /* While it may be still printed duplicitely with the missing debuginfo file | |
739 | + * it is due to once printing about the binary file build-id link and once | |
740 | + * about the .debug file build-id link as both the build-id symlinks are | |
741 | + * located in the debuginfo package. */ | |
742 | + | |
743 | + if (*slot != NULL) | |
744 | + return; | |
745 | + | |
140f8057 JR |
746 | + missing_filepair = (struct missing_filepair *) obstack_alloc (&missing_filepair_obstack, |
747 | + sizeof (*missing_filepair) - 1 | |
748 | + + binary_len0 + debug_len0); | |
3a58abaf AM |
749 | + missing_filepair->binary = missing_filepair->data; |
750 | + memcpy (missing_filepair->binary, binary, binary_len0); | |
751 | + if (debug != NULL) | |
752 | + { | |
753 | + missing_filepair->debug = missing_filepair->binary + binary_len0; | |
754 | + memcpy (missing_filepair->debug, debug, debug_len0); | |
755 | + } | |
756 | + else | |
757 | + missing_filepair->debug = NULL; | |
758 | + | |
3a58abaf AM |
759 | + *slot = missing_filepair; |
760 | + | |
761 | + /* We do not collect and flush these messages as each such message | |
762 | + already requires its own separate lines. */ | |
763 | + | |
764 | + fprintf_unfiltered (gdb_stdlog, | |
765 | + _("Missing separate debuginfo for %s\n"), binary); | |
766 | + if (debug != NULL) | |
767 | + fprintf_unfiltered (gdb_stdlog, _("Try to install the hash file %s\n"), | |
768 | + debug); | |
769 | +} | |
770 | + | |
321e94d6 BS |
771 | /* See build-id.h. */ |
772 | ||
ed003b1c | 773 | std::string |
51a5ef0f PS |
774 | -find_separate_debug_file_by_buildid (struct objfile *objfile) |
775 | +find_separate_debug_file_by_buildid (struct objfile *objfile, | |
140f8057 | 776 | + gdb::unique_xmalloc_ptr<char> *build_id_filename_return) |
3a58abaf | 777 | { |
324d13e1 | 778 | const struct bfd_build_id *build_id; |
3a58abaf AM |
779 | |
780 | - build_id = build_id_bfd_get (objfile->obfd); | |
51a5ef0f PS |
781 | + if (build_id_filename_return) |
782 | + *build_id_filename_return = NULL; | |
783 | + | |
3a58abaf AM |
784 | + build_id = build_id_bfd_shdr_get (objfile->obfd); |
785 | if (build_id != NULL) | |
786 | { | |
4b0e5c1b AM |
787 | if (separate_debug_file_debug) |
788 | printf_unfiltered (_("\nLooking for separate debug info (build-id) for " | |
789 | "%s\n"), objfile_name (objfile)); | |
790 | ||
140f8057 JR |
791 | + char *build_id_filename_cstr = NULL; |
792 | gdb_bfd_ref_ptr abfd (build_id_to_debug_bfd (build_id->size, | |
793 | - build_id->data)); | |
794 | + build_id->data, | |
795 | + (!build_id_filename_return ? NULL : &build_id_filename_cstr), 1)); | |
796 | + if (build_id_filename_return) | |
797 | + { | |
798 | + if (!build_id_filename_cstr) | |
799 | + gdb_assert (!*build_id_filename_return); | |
800 | + else | |
801 | + { | |
802 | + *build_id_filename_return = gdb::unique_xmalloc_ptr<char> (build_id_filename_cstr); | |
803 | + build_id_filename_cstr = NULL; | |
804 | + } | |
805 | + } | |
4b0e5c1b | 806 | + |
3a58abaf | 807 | /* Prevent looping on a stripped .debug file. */ |
321e94d6 | 808 | if (abfd != NULL |
140f8057 | 809 | && filename_cmp (bfd_get_filename (abfd.get ()), |
ed003b1c AM |
810 | @@ -151,3 +821,21 @@ find_separate_debug_file_by_buildid (struct objfile *objfile) |
811 | ||
812 | return std::string (); | |
51a5ef0f | 813 | } |
51a5ef0f | 814 | + |
321e94d6 | 815 | +extern void _initialize_build_id (void); |
51a5ef0f | 816 | + |
321e94d6 BS |
817 | +void |
818 | +_initialize_build_id (void) | |
819 | +{ | |
51a5ef0f PS |
820 | + add_setshow_zinteger_cmd ("build-id-verbose", no_class, &build_id_verbose, |
821 | + _("\ | |
822 | +Set debugging level of the build-id locator."), _("\ | |
823 | +Show debugging level of the build-id locator."), _("\ | |
824 | +Level 1 (default) enables printing the missing debug filenames,\n\ | |
825 | +level 2 also prints the parsing of binaries to find the identificators."), | |
826 | + NULL, | |
827 | + show_build_id_verbose, | |
828 | + &setlist, &showlist); | |
829 | + | |
ed003b1c | 830 | + gdb::observers::executable_changed.attach (debug_print_executable_changed); |
4b0e5c1b AM |
831 | +} |
832 | diff --git a/gdb/build-id.h b/gdb/build-id.h | |
4b0e5c1b AM |
833 | --- a/gdb/build-id.h |
834 | +++ b/gdb/build-id.h | |
835 | @@ -22,9 +22,10 @@ | |
836 | ||
837 | #include "gdb_bfd.h" | |
838 | ||
839 | -/* Locate NT_GNU_BUILD_ID from ABFD and return its content. */ | |
840 | +/* Separate debuginfo files have corrupted PHDR but SHDR is correct there. | |
841 | + Locate NT_GNU_BUILD_ID from ABFD and return its content. */ | |
842 | ||
843 | -extern const struct bfd_build_id *build_id_bfd_get (bfd *abfd); | |
844 | +extern const struct bfd_build_id *build_id_bfd_shdr_get (bfd *abfd); | |
845 | ||
846 | /* Return true if ABFD has NT_GNU_BUILD_ID matching the CHECK value. | |
847 | Otherwise, issue a warning and return false. */ | |
ed003b1c | 848 | @@ -38,13 +39,18 @@ extern int build_id_verify (bfd *abfd, |
4b0e5c1b AM |
849 | the caller. */ |
850 | ||
851 | extern gdb_bfd_ref_ptr build_id_to_debug_bfd (size_t build_id_len, | |
852 | - const bfd_byte *build_id); | |
853 | + const bfd_byte *build_id, | |
854 | + char **link_return, | |
855 | + int add_debug_suffix); | |
856 | + | |
857 | +extern char *build_id_to_filename (const struct bfd_build_id *build_id, | |
858 | + char **link_return); | |
859 | ||
860 | /* Find the separate debug file for OBJFILE, by using the build-id | |
ed003b1c AM |
861 | associated with OBJFILE's BFD. If successful, returns the file name for the |
862 | separate debug file, otherwise, return an empty string. */ | |
4b0e5c1b | 863 | |
ed003b1c AM |
864 | -extern std::string find_separate_debug_file_by_buildid |
865 | - (struct objfile *objfile); | |
866 | +extern std::string find_separate_debug_file_by_buildid (struct objfile *objfile, | |
4b0e5c1b AM |
867 | + gdb::unique_xmalloc_ptr<char> *build_id_filename_return); |
868 | ||
869 | #endif /* BUILD_ID_H */ | |
870 | diff --git a/gdb/coffread.c b/gdb/coffread.c | |
4b0e5c1b AM |
871 | --- a/gdb/coffread.c |
872 | +++ b/gdb/coffread.c | |
ed003b1c AM |
873 | @@ -733,7 +733,8 @@ coff_symfile_read (struct objfile *objfile, symfile_add_flags symfile_flags) |
874 | /* Try to add separate debug file if no symbols table found. */ | |
875 | if (!objfile_has_partial_symbols (objfile)) | |
4b0e5c1b | 876 | { |
ed003b1c AM |
877 | - std::string debugfile = find_separate_debug_file_by_buildid (objfile); |
878 | + std::string debugfile = find_separate_debug_file_by_buildid (objfile, | |
879 | + NULL); | |
4b0e5c1b | 880 | |
ed003b1c | 881 | if (debugfile.empty ()) |
4b0e5c1b AM |
882 | debugfile = find_separate_debug_file_by_debuglink (objfile); |
883 | diff --git a/gdb/corelow.c b/gdb/corelow.c | |
4b0e5c1b AM |
884 | --- a/gdb/corelow.c |
885 | +++ b/gdb/corelow.c | |
886 | @@ -45,6 +45,10 @@ | |
887 | #include "gdb_bfd.h" | |
888 | #include "completer.h" | |
889 | #include "filestuff.h" | |
890 | +#include "auxv.h" | |
891 | +#include "elf/common.h" | |
892 | +#include "gdbcmd.h" | |
893 | +#include "build-id.h" | |
894 | ||
895 | #ifndef O_LARGEFILE | |
896 | #define O_LARGEFILE 0 | |
ed003b1c | 897 | @@ -321,6 +325,54 @@ add_to_thread_list (bfd *abfd, asection *asect, void *reg_sect_arg) |
4b0e5c1b AM |
898 | inferior_ptid = ptid; /* Yes, make it current. */ |
899 | } | |
900 | ||
901 | +static int build_id_core_loads = 1; | |
902 | + | |
903 | +static void | |
904 | +build_id_locate_exec (int from_tty) | |
905 | +{ | |
906 | + CORE_ADDR at_entry; | |
907 | + struct bfd_build_id *build_id; | |
908 | + char *execfilename, *debug_filename; | |
909 | + char *build_id_filename; | |
910 | + struct cleanup *back_to; | |
911 | + | |
912 | + if (exec_bfd != NULL || symfile_objfile != NULL) | |
913 | + return; | |
914 | + | |
ed003b1c | 915 | + if (target_auxv_search (current_top_target (), AT_ENTRY, &at_entry) <= 0) |
4b0e5c1b AM |
916 | + return; |
917 | + | |
918 | + build_id = build_id_addr_get (at_entry); | |
919 | + if (build_id == NULL) | |
920 | + return; | |
921 | + back_to = make_cleanup (xfree, build_id); | |
922 | + | |
923 | + /* SYMFILE_OBJFILE should refer to the main executable (not only to its | |
924 | + separate debug info file). gcc44+ keeps .eh_frame only in the main | |
925 | + executable without its duplicate .debug_frame in the separate debug info | |
926 | + file - such .eh_frame would not be found if SYMFILE_OBJFILE would refer | |
927 | + directly to the separate debug info file. */ | |
928 | + | |
929 | + execfilename = build_id_to_filename (build_id, &build_id_filename); | |
930 | + make_cleanup (xfree, build_id_filename); | |
931 | + | |
932 | + if (execfilename != NULL) | |
933 | + { | |
934 | + make_cleanup (xfree, execfilename); | |
935 | + exec_file_attach (execfilename, from_tty); | |
936 | + symbol_file_add_main (execfilename, | |
937 | + symfile_add_flag (!from_tty ? 0 : SYMFILE_VERBOSE)); | |
938 | + if (symfile_objfile != NULL) | |
939 | + symfile_objfile->flags |= OBJF_BUILD_ID_CORE_LOADED; | |
940 | + } | |
941 | + else | |
942 | + debug_print_missing (_("the main executable file"), build_id_filename); | |
943 | + | |
944 | + do_cleanups (back_to); | |
945 | + | |
946 | + /* No automatic SOLIB_ADD as the libraries would get read twice. */ | |
321e94d6 | 947 | +} |
4b0e5c1b | 948 | + |
ed003b1c | 949 | /* Issue a message saying we have no core to debug, if FROM_TTY. */ |
b1b25d28 | 950 | |
4b0e5c1b | 951 | static void |
ed003b1c AM |
952 | @@ -464,6 +516,14 @@ core_target_open (const char *arg, int from_tty) |
953 | switch_to_thread (thread); | |
4b0e5c1b | 954 | } |
b1b25d28 | 955 | |
4b0e5c1b AM |
956 | + /* Find the build_id identifiers. If it gets executed after |
957 | + POST_CREATE_INFERIOR we would clash with asking to discard the already | |
958 | + loaded VDSO symbols. If it gets executed before bfd_map_over_sections | |
959 | + INFERIOR_PTID is still not set and libthread_db initialization crashes on | |
960 | + PID == 0 in ps_pglobal_lookup. */ | |
961 | + if (build_id_core_loads != 0) | |
962 | + build_id_locate_exec (from_tty); | |
963 | + | |
ed003b1c | 964 | post_create_inferior (target, from_tty); |
b1b25d28 | 965 | |
4b0e5c1b | 966 | /* Now go through the target stack looking for threads since there |
ed003b1c AM |
967 | @@ -1072,4 +1132,11 @@ void |
968 | _initialize_corelow (void) | |
969 | { | |
970 | add_target (core_target_info, core_target_open, filename_completer); | |
3a58abaf | 971 | + |
4b0e5c1b AM |
972 | + add_setshow_boolean_cmd ("build-id-core-loads", class_files, |
973 | + &build_id_core_loads, _("\ | |
974 | +Set whether CORE-FILE loads the build-id associated files automatically."), _("\ | |
975 | +Show whether CORE-FILE loads the build-id associated files automatically."), | |
976 | + NULL, NULL, NULL, | |
977 | + &setlist, &showlist); | |
978 | } | |
979 | diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo | |
4b0e5c1b AM |
980 | --- a/gdb/doc/gdb.texinfo |
981 | +++ b/gdb/doc/gdb.texinfo | |
ed003b1c | 982 | @@ -19570,6 +19570,27 @@ information files. |
321e94d6 | 983 | |
4b0e5c1b | 984 | @end table |
3a58abaf | 985 | |
4b0e5c1b AM |
986 | +You can also adjust the current verbosity of the @dfn{build id} locating. |
987 | + | |
988 | +@table @code | |
989 | + | |
990 | +@kindex set build-id-verbose | |
991 | +@item set build-id-verbose 0 | |
992 | +No additional messages are printed. | |
993 | + | |
994 | +@item set build-id-verbose 1 | |
995 | +Missing separate debug filenames are printed. | |
996 | + | |
997 | +@item set build-id-verbose 2 | |
998 | +Missing separate debug filenames are printed and also all the parsing of the | |
999 | +binaries to find their @dfn{build id} content is printed. | |
1000 | + | |
1001 | +@kindex show build-id-verbose | |
1002 | +@item show build-id-verbose | |
1003 | +Show the current verbosity value for the @dfn{build id} content locating. | |
1004 | + | |
1005 | +@end table | |
1006 | + | |
1007 | @cindex @code{.gnu_debuglink} sections | |
1008 | @cindex debug link sections | |
1009 | A debug link is a special section of the executable file named | |
1010 | diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c | |
4b0e5c1b AM |
1011 | --- a/gdb/dwarf2read.c |
1012 | +++ b/gdb/dwarf2read.c | |
ed003b1c | 1013 | @@ -2683,7 +2683,7 @@ dwarf2_get_dwz_file (struct dwarf2_per_objfile *dwarf2_per_objfile) |
d566d21e | 1014 | } |
7566401a | 1015 | |
321e94d6 BS |
1016 | if (dwz_bfd == NULL) |
1017 | - dwz_bfd = build_id_to_debug_bfd (buildid_len, buildid); | |
1018 | + dwz_bfd = build_id_to_debug_bfd (buildid_len, buildid, NULL, 1); | |
a7de96f0 | 1019 | |
321e94d6 BS |
1020 | if (dwz_bfd == NULL) |
1021 | error (_("could not find '.gnu_debugaltlink' file for %s"), | |
4b0e5c1b | 1022 | diff --git a/gdb/elfread.c b/gdb/elfread.c |
4b0e5c1b AM |
1023 | --- a/gdb/elfread.c |
1024 | +++ b/gdb/elfread.c | |
ed003b1c | 1025 | @@ -1290,7 +1290,9 @@ elf_symfile_read (struct objfile *objfile, symfile_add_flags symfile_flags) |
4b0e5c1b AM |
1026 | && objfile->separate_debug_objfile == NULL |
1027 | && objfile->separate_debug_objfile_backlink == NULL) | |
1028 | { | |
ed003b1c | 1029 | - std::string debugfile = find_separate_debug_file_by_buildid (objfile); |
4b0e5c1b | 1030 | + gdb::unique_xmalloc_ptr<char> build_id_filename; |
ed003b1c AM |
1031 | + std::string debugfile |
1032 | + = find_separate_debug_file_by_buildid (objfile, &build_id_filename); | |
4b0e5c1b | 1033 | |
ed003b1c AM |
1034 | if (debugfile.empty ()) |
1035 | debugfile = find_separate_debug_file_by_debuglink (objfile); | |
1036 | @@ -1302,6 +1304,10 @@ elf_symfile_read (struct objfile *objfile, symfile_add_flags symfile_flags) | |
1037 | symbol_file_add_separate (abfd.get (), debugfile.c_str (), | |
4b0e5c1b AM |
1038 | symfile_flags, objfile); |
1039 | } | |
1040 | + /* Check if any separate debug info has been extracted out. */ | |
1041 | + else if (bfd_get_section_by_name (objfile->obfd, ".gnu_debuglink") | |
1042 | + != NULL) | |
1043 | + debug_print_missing (objfile_name (objfile), build_id_filename.get ()); | |
1044 | } | |
1045 | } | |
1046 | ||
1047 | diff --git a/gdb/objfiles.h b/gdb/objfiles.h | |
4b0e5c1b AM |
1048 | --- a/gdb/objfiles.h |
1049 | +++ b/gdb/objfiles.h | |
1050 | @@ -470,6 +470,10 @@ struct objfile | |
1051 | htab_t static_links {}; | |
1052 | }; | |
1053 | ||
1054 | +/* This file was loaded according to the BUILD_ID_CORE_LOADS rules. */ | |
1055 | + | |
1056 | +#define OBJF_BUILD_ID_CORE_LOADED static_cast<enum objfile_flag>(1 << 12) | |
1057 | + | |
1058 | /* Declarations for functions defined in objfiles.c */ | |
1059 | ||
1060 | extern struct gdbarch *get_objfile_arch (const struct objfile *); | |
1061 | diff --git a/gdb/python/py-objfile.c b/gdb/python/py-objfile.c | |
4b0e5c1b AM |
1062 | --- a/gdb/python/py-objfile.c |
1063 | +++ b/gdb/python/py-objfile.c | |
1064 | @@ -137,7 +137,7 @@ objfpy_get_build_id (PyObject *self, void *closure) | |
b1b25d28 | 1065 | |
324d13e1 | 1066 | TRY |
b1b25d28 JR |
1067 | { |
1068 | - build_id = build_id_bfd_get (objfile->obfd); | |
1069 | + build_id = build_id_bfd_shdr_get (objfile->obfd); | |
1070 | } | |
324d13e1 JR |
1071 | CATCH (except, RETURN_MASK_ALL) |
1072 | { | |
4b0e5c1b | 1073 | @@ -544,7 +544,7 @@ objfpy_lookup_objfile_by_build_id (const char *build_id) |
b1b25d28 JR |
1074 | /* Don't return separate debug files. */ |
1075 | if (objfile->separate_debug_objfile_backlink != NULL) | |
1076 | continue; | |
1077 | - obfd_build_id = build_id_bfd_get (objfile->obfd); | |
1078 | + obfd_build_id = build_id_bfd_shdr_get (objfile->obfd); | |
1079 | if (obfd_build_id == NULL) | |
1080 | continue; | |
1081 | if (objfpy_build_id_matches (obfd_build_id, build_id)) | |
4b0e5c1b | 1082 | diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c |
4b0e5c1b AM |
1083 | --- a/gdb/solib-svr4.c |
1084 | +++ b/gdb/solib-svr4.c | |
1085 | @@ -45,6 +45,7 @@ | |
1086 | #include "auxv.h" | |
1087 | #include "gdb_bfd.h" | |
1088 | #include "probe.h" | |
1089 | +#include "build-id.h" | |
324d13e1 | 1090 | |
4b0e5c1b AM |
1091 | static struct link_map_offsets *svr4_fetch_link_map_offsets (void); |
1092 | static int svr4_have_link_map_offsets (void); | |
ed003b1c | 1093 | @@ -1356,9 +1357,51 @@ svr4_read_so_list (CORE_ADDR lm, CORE_ADDR prev_lm, |
4b0e5c1b AM |
1094 | continue; |
1095 | } | |
324d13e1 | 1096 | |
ed003b1c | 1097 | - strncpy (newobj->so_name, buffer.get (), SO_NAME_MAX_PATH_SIZE - 1); |
4b0e5c1b AM |
1098 | - newobj->so_name[SO_NAME_MAX_PATH_SIZE - 1] = '\0'; |
1099 | - strcpy (newobj->so_original_name, newobj->so_name); | |
1100 | + { | |
1101 | + struct bfd_build_id *build_id; | |
1102 | + | |
ed003b1c | 1103 | + strncpy (newobj->so_original_name, buffer.get (), SO_NAME_MAX_PATH_SIZE - 1); |
4b0e5c1b AM |
1104 | + newobj->so_original_name[SO_NAME_MAX_PATH_SIZE - 1] = '\0'; |
1105 | + /* May get overwritten below. */ | |
1106 | + strcpy (newobj->so_name, newobj->so_original_name); | |
1107 | + | |
ed003b1c | 1108 | + build_id = build_id_addr_get (((lm_info_svr4 *) newobj->lm_info)->l_ld); |
4b0e5c1b AM |
1109 | + if (build_id != NULL) |
1110 | + { | |
1111 | + char *name, *build_id_filename; | |
1112 | + | |
1113 | + /* Missing the build-id matching separate debug info file | |
1114 | + would be handled while SO_NAME gets loaded. */ | |
1115 | + name = build_id_to_filename (build_id, &build_id_filename); | |
1116 | + if (name != NULL) | |
1117 | + { | |
1118 | + strncpy (newobj->so_name, name, SO_NAME_MAX_PATH_SIZE - 1); | |
1119 | + newobj->so_name[SO_NAME_MAX_PATH_SIZE - 1] = '\0'; | |
1120 | + xfree (name); | |
1121 | + } | |
1122 | + else | |
1123 | + { | |
1124 | + debug_print_missing (newobj->so_name, build_id_filename); | |
1125 | + | |
1126 | + /* In the case the main executable was found according to | |
1127 | + its build-id (from a core file) prevent loading | |
1128 | + a different build of a library with accidentally the | |
1129 | + same SO_NAME. | |
1130 | + | |
1131 | + It suppresses bogus backtraces (and prints "??" there | |
1132 | + instead) if the on-disk files no longer match the | |
1133 | + running program version. */ | |
1134 | + | |
1135 | + if (symfile_objfile != NULL | |
1136 | + && (symfile_objfile->flags | |
1137 | + & OBJF_BUILD_ID_CORE_LOADED) != 0) | |
1138 | + newobj->so_name[0] = 0; | |
1139 | + } | |
1140 | + | |
1141 | + xfree (build_id_filename); | |
1142 | + xfree (build_id); | |
1143 | + } | |
1144 | + } | |
4b0e5c1b AM |
1145 | |
1146 | /* If this entry has no name, or its name matches the name | |
ed003b1c | 1147 | for the main executable, don't include it in the list. */ |
4b0e5c1b | 1148 | diff --git a/gdb/symfile.h b/gdb/symfile.h |
4b0e5c1b AM |
1149 | --- a/gdb/symfile.h |
1150 | +++ b/gdb/symfile.h | |
ed003b1c | 1151 | @@ -537,6 +537,10 @@ void expand_symtabs_matching |
4b0e5c1b AM |
1152 | void map_symbol_filenames (symbol_filename_ftype *fun, void *data, |
1153 | int need_fullname); | |
1154 | ||
1155 | +/* build-id support. */ | |
1156 | +extern struct bfd_build_id *build_id_addr_get (CORE_ADDR addr); | |
1157 | +extern void debug_print_missing (const char *binary, const char *debug); | |
1158 | + | |
1159 | /* From dwarf2read.c */ | |
1160 | ||
1161 | /* Names for a dwarf2 debugging section. The field NORMAL is the normal | |
1162 | diff --git a/gdb/testsuite/gdb.base/corefile.exp b/gdb/testsuite/gdb.base/corefile.exp | |
4b0e5c1b AM |
1163 | --- a/gdb/testsuite/gdb.base/corefile.exp |
1164 | +++ b/gdb/testsuite/gdb.base/corefile.exp | |
1165 | @@ -311,3 +311,33 @@ gdb_test_multiple "core-file $corefile" $test { | |
1166 | pass $test | |
1167 | } | |
1168 | } | |
1169 | + | |
1170 | + | |
1171 | +# Test auto-loading of binary files through build-id from the core file. | |
1172 | +set buildid [build_id_debug_filename_get $binfile] | |
1173 | +set wholetest "binfile found by build-id" | |
1174 | +if {$buildid == ""} { | |
1175 | + untested "$wholetest (binary has no build-id)" | |
1176 | +} else { | |
1177 | + gdb_exit | |
1178 | + gdb_start | |
1179 | + | |
1180 | + regsub {\.debug$} $buildid {} buildid | |
1181 | + set debugdir [standard_output_file ${testfile}-debugdir] | |
1182 | + file delete -force -- $debugdir | |
1183 | + file mkdir $debugdir/[file dirname $buildid] | |
1184 | + file copy $binfile $debugdir/$buildid | |
1185 | + | |
1186 | + set test "show debug-file-directory" | |
1187 | + gdb_test_multiple $test $test { | |
1188 | + -re "The directory where separate debug symbols are searched for is \"(.*)\"\\.\r\n$gdb_prompt $" { | |
1189 | + set debugdir_orig $expect_out(1,string) | |
1190 | + pass $test | |
1191 | + } | |
1192 | + } | |
1193 | + gdb_test_no_output "set debug-file-directory $debugdir:$debugdir_orig" "set debug-file-directory" | |
1194 | + gdb_test "show build-id-core-loads" {Whether CORE-FILE loads the build-id associated files automatically is on\.} | |
1195 | + gdb_test "core-file $corefile" "\r\nProgram terminated with .*" "core-file without executable" | |
1196 | + gdb_test "info files" "Local exec file:\r\n\[ \t\]*`[string_to_regexp $debugdir/$buildid]', file type .*" | |
1197 | + pass $wholetest | |
1198 | +} | |
1199 | diff --git a/gdb/testsuite/gdb.base/new-ui-pending-input.exp b/gdb/testsuite/gdb.base/new-ui-pending-input.exp | |
4b0e5c1b AM |
1200 | --- a/gdb/testsuite/gdb.base/new-ui-pending-input.exp |
1201 | +++ b/gdb/testsuite/gdb.base/new-ui-pending-input.exp | |
1202 | @@ -62,6 +62,7 @@ proc test_command_line_new_ui_pending_input {} { | |
1203 | set options "" | |
1204 | append options " -iex \"set height 0\"" | |
1205 | append options " -iex \"set width 0\"" | |
1206 | + append options " -iex \"set build-id-verbose 0\"" | |
1207 | append options " -iex \"new-ui console $extra_tty_name\"" | |
1208 | append options " -ex \"b $bpline\"" | |
1209 | append options " -ex \"run\"" | |
1210 | diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp | |
4b0e5c1b AM |
1211 | --- a/gdb/testsuite/lib/gdb.exp |
1212 | +++ b/gdb/testsuite/lib/gdb.exp | |
ed003b1c | 1213 | @@ -1695,6 +1695,16 @@ proc default_gdb_start { } { |
4b0e5c1b AM |
1214 | warning "Couldn't set the width to 0." |
1215 | } | |
1216 | } | |
1217 | + # Turn off the missing warnings as the testsuite does not expect it. | |
1218 | + send_gdb "set build-id-verbose 0\n" | |
1219 | + gdb_expect 10 { | |
1220 | + -re "$gdb_prompt $" { | |
1221 | + verbose "Disabled the missing debug infos warnings." 2 | |
1222 | + } | |
1223 | + timeout { | |
1224 | + warning "Could not disable the missing debug infos warnings.." | |
1225 | + } | |
1226 | + } | |
1227 | return 0 | |
1228 | } | |
1229 | ||
1230 | diff --git a/gdb/testsuite/lib/mi-support.exp b/gdb/testsuite/lib/mi-support.exp | |
4b0e5c1b AM |
1231 | --- a/gdb/testsuite/lib/mi-support.exp |
1232 | +++ b/gdb/testsuite/lib/mi-support.exp | |
1233 | @@ -309,6 +309,16 @@ proc default_mi_gdb_start { args } { | |
1234 | warning "Couldn't set the width to 0." | |
1235 | } | |
1236 | } | |
1237 | + # Turn off the missing warnings as the testsuite does not expect it. | |
1238 | + send_gdb "190-gdb-set build-id-verbose 0\n" | |
1239 | + gdb_expect 10 { | |
1240 | + -re ".*190-gdb-set build-id-verbose 0\r\n190\\\^done\r\n$mi_gdb_prompt$" { | |
1241 | + verbose "Disabled the missing debug infos warnings." 2 | |
1242 | + } | |
1243 | + timeout { | |
1244 | + warning "Could not disable the missing debug infos warnings.." | |
1245 | + } | |
1246 | + } | |
1247 | ||
1248 | if { $separate_inferior_pty } { | |
1249 | mi_create_inferior_pty |