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