|
 |
6240d7 |
From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
|
|
|
6240d7 |
From: Fedora GDB patches <invalid@email.com>
|
|
|
6240d7 |
Date: Fri, 27 Oct 2017 21:07:50 +0200
|
|
|
6240d7 |
Subject: gdb-6.6-buildid-locate.patch
|
|
|
6240d7 |
|
|
|
6240d7 |
;; New locating of the matching binaries from the pure core file (build-id).
|
|
|
6240d7 |
;;=push+jan
|
|
|
6240d7 |
|
|
|
6240d7 |
diff --git a/gdb/build-id.c b/gdb/build-id.c
|
|
|
6240d7 |
--- a/gdb/build-id.c
|
|
|
6240d7 |
+++ b/gdb/build-id.c
|
|
|
6240d7 |
@@ -26,11 +26,67 @@
|
|
|
6240d7 |
#include "objfiles.h"
|
|
|
6240d7 |
#include "filenames.h"
|
|
|
6240d7 |
#include "gdbcore.h"
|
|
|
6240d7 |
+#include "libbfd.h"
|
|
|
6240d7 |
+#include "gdbcore.h"
|
|
|
6240d7 |
+#include "gdbcmd.h"
|
|
|
6240d7 |
+#include "observable.h"
|
|
|
6240d7 |
+#include "elf/external.h"
|
|
|
6240d7 |
+#include "elf/internal.h"
|
|
|
6240d7 |
+#include "elf/common.h"
|
|
|
6240d7 |
+#include "elf-bfd.h"
|
|
|
6240d7 |
+#include <sys/stat.h>
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+#define BUILD_ID_VERBOSE_NONE 0
|
|
|
6240d7 |
+#define BUILD_ID_VERBOSE_FILENAMES 1
|
|
|
6240d7 |
+#define BUILD_ID_VERBOSE_BINARY_PARSE 2
|
|
|
6240d7 |
+static int build_id_verbose = BUILD_ID_VERBOSE_FILENAMES;
|
|
|
6240d7 |
+static void
|
|
|
6240d7 |
+show_build_id_verbose (struct ui_file *file, int from_tty,
|
|
|
6240d7 |
+ struct cmd_list_element *c, const char *value)
|
|
|
6240d7 |
+{
|
|
|
6240d7 |
+ fprintf_filtered (file, _("Verbosity level of the build-id locator is %s.\n"),
|
|
|
6240d7 |
+ value);
|
|
|
6240d7 |
+}
|
|
|
6240d7 |
+/* Locate NT_GNU_BUILD_ID and return its matching debug filename.
|
|
|
6240d7 |
+ FIXME: NOTE decoding should be unified with the BFD core notes decoding. */
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+static struct bfd_build_id *
|
|
|
6240d7 |
+build_id_buf_get (bfd *templ, gdb_byte *buf, bfd_size_type size)
|
|
|
6240d7 |
+{
|
|
|
6240d7 |
+ bfd_byte *p;
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ p = buf;
|
|
|
6240d7 |
+ while (p < buf + size)
|
|
|
6240d7 |
+ {
|
|
|
6240d7 |
+ /* FIXME: bad alignment assumption. */
|
|
|
6240d7 |
+ Elf_External_Note *xnp = (Elf_External_Note *) p;
|
|
|
6240d7 |
+ size_t namesz = H_GET_32 (templ, xnp->namesz);
|
|
|
6240d7 |
+ size_t descsz = H_GET_32 (templ, xnp->descsz);
|
|
|
6240d7 |
+ bfd_byte *descdata = (gdb_byte *) xnp->name + BFD_ALIGN (namesz, 4);
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ if (H_GET_32 (templ, xnp->type) == NT_GNU_BUILD_ID
|
|
|
6240d7 |
+ && namesz == sizeof "GNU"
|
|
|
6240d7 |
+ && memcmp (xnp->name, "GNU", sizeof "GNU") == 0)
|
|
|
6240d7 |
+ {
|
|
|
6240d7 |
+ size_t sz = descsz;
|
|
|
6240d7 |
+ gdb_byte *data = (gdb_byte *) descdata;
|
|
|
6240d7 |
+ struct bfd_build_id *retval;
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ retval = (struct bfd_build_id *) xmalloc (sizeof *retval - 1 + sz);
|
|
|
6240d7 |
+ retval->size = sz;
|
|
|
6240d7 |
+ memcpy (retval->data, data, sz);
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ return retval;
|
|
|
6240d7 |
+ }
|
|
|
6240d7 |
+ p = descdata + BFD_ALIGN (descsz, 4);
|
|
|
6240d7 |
+ }
|
|
|
6240d7 |
+ return NULL;
|
|
|
6240d7 |
+}
|
|
|
6240d7 |
|
|
|
6240d7 |
/* See build-id.h. */
|
|
|
6240d7 |
|
|
|
6240d7 |
const struct bfd_build_id *
|
|
|
6240d7 |
-build_id_bfd_get (bfd *abfd)
|
|
|
6240d7 |
+build_id_bfd_shdr_get (bfd *abfd)
|
|
|
6240d7 |
{
|
|
|
6240d7 |
if (!bfd_check_format (abfd, bfd_object))
|
|
|
6240d7 |
return NULL;
|
|
|
6240d7 |
@@ -42,6 +98,348 @@ build_id_bfd_get (bfd *abfd)
|
|
|
6240d7 |
return NULL;
|
|
|
6240d7 |
}
|
|
|
6240d7 |
|
|
|
6240d7 |
+/* Core files may have missing (corrupt) SHDR but PDHR is correct there.
|
|
|
6240d7 |
+ bfd_elf_bfd_from_remote_memory () has too much overhead by
|
|
|
6240d7 |
+ allocating/reading all the available ELF PT_LOADs. */
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+static struct bfd_build_id *
|
|
|
6240d7 |
+build_id_phdr_get (bfd *templ, bfd_vma loadbase, unsigned e_phnum,
|
|
|
6240d7 |
+ Elf_Internal_Phdr *i_phdr)
|
|
|
6240d7 |
+{
|
|
|
6240d7 |
+ int i;
|
|
|
6240d7 |
+ struct bfd_build_id *retval = NULL;
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ for (i = 0; i < e_phnum; i++)
|
|
|
6240d7 |
+ if (i_phdr[i].p_type == PT_NOTE && i_phdr[i].p_filesz > 0)
|
|
|
6240d7 |
+ {
|
|
|
6240d7 |
+ Elf_Internal_Phdr *hdr = &i_phdr[i];
|
|
|
6240d7 |
+ gdb_byte *buf;
|
|
|
6240d7 |
+ int err;
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ buf = (gdb_byte *) xmalloc (hdr->p_filesz);
|
|
|
6240d7 |
+ err = target_read_memory (loadbase + i_phdr[i].p_vaddr, buf,
|
|
|
6240d7 |
+ hdr->p_filesz);
|
|
|
6240d7 |
+ if (err == 0)
|
|
|
6240d7 |
+ retval = build_id_buf_get (templ, buf, hdr->p_filesz);
|
|
|
6240d7 |
+ else
|
|
|
6240d7 |
+ retval = NULL;
|
|
|
6240d7 |
+ xfree (buf);
|
|
|
6240d7 |
+ if (retval != NULL)
|
|
|
6240d7 |
+ break;
|
|
|
6240d7 |
+ }
|
|
|
6240d7 |
+ return retval;
|
|
|
6240d7 |
+}
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+/* First we validate the file by reading in the ELF header and checking
|
|
|
6240d7 |
+ the magic number. */
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+static inline bfd_boolean
|
|
|
6240d7 |
+elf_file_p (Elf64_External_Ehdr *x_ehdrp64)
|
|
|
6240d7 |
+{
|
|
|
6240d7 |
+ gdb_assert (sizeof (Elf64_External_Ehdr) >= sizeof (Elf32_External_Ehdr));
|
|
|
6240d7 |
+ gdb_assert (offsetof (Elf64_External_Ehdr, e_ident)
|
|
|
6240d7 |
+ == offsetof (Elf32_External_Ehdr, e_ident));
|
|
|
6240d7 |
+ gdb_assert (sizeof (((Elf64_External_Ehdr *) 0)->e_ident)
|
|
|
6240d7 |
+ == sizeof (((Elf32_External_Ehdr *) 0)->e_ident));
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ return ((x_ehdrp64->e_ident[EI_MAG0] == ELFMAG0)
|
|
|
6240d7 |
+ && (x_ehdrp64->e_ident[EI_MAG1] == ELFMAG1)
|
|
|
6240d7 |
+ && (x_ehdrp64->e_ident[EI_MAG2] == ELFMAG2)
|
|
|
6240d7 |
+ && (x_ehdrp64->e_ident[EI_MAG3] == ELFMAG3));
|
|
|
6240d7 |
+}
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+/* Translate an ELF file header in external format into an ELF file header in
|
|
|
6240d7 |
+ internal format. */
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+#define H_GET_WORD(bfd, ptr) (is64 ? H_GET_64 (bfd, (ptr)) \
|
|
|
6240d7 |
+ : H_GET_32 (bfd, (ptr)))
|
|
|
6240d7 |
+#define H_GET_SIGNED_WORD(bfd, ptr) (is64 ? H_GET_S64 (bfd, (ptr)) \
|
|
|
6240d7 |
+ : H_GET_S32 (bfd, (ptr)))
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+static void
|
|
|
6240d7 |
+elf_swap_ehdr_in (bfd *abfd,
|
|
|
6240d7 |
+ const Elf64_External_Ehdr *src64,
|
|
|
6240d7 |
+ Elf_Internal_Ehdr *dst)
|
|
|
6240d7 |
+{
|
|
|
6240d7 |
+ int is64 = bfd_get_arch_size (abfd) == 64;
|
|
|
6240d7 |
+#define SRC(field) (is64 ? src64->field \
|
|
|
6240d7 |
+ : ((const Elf32_External_Ehdr *) src64)->field)
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ int signed_vma = get_elf_backend_data (abfd)->sign_extend_vma;
|
|
|
6240d7 |
+ memcpy (dst->e_ident, SRC (e_ident), EI_NIDENT);
|
|
|
6240d7 |
+ dst->e_type = H_GET_16 (abfd, SRC (e_type));
|
|
|
6240d7 |
+ dst->e_machine = H_GET_16 (abfd, SRC (e_machine));
|
|
|
6240d7 |
+ dst->e_version = H_GET_32 (abfd, SRC (e_version));
|
|
|
6240d7 |
+ if (signed_vma)
|
|
|
6240d7 |
+ dst->e_entry = H_GET_SIGNED_WORD (abfd, SRC (e_entry));
|
|
|
6240d7 |
+ else
|
|
|
6240d7 |
+ dst->e_entry = H_GET_WORD (abfd, SRC (e_entry));
|
|
|
6240d7 |
+ dst->e_phoff = H_GET_WORD (abfd, SRC (e_phoff));
|
|
|
6240d7 |
+ dst->e_shoff = H_GET_WORD (abfd, SRC (e_shoff));
|
|
|
6240d7 |
+ dst->e_flags = H_GET_32 (abfd, SRC (e_flags));
|
|
|
6240d7 |
+ dst->e_ehsize = H_GET_16 (abfd, SRC (e_ehsize));
|
|
|
6240d7 |
+ dst->e_phentsize = H_GET_16 (abfd, SRC (e_phentsize));
|
|
|
6240d7 |
+ dst->e_phnum = H_GET_16 (abfd, SRC (e_phnum));
|
|
|
6240d7 |
+ dst->e_shentsize = H_GET_16 (abfd, SRC (e_shentsize));
|
|
|
6240d7 |
+ dst->e_shnum = H_GET_16 (abfd, SRC (e_shnum));
|
|
|
6240d7 |
+ dst->e_shstrndx = H_GET_16 (abfd, SRC (e_shstrndx));
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+#undef SRC
|
|
|
6240d7 |
+}
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+/* Translate an ELF program header table entry in external format into an
|
|
|
6240d7 |
+ ELF program header table entry in internal format. */
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+static void
|
|
|
6240d7 |
+elf_swap_phdr_in (bfd *abfd,
|
|
|
6240d7 |
+ const Elf64_External_Phdr *src64,
|
|
|
6240d7 |
+ Elf_Internal_Phdr *dst)
|
|
|
6240d7 |
+{
|
|
|
6240d7 |
+ int is64 = bfd_get_arch_size (abfd) == 64;
|
|
|
6240d7 |
+#define SRC(field) (is64 ? src64->field \
|
|
|
6240d7 |
+ : ((const Elf32_External_Phdr *) src64)->field)
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ int signed_vma = get_elf_backend_data (abfd)->sign_extend_vma;
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ dst->p_type = H_GET_32 (abfd, SRC (p_type));
|
|
|
6240d7 |
+ dst->p_flags = H_GET_32 (abfd, SRC (p_flags));
|
|
|
6240d7 |
+ dst->p_offset = H_GET_WORD (abfd, SRC (p_offset));
|
|
|
6240d7 |
+ if (signed_vma)
|
|
|
6240d7 |
+ {
|
|
|
6240d7 |
+ dst->p_vaddr = H_GET_SIGNED_WORD (abfd, SRC (p_vaddr));
|
|
|
6240d7 |
+ dst->p_paddr = H_GET_SIGNED_WORD (abfd, SRC (p_paddr));
|
|
|
6240d7 |
+ }
|
|
|
6240d7 |
+ else
|
|
|
6240d7 |
+ {
|
|
|
6240d7 |
+ dst->p_vaddr = H_GET_WORD (abfd, SRC (p_vaddr));
|
|
|
6240d7 |
+ dst->p_paddr = H_GET_WORD (abfd, SRC (p_paddr));
|
|
|
6240d7 |
+ }
|
|
|
6240d7 |
+ dst->p_filesz = H_GET_WORD (abfd, SRC (p_filesz));
|
|
|
6240d7 |
+ dst->p_memsz = H_GET_WORD (abfd, SRC (p_memsz));
|
|
|
6240d7 |
+ dst->p_align = H_GET_WORD (abfd, SRC (p_align));
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+#undef SRC
|
|
|
6240d7 |
+}
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+#undef H_GET_SIGNED_WORD
|
|
|
6240d7 |
+#undef H_GET_WORD
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+static Elf_Internal_Phdr *
|
|
|
6240d7 |
+elf_get_phdr (bfd *templ, bfd_vma ehdr_vma, unsigned *e_phnum_pointer,
|
|
|
6240d7 |
+ bfd_vma *loadbase_pointer)
|
|
|
6240d7 |
+{
|
|
|
6240d7 |
+ /* sizeof (Elf64_External_Ehdr) >= sizeof (Elf32_External_Ehdr) */
|
|
|
6240d7 |
+ Elf64_External_Ehdr x_ehdr64; /* Elf file header, external form */
|
|
|
6240d7 |
+ Elf_Internal_Ehdr i_ehdr; /* Elf file header, internal form */
|
|
|
6240d7 |
+ bfd_size_type x_phdrs_size;
|
|
|
6240d7 |
+ gdb_byte *x_phdrs_ptr;
|
|
|
6240d7 |
+ Elf_Internal_Phdr *i_phdrs;
|
|
|
6240d7 |
+ int err;
|
|
|
6240d7 |
+ unsigned int i;
|
|
|
6240d7 |
+ bfd_vma loadbase;
|
|
|
6240d7 |
+ int loadbase_set;
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ gdb_assert (templ != NULL);
|
|
|
6240d7 |
+ gdb_assert (sizeof (Elf64_External_Ehdr) >= sizeof (Elf32_External_Ehdr));
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ /* Read in the ELF header in external format. */
|
|
|
6240d7 |
+ err = target_read_memory (ehdr_vma, (bfd_byte *) &x_ehdr64, sizeof x_ehdr64);
|
|
|
6240d7 |
+ if (err)
|
|
|
6240d7 |
+ {
|
|
|
6240d7 |
+ if (build_id_verbose >= BUILD_ID_VERBOSE_BINARY_PARSE)
|
|
|
6240d7 |
+ warning (_("build-id: Error reading ELF header at address 0x%lx"),
|
|
|
6240d7 |
+ (unsigned long) ehdr_vma);
|
|
|
6240d7 |
+ return NULL;
|
|
|
6240d7 |
+ }
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ /* Now check to see if we have a valid ELF file, and one that BFD can
|
|
|
6240d7 |
+ make use of. The magic number must match, the address size ('class')
|
|
|
6240d7 |
+ and byte-swapping must match our XVEC entry. */
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ if (! elf_file_p (&x_ehdr64)
|
|
|
6240d7 |
+ || x_ehdr64.e_ident[EI_VERSION] != EV_CURRENT
|
|
|
6240d7 |
+ || !((bfd_get_arch_size (templ) == 64
|
|
|
6240d7 |
+ && x_ehdr64.e_ident[EI_CLASS] == ELFCLASS64)
|
|
|
6240d7 |
+ || (bfd_get_arch_size (templ) == 32
|
|
|
6240d7 |
+ && x_ehdr64.e_ident[EI_CLASS] == ELFCLASS32)))
|
|
|
6240d7 |
+ {
|
|
|
6240d7 |
+ if (build_id_verbose >= BUILD_ID_VERBOSE_BINARY_PARSE)
|
|
|
6240d7 |
+ warning (_("build-id: Unrecognized ELF header at address 0x%lx"),
|
|
|
6240d7 |
+ (unsigned long) ehdr_vma);
|
|
|
6240d7 |
+ return NULL;
|
|
|
6240d7 |
+ }
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ /* Check that file's byte order matches xvec's */
|
|
|
6240d7 |
+ switch (x_ehdr64.e_ident[EI_DATA])
|
|
|
6240d7 |
+ {
|
|
|
6240d7 |
+ case ELFDATA2MSB: /* Big-endian */
|
|
|
6240d7 |
+ if (! bfd_header_big_endian (templ))
|
|
|
6240d7 |
+ {
|
|
|
6240d7 |
+ if (build_id_verbose >= BUILD_ID_VERBOSE_BINARY_PARSE)
|
|
|
6240d7 |
+ warning (_("build-id: Unrecognized "
|
|
|
6240d7 |
+ "big-endian ELF header at address 0x%lx"),
|
|
|
6240d7 |
+ (unsigned long) ehdr_vma);
|
|
|
6240d7 |
+ return NULL;
|
|
|
6240d7 |
+ }
|
|
|
6240d7 |
+ break;
|
|
|
6240d7 |
+ case ELFDATA2LSB: /* Little-endian */
|
|
|
6240d7 |
+ if (! bfd_header_little_endian (templ))
|
|
|
6240d7 |
+ {
|
|
|
6240d7 |
+ if (build_id_verbose >= BUILD_ID_VERBOSE_BINARY_PARSE)
|
|
|
6240d7 |
+ warning (_("build-id: Unrecognized "
|
|
|
6240d7 |
+ "little-endian ELF header at address 0x%lx"),
|
|
|
6240d7 |
+ (unsigned long) ehdr_vma);
|
|
|
6240d7 |
+ return NULL;
|
|
|
6240d7 |
+ }
|
|
|
6240d7 |
+ break;
|
|
|
6240d7 |
+ case ELFDATANONE: /* No data encoding specified */
|
|
|
6240d7 |
+ default: /* Unknown data encoding specified */
|
|
|
6240d7 |
+ if (build_id_verbose >= BUILD_ID_VERBOSE_BINARY_PARSE)
|
|
|
6240d7 |
+ warning (_("build-id: Unrecognized "
|
|
|
6240d7 |
+ "ELF header endianity at address 0x%lx"),
|
|
|
6240d7 |
+ (unsigned long) ehdr_vma);
|
|
|
6240d7 |
+ return NULL;
|
|
|
6240d7 |
+ }
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ elf_swap_ehdr_in (templ, &x_ehdr64, &i_ehdr);
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ /* The file header tells where to find the program headers.
|
|
|
6240d7 |
+ These are what we use to actually choose what to read. */
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ if (i_ehdr.e_phentsize != (bfd_get_arch_size (templ) == 64
|
|
|
6240d7 |
+ ? sizeof (Elf64_External_Phdr)
|
|
|
6240d7 |
+ : sizeof (Elf32_External_Phdr))
|
|
|
6240d7 |
+ || i_ehdr.e_phnum == 0)
|
|
|
6240d7 |
+ {
|
|
|
6240d7 |
+ if (build_id_verbose >= BUILD_ID_VERBOSE_BINARY_PARSE)
|
|
|
6240d7 |
+ warning (_("build-id: Invalid ELF program headers from the ELF header "
|
|
|
6240d7 |
+ "at address 0x%lx"), (unsigned long) ehdr_vma);
|
|
|
6240d7 |
+ return NULL;
|
|
|
6240d7 |
+ }
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ x_phdrs_size = (bfd_get_arch_size (templ) == 64 ? sizeof (Elf64_External_Phdr)
|
|
|
6240d7 |
+ : sizeof (Elf32_External_Phdr));
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ i_phdrs = (Elf_Internal_Phdr *) xmalloc (i_ehdr.e_phnum * (sizeof *i_phdrs + x_phdrs_size));
|
|
|
6240d7 |
+ x_phdrs_ptr = (gdb_byte *) &i_phdrs[i_ehdr.e_phnum];
|
|
|
6240d7 |
+ err = target_read_memory (ehdr_vma + i_ehdr.e_phoff, (bfd_byte *) x_phdrs_ptr,
|
|
|
6240d7 |
+ i_ehdr.e_phnum * x_phdrs_size);
|
|
|
6240d7 |
+ if (err)
|
|
|
6240d7 |
+ {
|
|
|
6240d7 |
+ free (i_phdrs);
|
|
|
6240d7 |
+ if (build_id_verbose >= BUILD_ID_VERBOSE_BINARY_PARSE)
|
|
|
6240d7 |
+ warning (_("build-id: Error reading "
|
|
|
6240d7 |
+ "ELF program headers at address 0x%lx"),
|
|
|
6240d7 |
+ (unsigned long) (ehdr_vma + i_ehdr.e_phoff));
|
|
|
6240d7 |
+ return NULL;
|
|
|
6240d7 |
+ }
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ loadbase = ehdr_vma;
|
|
|
6240d7 |
+ loadbase_set = 0;
|
|
|
6240d7 |
+ for (i = 0; i < i_ehdr.e_phnum; ++i)
|
|
|
6240d7 |
+ {
|
|
|
6240d7 |
+ elf_swap_phdr_in (templ, (Elf64_External_Phdr *)
|
|
|
6240d7 |
+ (x_phdrs_ptr + i * x_phdrs_size), &i_phdrs[i]);
|
|
|
6240d7 |
+ /* IA-64 vDSO may have two mappings for one segment, where one mapping
|
|
|
6240d7 |
+ is executable only, and one is read only. We must not use the
|
|
|
6240d7 |
+ executable one (PF_R is the first one, PF_X the second one). */
|
|
|
6240d7 |
+ if (i_phdrs[i].p_type == PT_LOAD && (i_phdrs[i].p_flags & PF_R))
|
|
|
6240d7 |
+ {
|
|
|
6240d7 |
+ /* Only the first PT_LOAD segment indicates the file bias.
|
|
|
6240d7 |
+ Next segments may have P_VADDR arbitrarily higher.
|
|
|
6240d7 |
+ If the first segment has P_VADDR zero any next segment must not
|
|
|
6240d7 |
+ confuse us, the first one sets LOADBASE certainly enough. */
|
|
|
6240d7 |
+ if (!loadbase_set && i_phdrs[i].p_offset == 0)
|
|
|
6240d7 |
+ {
|
|
|
6240d7 |
+ loadbase = ehdr_vma - i_phdrs[i].p_vaddr;
|
|
|
6240d7 |
+ loadbase_set = 1;
|
|
|
6240d7 |
+ }
|
|
|
6240d7 |
+ }
|
|
|
6240d7 |
+ }
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ if (build_id_verbose >= BUILD_ID_VERBOSE_BINARY_PARSE)
|
|
|
6240d7 |
+ warning (_("build-id: Found ELF header at address 0x%lx, loadbase 0x%lx"),
|
|
|
6240d7 |
+ (unsigned long) ehdr_vma, (unsigned long) loadbase);
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ *e_phnum_pointer = i_ehdr.e_phnum;
|
|
|
6240d7 |
+ *loadbase_pointer = loadbase;
|
|
|
6240d7 |
+ return i_phdrs;
|
|
|
6240d7 |
+}
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+/* BUILD_ID_ADDR_GET gets ADDR located somewhere in the object.
|
|
|
6240d7 |
+ Find the first section before ADDR containing an ELF header.
|
|
|
6240d7 |
+ We rely on the fact the sections from multiple files do not mix.
|
|
|
6240d7 |
+ FIXME: We should check ADDR is contained _inside_ the section with possibly
|
|
|
6240d7 |
+ missing content (P_FILESZ < P_MEMSZ). These omitted sections are currently
|
|
|
6240d7 |
+ hidden by _BFD_ELF_MAKE_SECTION_FROM_PHDR. */
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+static CORE_ADDR build_id_addr;
|
|
|
6240d7 |
+struct build_id_addr_sect
|
|
|
6240d7 |
+ {
|
|
|
6240d7 |
+ struct build_id_addr_sect *next;
|
|
|
6240d7 |
+ asection *sect;
|
|
|
6240d7 |
+ };
|
|
|
6240d7 |
+static struct build_id_addr_sect *build_id_addr_sect;
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+static void build_id_addr_candidate (bfd *abfd, asection *sect, void *obj)
|
|
|
6240d7 |
+{
|
|
|
6240d7 |
+ if (build_id_addr >= bfd_section_vma (abfd, sect))
|
|
|
6240d7 |
+ {
|
|
|
6240d7 |
+ struct build_id_addr_sect *candidate;
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ candidate = (struct build_id_addr_sect *) xmalloc (sizeof *candidate);
|
|
|
6240d7 |
+ candidate->next = build_id_addr_sect;
|
|
|
6240d7 |
+ build_id_addr_sect = candidate;
|
|
|
6240d7 |
+ candidate->sect = sect;
|
|
|
6240d7 |
+ }
|
|
|
6240d7 |
+}
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+struct bfd_build_id *
|
|
|
6240d7 |
+build_id_addr_get (CORE_ADDR addr)
|
|
|
6240d7 |
+{
|
|
|
6240d7 |
+ struct build_id_addr_sect *candidate;
|
|
|
6240d7 |
+ struct bfd_build_id *retval = NULL;
|
|
|
6240d7 |
+ Elf_Internal_Phdr *i_phdr = NULL;
|
|
|
6240d7 |
+ bfd_vma loadbase = 0;
|
|
|
6240d7 |
+ unsigned e_phnum = 0;
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ if (core_bfd == NULL)
|
|
|
6240d7 |
+ return NULL;
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ build_id_addr = addr;
|
|
|
6240d7 |
+ gdb_assert (build_id_addr_sect == NULL);
|
|
|
6240d7 |
+ bfd_map_over_sections (core_bfd, build_id_addr_candidate, NULL);
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ /* Sections are sorted in the high-to-low VMAs order.
|
|
|
6240d7 |
+ Stop the search on the first ELF header we find.
|
|
|
6240d7 |
+ Do not continue the search even if it does not contain NT_GNU_BUILD_ID. */
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ for (candidate = build_id_addr_sect; candidate != NULL;
|
|
|
6240d7 |
+ candidate = candidate->next)
|
|
|
6240d7 |
+ {
|
|
|
6240d7 |
+ i_phdr = elf_get_phdr (core_bfd,
|
|
|
6240d7 |
+ bfd_section_vma (core_bfd, candidate->sect),
|
|
|
6240d7 |
+ &e_phnum, &loadbase);
|
|
|
6240d7 |
+ if (i_phdr != NULL)
|
|
|
6240d7 |
+ break;
|
|
|
6240d7 |
+ }
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ if (i_phdr != NULL)
|
|
|
6240d7 |
+ {
|
|
|
6240d7 |
+ retval = build_id_phdr_get (core_bfd, loadbase, e_phnum, i_phdr);
|
|
|
6240d7 |
+ xfree (i_phdr);
|
|
|
6240d7 |
+ }
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ while (build_id_addr_sect != NULL)
|
|
|
6240d7 |
+ {
|
|
|
6240d7 |
+ candidate = build_id_addr_sect;
|
|
|
6240d7 |
+ build_id_addr_sect = candidate->next;
|
|
|
6240d7 |
+ xfree (candidate);
|
|
|
6240d7 |
+ }
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ return retval;
|
|
|
6240d7 |
+}
|
|
|
6240d7 |
+
|
|
|
6240d7 |
/* See build-id.h. */
|
|
|
6240d7 |
|
|
|
6240d7 |
int
|
|
|
6240d7 |
@@ -50,7 +448,7 @@ build_id_verify (bfd *abfd, size_t check_len, const bfd_byte *check)
|
|
|
6240d7 |
const struct bfd_build_id *found;
|
|
|
6240d7 |
int retval = 0;
|
|
|
6240d7 |
|
|
|
6240d7 |
- found = build_id_bfd_get (abfd);
|
|
|
6240d7 |
+ found = build_id_bfd_shdr_get (abfd);
|
|
|
6240d7 |
|
|
|
6240d7 |
if (found == NULL)
|
|
|
6240d7 |
warning (_("File \"%s\" has no build-id, file skipped"),
|
|
|
6240d7 |
@@ -65,62 +463,173 @@ build_id_verify (bfd *abfd, size_t check_len, const bfd_byte *check)
|
|
|
6240d7 |
return retval;
|
|
|
6240d7 |
}
|
|
|
6240d7 |
|
|
|
6240d7 |
+static char *
|
|
|
6240d7 |
+link_resolve (const char *symlink, int level)
|
|
|
6240d7 |
+{
|
|
|
6240d7 |
+ char buf[PATH_MAX + 1], *target, *retval;
|
|
|
6240d7 |
+ ssize_t got;
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ if (level > 10)
|
|
|
6240d7 |
+ return xstrdup (symlink);
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ got = readlink (symlink, buf, sizeof (buf));
|
|
|
6240d7 |
+ if (got < 0 || got >= sizeof (buf))
|
|
|
6240d7 |
+ return xstrdup (symlink);
|
|
|
6240d7 |
+ buf[got] = '\0';
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ if (IS_ABSOLUTE_PATH (buf))
|
|
|
6240d7 |
+ target = xstrdup (buf);
|
|
|
6240d7 |
+ else
|
|
|
6240d7 |
+ {
|
|
|
6240d7 |
+ const std::string dir (ldirname (symlink));
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ target = xstrprintf ("%s"
|
|
|
6240d7 |
+#ifndef HAVE_DOS_BASED_FILE_SYSTEM
|
|
|
6240d7 |
+ "/"
|
|
|
6240d7 |
+#else /* HAVE_DOS_BASED_FILE_SYSTEM */
|
|
|
6240d7 |
+ "\\"
|
|
|
6240d7 |
+#endif /* HAVE_DOS_BASED_FILE_SYSTEM */
|
|
|
6240d7 |
+ "%s", dir.c_str(), buf);
|
|
|
6240d7 |
+ }
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ retval = link_resolve (target, level + 1);
|
|
|
6240d7 |
+ xfree (target);
|
|
|
6240d7 |
+ return retval;
|
|
|
6240d7 |
+}
|
|
|
6240d7 |
+
|
|
|
6240d7 |
/* Helper for build_id_to_debug_bfd. LINK is a path to a potential
|
|
|
6240d7 |
build-id-based separate debug file, potentially a symlink to the real file.
|
|
|
6240d7 |
If the file exists and matches BUILD_ID, return a BFD reference to it. */
|
|
|
6240d7 |
|
|
|
6240d7 |
static gdb_bfd_ref_ptr
|
|
|
6240d7 |
-build_id_to_debug_bfd_1 (const std::string &link, size_t build_id_len,
|
|
|
6240d7 |
- const bfd_byte *build_id)
|
|
|
6240d7 |
+build_id_to_debug_bfd_1 (const std::string &orig_link, size_t build_id_len,
|
|
|
6240d7 |
+ const bfd_byte *build_id, char **link_return,
|
|
|
6240d7 |
+ int add_debug_suffix)
|
|
|
6240d7 |
{
|
|
|
6240d7 |
+ gdb_bfd_ref_ptr ret_bfd = {};
|
|
|
6240d7 |
+ std::string ret_link;
|
|
|
6240d7 |
+
|
|
|
6240d7 |
if (separate_debug_file_debug)
|
|
|
6240d7 |
{
|
|
|
6240d7 |
- printf_unfiltered (_(" Trying %s..."), link.c_str ());
|
|
|
6240d7 |
+ printf_unfiltered (_(" Trying %s..."), orig_link.c_str ());
|
|
|
6240d7 |
gdb_flush (gdb_stdout);
|
|
|
6240d7 |
}
|
|
|
6240d7 |
|
|
|
6240d7 |
- /* lrealpath() is expensive even for the usually non-existent files. */
|
|
|
6240d7 |
- gdb::unique_xmalloc_ptr<char> filename;
|
|
|
6240d7 |
- if (access (link.c_str (), F_OK) == 0)
|
|
|
6240d7 |
- filename.reset (lrealpath (link.c_str ()));
|
|
|
6240d7 |
-
|
|
|
6240d7 |
- if (filename == NULL)
|
|
|
6240d7 |
+ for (unsigned seqno = 0;; seqno++)
|
|
|
6240d7 |
{
|
|
|
6240d7 |
- if (separate_debug_file_debug)
|
|
|
6240d7 |
- printf_unfiltered (_(" no, unable to compute real path\n"));
|
|
|
6240d7 |
+ std::string link = orig_link;
|
|
|
6240d7 |
|
|
|
6240d7 |
- return {};
|
|
|
6240d7 |
- }
|
|
|
6240d7 |
+ if (seqno > 0)
|
|
|
6240d7 |
+ {
|
|
|
6240d7 |
+ /* There can be multiple build-id symlinks pointing to real files
|
|
|
6240d7 |
+ with the same build-id (such as hard links). Some of the real
|
|
|
6240d7 |
+ files may not be installed. */
|
|
|
6240d7 |
|
|
|
6240d7 |
- /* We expect to be silent on the non-existing files. */
|
|
|
6240d7 |
- gdb_bfd_ref_ptr debug_bfd = gdb_bfd_open (filename.get (), gnutarget, -1);
|
|
|
6240d7 |
+ string_appendf (link, ".%u", seqno);
|
|
|
6240d7 |
+ }
|
|
|
6240d7 |
|
|
|
6240d7 |
- if (debug_bfd == NULL)
|
|
|
6240d7 |
- {
|
|
|
6240d7 |
- if (separate_debug_file_debug)
|
|
|
6240d7 |
- printf_unfiltered (_(" no, unable to open.\n"));
|
|
|
6240d7 |
+ if (add_debug_suffix)
|
|
|
6240d7 |
+ link += ".debug";
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ ret_link = link;
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ struct stat statbuf_trash;
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ /* `access' automatically dereferences LINK. */
|
|
|
6240d7 |
+ if (lstat (link.c_str (), &statbuf_trash) != 0)
|
|
|
6240d7 |
+ {
|
|
|
6240d7 |
+ /* Stop increasing SEQNO. */
|
|
|
6240d7 |
+ break;
|
|
|
6240d7 |
+ }
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ /* lrealpath() is expensive even for the usually non-existent files. */
|
|
|
6240d7 |
+ gdb::unique_xmalloc_ptr<char> filename;
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ if (access (link.c_str (), F_OK) == 0)
|
|
|
6240d7 |
+ filename.reset (lrealpath (link.c_str ()));
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ if (filename == NULL)
|
|
|
6240d7 |
+ {
|
|
|
6240d7 |
+ if (separate_debug_file_debug)
|
|
|
6240d7 |
+ printf_unfiltered (_(" no, unable to compute real path\n"));
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ continue;
|
|
|
6240d7 |
+ }
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ /* We expect to be silent on the non-existing files. */
|
|
|
6240d7 |
+ gdb_bfd_ref_ptr debug_bfd = gdb_bfd_open (filename.get (), gnutarget, -1);
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ if (debug_bfd == NULL)
|
|
|
6240d7 |
+ {
|
|
|
6240d7 |
+ if (separate_debug_file_debug)
|
|
|
6240d7 |
+ printf_unfiltered (_(" no, unable to open.\n"));
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ continue;
|
|
|
6240d7 |
+ }
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ if (!build_id_verify (debug_bfd.get(), build_id_len, build_id))
|
|
|
6240d7 |
+ {
|
|
|
6240d7 |
+ if (separate_debug_file_debug)
|
|
|
6240d7 |
+ printf_unfiltered (_(" no, build-id does not match.\n"));
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ continue;
|
|
|
6240d7 |
+ }
|
|
|
6240d7 |
|
|
|
6240d7 |
- return {};
|
|
|
6240d7 |
+ ret_bfd = debug_bfd;
|
|
|
6240d7 |
+ break;
|
|
|
6240d7 |
}
|
|
|
6240d7 |
|
|
|
6240d7 |
- if (!build_id_verify (debug_bfd.get(), build_id_len, build_id))
|
|
|
6240d7 |
+ std::string link_all;
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ if (ret_bfd != NULL)
|
|
|
6240d7 |
{
|
|
|
6240d7 |
if (separate_debug_file_debug)
|
|
|
6240d7 |
- printf_unfiltered (_(" no, build-id does not match.\n"));
|
|
|
6240d7 |
+ printf_unfiltered (_(" yes!\n"));
|
|
|
6240d7 |
+ }
|
|
|
6240d7 |
+ else
|
|
|
6240d7 |
+ {
|
|
|
6240d7 |
+ /* If none of the real files is found report as missing file
|
|
|
6240d7 |
+ always the non-.%u-suffixed file. */
|
|
|
6240d7 |
+ std::string link0 = orig_link;
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ if (add_debug_suffix)
|
|
|
6240d7 |
+ link0 += ".debug";
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ /* If the symlink has target request to install the target.
|
|
|
6240d7 |
+ BASE-debuginfo.rpm contains the symlink but BASE.rpm may be missing.
|
|
|
6240d7 |
+ https://bugzilla.redhat.com/show_bug.cgi?id=981154 */
|
|
|
6240d7 |
+ std::string link0_resolved (link_resolve (link0.c_str (), 0));
|
|
|
6240d7 |
|
|
|
6240d7 |
- return {};
|
|
|
6240d7 |
+ if (link_all.empty ())
|
|
|
6240d7 |
+ link_all = link0_resolved;
|
|
|
6240d7 |
+ else
|
|
|
6240d7 |
+ {
|
|
|
6240d7 |
+ /* Use whitespace instead of DIRNAME_SEPARATOR to be compatible with
|
|
|
6240d7 |
+ its possible use as an argument for installation command. */
|
|
|
6240d7 |
+ link_all += " " + link0_resolved;
|
|
|
6240d7 |
+ }
|
|
|
6240d7 |
}
|
|
|
6240d7 |
|
|
|
6240d7 |
- if (separate_debug_file_debug)
|
|
|
6240d7 |
- printf_unfiltered (_(" yes!\n"));
|
|
|
6240d7 |
+ if (link_return != NULL)
|
|
|
6240d7 |
+ {
|
|
|
6240d7 |
+ if (ret_bfd != NULL)
|
|
|
6240d7 |
+ {
|
|
|
6240d7 |
+ *link_return = xstrdup (ret_link.c_str ());
|
|
|
6240d7 |
+ }
|
|
|
6240d7 |
+ else
|
|
|
6240d7 |
+ {
|
|
|
6240d7 |
+ *link_return = xstrdup (link_all.c_str ());
|
|
|
6240d7 |
+ }
|
|
|
6240d7 |
+ }
|
|
|
6240d7 |
|
|
|
6240d7 |
- return debug_bfd;
|
|
|
6240d7 |
+ return ret_bfd;
|
|
|
6240d7 |
}
|
|
|
6240d7 |
|
|
|
6240d7 |
/* See build-id.h. */
|
|
|
6240d7 |
|
|
|
6240d7 |
gdb_bfd_ref_ptr
|
|
|
6240d7 |
-build_id_to_debug_bfd (size_t build_id_len, const bfd_byte *build_id)
|
|
|
6240d7 |
+build_id_to_debug_bfd (size_t build_id_len, const bfd_byte *build_id,
|
|
|
6240d7 |
+ char **link_return, int add_debug_suffix)
|
|
|
6240d7 |
{
|
|
|
6240d7 |
/* Keep backward compatibility so that DEBUG_FILE_DIRECTORY being "" will
|
|
|
6240d7 |
cause "/.build-id/..." lookups. */
|
|
|
6240d7 |
@@ -143,16 +652,16 @@ build_id_to_debug_bfd (size_t build_id_len, const bfd_byte *build_id)
|
|
|
6240d7 |
if (size > 0)
|
|
|
6240d7 |
{
|
|
|
6240d7 |
size--;
|
|
|
6240d7 |
- string_appendf (link, "%02x/", (unsigned) *data++);
|
|
|
6240d7 |
+ string_appendf (link, "%02x", (unsigned) *data++);
|
|
|
6240d7 |
}
|
|
|
6240d7 |
-
|
|
|
6240d7 |
+ if (size > 0)
|
|
|
6240d7 |
+ link += "/";
|
|
|
6240d7 |
while (size-- > 0)
|
|
|
6240d7 |
string_appendf (link, "%02x", (unsigned) *data++);
|
|
|
6240d7 |
|
|
|
6240d7 |
- link += ".debug";
|
|
|
6240d7 |
-
|
|
|
6240d7 |
gdb_bfd_ref_ptr debug_bfd
|
|
|
6240d7 |
- = build_id_to_debug_bfd_1 (link, build_id_len, build_id);
|
|
|
6240d7 |
+ = build_id_to_debug_bfd_1 (link, build_id_len, build_id,
|
|
|
6240d7 |
+ link_return, add_debug_suffix);
|
|
|
6240d7 |
if (debug_bfd != NULL)
|
|
|
6240d7 |
return debug_bfd;
|
|
|
6240d7 |
|
|
|
6240d7 |
@@ -166,7 +675,8 @@ build_id_to_debug_bfd (size_t build_id_len, const bfd_byte *build_id)
|
|
|
6240d7 |
if (strcmp (gdb_sysroot, TARGET_SYSROOT_PREFIX) != 0)
|
|
|
6240d7 |
{
|
|
|
6240d7 |
link = gdb_sysroot + link;
|
|
|
6240d7 |
- debug_bfd = build_id_to_debug_bfd_1 (link, build_id_len, build_id);
|
|
|
6240d7 |
+ debug_bfd = build_id_to_debug_bfd_1 (link, build_id_len, build_id,
|
|
|
6240d7 |
+ link_return, add_debug_suffix);
|
|
|
6240d7 |
if (debug_bfd != NULL)
|
|
|
6240d7 |
return debug_bfd;
|
|
|
6240d7 |
}
|
|
|
6240d7 |
@@ -175,22 +685,190 @@ build_id_to_debug_bfd (size_t build_id_len, const bfd_byte *build_id)
|
|
|
6240d7 |
return {};
|
|
|
6240d7 |
}
|
|
|
6240d7 |
|
|
|
6240d7 |
+char *
|
|
|
6240d7 |
+build_id_to_filename (const struct bfd_build_id *build_id, char **link_return)
|
|
|
6240d7 |
+{
|
|
|
6240d7 |
+ gdb_bfd_ref_ptr abfd;
|
|
|
6240d7 |
+ char *result;
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ abfd = build_id_to_debug_bfd (build_id->size, build_id->data, link_return, 0);
|
|
|
6240d7 |
+ if (abfd == NULL)
|
|
|
6240d7 |
+ return NULL;
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ result = xstrdup (bfd_get_filename (abfd));
|
|
|
6240d7 |
+ abfd.release ();
|
|
|
6240d7 |
+ return result;
|
|
|
6240d7 |
+}
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+/* This MISSING_FILEPAIR_HASH tracker is used only for the duplicite messages
|
|
|
6240d7 |
+ Try to install the hash file ...
|
|
|
6240d7 |
+ avoidance. */
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+struct missing_filepair
|
|
|
6240d7 |
+ {
|
|
|
6240d7 |
+ char *binary;
|
|
|
6240d7 |
+ char *debug;
|
|
|
6240d7 |
+ char data[1];
|
|
|
6240d7 |
+ };
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+static struct htab *missing_filepair_hash;
|
|
|
6240d7 |
+static struct obstack missing_filepair_obstack;
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+static void *
|
|
|
6240d7 |
+missing_filepair_xcalloc (size_t nmemb, size_t nmemb_size)
|
|
|
6240d7 |
+{
|
|
|
6240d7 |
+ void *retval;
|
|
|
6240d7 |
+ size_t size = nmemb * nmemb_size;
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ retval = obstack_alloc (&missing_filepair_obstack, size);
|
|
|
6240d7 |
+ memset (retval, 0, size);
|
|
|
6240d7 |
+ return retval;
|
|
|
6240d7 |
+}
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+static hashval_t
|
|
|
6240d7 |
+missing_filepair_hash_func (const struct missing_filepair *elem)
|
|
|
6240d7 |
+{
|
|
|
6240d7 |
+ hashval_t retval = 0;
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ retval ^= htab_hash_string (elem->binary);
|
|
|
6240d7 |
+ if (elem->debug != NULL)
|
|
|
6240d7 |
+ retval ^= htab_hash_string (elem->debug);
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ return retval;
|
|
|
6240d7 |
+}
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+static int
|
|
|
6240d7 |
+missing_filepair_eq (const struct missing_filepair *elem1,
|
|
|
6240d7 |
+ const struct missing_filepair *elem2)
|
|
|
6240d7 |
+{
|
|
|
6240d7 |
+ return strcmp (elem1->binary, elem2->binary) == 0
|
|
|
6240d7 |
+ && ((elem1->debug == NULL) == (elem2->debug == NULL))
|
|
|
6240d7 |
+ && (elem1->debug == NULL || strcmp (elem1->debug, elem2->debug) == 0);
|
|
|
6240d7 |
+}
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+static void
|
|
|
6240d7 |
+missing_filepair_change (void)
|
|
|
6240d7 |
+{
|
|
|
6240d7 |
+ if (missing_filepair_hash != NULL)
|
|
|
6240d7 |
+ {
|
|
|
6240d7 |
+ obstack_free (&missing_filepair_obstack, NULL);
|
|
|
6240d7 |
+ /* All their memory came just from missing_filepair_OBSTACK. */
|
|
|
6240d7 |
+ missing_filepair_hash = NULL;
|
|
|
6240d7 |
+ }
|
|
|
6240d7 |
+}
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+static void
|
|
|
6240d7 |
+debug_print_executable_changed (void)
|
|
|
6240d7 |
+{
|
|
|
6240d7 |
+ missing_filepair_change ();
|
|
|
6240d7 |
+}
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+/* Notify user the file BINARY with (possibly NULL) associated separate debug
|
|
|
6240d7 |
+ information file DEBUG is missing. DEBUG may or may not be the build-id
|
|
|
6240d7 |
+ file such as would be:
|
|
|
6240d7 |
+ /usr/lib/debug/.build-id/dd/b1d2ce632721c47bb9e8679f369e2295ce71be.debug
|
|
|
6240d7 |
+ */
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+void
|
|
|
6240d7 |
+debug_print_missing (const char *binary, const char *debug)
|
|
|
6240d7 |
+{
|
|
|
6240d7 |
+ size_t binary_len0 = strlen (binary) + 1;
|
|
|
6240d7 |
+ size_t debug_len0 = debug ? strlen (debug) + 1 : 0;
|
|
|
6240d7 |
+ struct missing_filepair missing_filepair_find;
|
|
|
6240d7 |
+ struct missing_filepair *missing_filepair;
|
|
|
6240d7 |
+ struct missing_filepair **slot;
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ if (build_id_verbose < BUILD_ID_VERBOSE_FILENAMES)
|
|
|
6240d7 |
+ return;
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ if (missing_filepair_hash == NULL)
|
|
|
6240d7 |
+ {
|
|
|
6240d7 |
+ obstack_init (&missing_filepair_obstack);
|
|
|
6240d7 |
+ missing_filepair_hash = htab_create_alloc (64,
|
|
|
6240d7 |
+ (hashval_t (*) (const void *)) missing_filepair_hash_func,
|
|
|
6240d7 |
+ (int (*) (const void *, const void *)) missing_filepair_eq, NULL,
|
|
|
6240d7 |
+ missing_filepair_xcalloc, NULL);
|
|
|
6240d7 |
+ }
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ /* Use MISSING_FILEPAIR_FIND first instead of calling obstack_alloc with
|
|
|
6240d7 |
+ obstack_free in the case of a (rare) match. The problem is ALLOC_F for
|
|
|
6240d7 |
+ MISSING_FILEPAIR_HASH allocates from MISSING_FILEPAIR_OBSTACK maintenance
|
|
|
6240d7 |
+ structures for MISSING_FILEPAIR_HASH. Calling obstack_free would possibly
|
|
|
6240d7 |
+ not to free only MISSING_FILEPAIR but also some such structures (allocated
|
|
|
6240d7 |
+ during the htab_find_slot call). */
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ missing_filepair_find.binary = (char *) binary;
|
|
|
6240d7 |
+ missing_filepair_find.debug = (char *) debug;
|
|
|
6240d7 |
+ slot = (struct missing_filepair **) htab_find_slot (missing_filepair_hash,
|
|
|
6240d7 |
+ &missing_filepair_find,
|
|
|
6240d7 |
+ INSERT);
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ /* While it may be still printed duplicitely with the missing debuginfo file
|
|
|
6240d7 |
+ * it is due to once printing about the binary file build-id link and once
|
|
|
6240d7 |
+ * about the .debug file build-id link as both the build-id symlinks are
|
|
|
6240d7 |
+ * located in the debuginfo package. */
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ if (*slot != NULL)
|
|
|
6240d7 |
+ return;
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ missing_filepair = (struct missing_filepair *) obstack_alloc (&missing_filepair_obstack,
|
|
|
6240d7 |
+ sizeof (*missing_filepair) - 1
|
|
|
6240d7 |
+ + binary_len0 + debug_len0);
|
|
|
6240d7 |
+ missing_filepair->binary = missing_filepair->data;
|
|
|
6240d7 |
+ memcpy (missing_filepair->binary, binary, binary_len0);
|
|
|
6240d7 |
+ if (debug != NULL)
|
|
|
6240d7 |
+ {
|
|
|
6240d7 |
+ missing_filepair->debug = missing_filepair->binary + binary_len0;
|
|
|
6240d7 |
+ memcpy (missing_filepair->debug, debug, debug_len0);
|
|
|
6240d7 |
+ }
|
|
|
6240d7 |
+ else
|
|
|
6240d7 |
+ missing_filepair->debug = NULL;
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ *slot = missing_filepair;
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ /* We do not collect and flush these messages as each such message
|
|
|
6240d7 |
+ already requires its own separate lines. */
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ fprintf_unfiltered (gdb_stdlog,
|
|
|
6240d7 |
+ _("Missing separate debuginfo for %s\n"), binary);
|
|
|
6240d7 |
+ if (debug != NULL)
|
|
|
6240d7 |
+ fprintf_unfiltered (gdb_stdlog, _("Try to install the hash file %s\n"),
|
|
|
6240d7 |
+ debug);
|
|
|
6240d7 |
+}
|
|
|
6240d7 |
+
|
|
|
6240d7 |
/* See build-id.h. */
|
|
|
6240d7 |
|
|
|
6240d7 |
std::string
|
|
|
6240d7 |
-find_separate_debug_file_by_buildid (struct objfile *objfile)
|
|
|
6240d7 |
+find_separate_debug_file_by_buildid (struct objfile *objfile,
|
|
|
6240d7 |
+ gdb::unique_xmalloc_ptr<char> *build_id_filename_return)
|
|
|
6240d7 |
{
|
|
|
6240d7 |
const struct bfd_build_id *build_id;
|
|
|
6240d7 |
|
|
|
6240d7 |
- build_id = build_id_bfd_get (objfile->obfd);
|
|
|
6240d7 |
+ if (build_id_filename_return)
|
|
|
6240d7 |
+ *build_id_filename_return = NULL;
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ build_id = build_id_bfd_shdr_get (objfile->obfd);
|
|
|
6240d7 |
if (build_id != NULL)
|
|
|
6240d7 |
{
|
|
|
6240d7 |
if (separate_debug_file_debug)
|
|
|
6240d7 |
printf_unfiltered (_("\nLooking for separate debug info (build-id) for "
|
|
|
6240d7 |
"%s\n"), objfile_name (objfile));
|
|
|
6240d7 |
|
|
|
6240d7 |
+ char *build_id_filename_cstr = NULL;
|
|
|
6240d7 |
gdb_bfd_ref_ptr abfd (build_id_to_debug_bfd (build_id->size,
|
|
|
6240d7 |
- build_id->data));
|
|
|
6240d7 |
+ build_id->data,
|
|
|
6240d7 |
+ (!build_id_filename_return ? NULL : &build_id_filename_cstr), 1));
|
|
|
6240d7 |
+ if (build_id_filename_return)
|
|
|
6240d7 |
+ {
|
|
|
6240d7 |
+ if (!build_id_filename_cstr)
|
|
|
6240d7 |
+ gdb_assert (!*build_id_filename_return);
|
|
|
6240d7 |
+ else
|
|
|
6240d7 |
+ {
|
|
|
6240d7 |
+ *build_id_filename_return = gdb::unique_xmalloc_ptr<char> (build_id_filename_cstr);
|
|
|
6240d7 |
+ build_id_filename_cstr = NULL;
|
|
|
6240d7 |
+ }
|
|
|
6240d7 |
+ }
|
|
|
6240d7 |
+
|
|
|
6240d7 |
/* Prevent looping on a stripped .debug file. */
|
|
|
6240d7 |
if (abfd != NULL
|
|
|
6240d7 |
&& filename_cmp (bfd_get_filename (abfd.get ()),
|
|
|
6240d7 |
@@ -203,3 +881,21 @@ find_separate_debug_file_by_buildid (struct objfile *objfile)
|
|
|
6240d7 |
|
|
|
6240d7 |
return std::string ();
|
|
|
6240d7 |
}
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+extern void _initialize_build_id (void);
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+void
|
|
|
6240d7 |
+_initialize_build_id (void)
|
|
|
6240d7 |
+{
|
|
|
6240d7 |
+ add_setshow_zinteger_cmd ("build-id-verbose", no_class, &build_id_verbose,
|
|
|
6240d7 |
+ _("\
|
|
|
6240d7 |
+Set debugging level of the build-id locator."), _("\
|
|
|
6240d7 |
+Show debugging level of the build-id locator."), _("\
|
|
|
6240d7 |
+Level 1 (default) enables printing the missing debug filenames,\n\
|
|
|
6240d7 |
+level 2 also prints the parsing of binaries to find the identificators."),
|
|
|
6240d7 |
+ NULL,
|
|
|
6240d7 |
+ show_build_id_verbose,
|
|
|
6240d7 |
+ &setlist, &showlist);
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ gdb::observers::executable_changed.attach (debug_print_executable_changed);
|
|
|
6240d7 |
+}
|
|
|
6240d7 |
diff --git a/gdb/build-id.h b/gdb/build-id.h
|
|
|
6240d7 |
--- a/gdb/build-id.h
|
|
|
6240d7 |
+++ b/gdb/build-id.h
|
|
|
6240d7 |
@@ -23,9 +23,10 @@
|
|
|
6240d7 |
#include "gdb_bfd.h"
|
|
|
6240d7 |
#include "common/rsp-low.h"
|
|
|
6240d7 |
|
|
|
6240d7 |
-/* Locate NT_GNU_BUILD_ID from ABFD and return its content. */
|
|
|
6240d7 |
+/* Separate debuginfo files have corrupted PHDR but SHDR is correct there.
|
|
|
6240d7 |
+ Locate NT_GNU_BUILD_ID from ABFD and return its content. */
|
|
|
6240d7 |
|
|
|
6240d7 |
-extern const struct bfd_build_id *build_id_bfd_get (bfd *abfd);
|
|
|
6240d7 |
+extern const struct bfd_build_id *build_id_bfd_shdr_get (bfd *abfd);
|
|
|
6240d7 |
|
|
|
6240d7 |
/* Return true if ABFD has NT_GNU_BUILD_ID matching the CHECK value.
|
|
|
6240d7 |
Otherwise, issue a warning and return false. */
|
|
|
6240d7 |
@@ -39,14 +40,19 @@ extern int build_id_verify (bfd *abfd,
|
|
|
6240d7 |
the caller. */
|
|
|
6240d7 |
|
|
|
6240d7 |
extern gdb_bfd_ref_ptr build_id_to_debug_bfd (size_t build_id_len,
|
|
|
6240d7 |
- const bfd_byte *build_id);
|
|
|
6240d7 |
+ const bfd_byte *build_id,
|
|
|
6240d7 |
+ char **link_return,
|
|
|
6240d7 |
+ int add_debug_suffix);
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+extern char *build_id_to_filename (const struct bfd_build_id *build_id,
|
|
|
6240d7 |
+ char **link_return);
|
|
|
6240d7 |
|
|
|
6240d7 |
/* Find the separate debug file for OBJFILE, by using the build-id
|
|
|
6240d7 |
associated with OBJFILE's BFD. If successful, returns the file name for the
|
|
|
6240d7 |
separate debug file, otherwise, return an empty string. */
|
|
|
6240d7 |
|
|
|
6240d7 |
-extern std::string find_separate_debug_file_by_buildid
|
|
|
6240d7 |
- (struct objfile *objfile);
|
|
|
6240d7 |
+extern std::string find_separate_debug_file_by_buildid (struct objfile *objfile,
|
|
|
6240d7 |
+ gdb::unique_xmalloc_ptr<char> *build_id_filename_return);
|
|
|
6240d7 |
|
|
|
6240d7 |
/* Return an hex-string representation of BUILD_ID. */
|
|
|
6240d7 |
|
|
|
6240d7 |
diff --git a/gdb/coffread.c b/gdb/coffread.c
|
|
|
6240d7 |
--- a/gdb/coffread.c
|
|
|
6240d7 |
+++ b/gdb/coffread.c
|
|
|
6240d7 |
@@ -732,7 +732,8 @@ coff_symfile_read (struct objfile *objfile, symfile_add_flags symfile_flags)
|
|
|
6240d7 |
/* Try to add separate debug file if no symbols table found. */
|
|
|
6240d7 |
if (!objfile_has_partial_symbols (objfile))
|
|
|
6240d7 |
{
|
|
|
6240d7 |
- std::string debugfile = find_separate_debug_file_by_buildid (objfile);
|
|
|
6240d7 |
+ std::string debugfile = find_separate_debug_file_by_buildid (objfile,
|
|
|
6240d7 |
+ NULL);
|
|
|
6240d7 |
|
|
|
6240d7 |
if (debugfile.empty ())
|
|
|
6240d7 |
debugfile = find_separate_debug_file_by_debuglink (objfile);
|
|
|
6240d7 |
diff --git a/gdb/corelow.c b/gdb/corelow.c
|
|
|
6240d7 |
--- a/gdb/corelow.c
|
|
|
6240d7 |
+++ b/gdb/corelow.c
|
|
|
6240d7 |
@@ -43,6 +43,10 @@
|
|
|
6240d7 |
#include "gdb_bfd.h"
|
|
|
6240d7 |
#include "completer.h"
|
|
|
6240d7 |
#include "common/filestuff.h"
|
|
|
6240d7 |
+#include "auxv.h"
|
|
|
6240d7 |
+#include "elf/common.h"
|
|
|
6240d7 |
+#include "gdbcmd.h"
|
|
|
6240d7 |
+#include "build-id.h"
|
|
|
6240d7 |
|
|
|
6240d7 |
#ifndef O_LARGEFILE
|
|
|
6240d7 |
#define O_LARGEFILE 0
|
|
|
6240d7 |
@@ -320,6 +324,54 @@ add_to_thread_list (bfd *abfd, asection *asect, void *reg_sect_arg)
|
|
|
6240d7 |
inferior_ptid = ptid; /* Yes, make it current. */
|
|
|
6240d7 |
}
|
|
|
6240d7 |
|
|
|
6240d7 |
+static int build_id_core_loads = 1;
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+static void
|
|
|
6240d7 |
+build_id_locate_exec (int from_tty)
|
|
|
6240d7 |
+{
|
|
|
6240d7 |
+ CORE_ADDR at_entry;
|
|
|
6240d7 |
+ struct bfd_build_id *build_id;
|
|
|
6240d7 |
+ char *execfilename;
|
|
|
6240d7 |
+ char *build_id_filename;
|
|
|
6240d7 |
+ struct cleanup *back_to;
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ if (exec_bfd != NULL || symfile_objfile != NULL)
|
|
|
6240d7 |
+ return;
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ if (target_auxv_search (current_top_target (), AT_ENTRY, &at_entry) <= 0)
|
|
|
6240d7 |
+ return;
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ build_id = build_id_addr_get (at_entry);
|
|
|
6240d7 |
+ if (build_id == NULL)
|
|
|
6240d7 |
+ return;
|
|
|
6240d7 |
+ back_to = make_cleanup (xfree, build_id);
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ /* SYMFILE_OBJFILE should refer to the main executable (not only to its
|
|
|
6240d7 |
+ separate debug info file). gcc44+ keeps .eh_frame only in the main
|
|
|
6240d7 |
+ executable without its duplicate .debug_frame in the separate debug info
|
|
|
6240d7 |
+ file - such .eh_frame would not be found if SYMFILE_OBJFILE would refer
|
|
|
6240d7 |
+ directly to the separate debug info file. */
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ execfilename = build_id_to_filename (build_id, &build_id_filename);
|
|
|
6240d7 |
+ make_cleanup (xfree, build_id_filename);
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ if (execfilename != NULL)
|
|
|
6240d7 |
+ {
|
|
|
6240d7 |
+ make_cleanup (xfree, execfilename);
|
|
|
6240d7 |
+ exec_file_attach (execfilename, from_tty);
|
|
|
6240d7 |
+ symbol_file_add_main (execfilename,
|
|
|
6240d7 |
+ symfile_add_flag (!from_tty ? 0 : SYMFILE_VERBOSE));
|
|
|
6240d7 |
+ if (symfile_objfile != NULL)
|
|
|
6240d7 |
+ symfile_objfile->flags |= OBJF_BUILD_ID_CORE_LOADED;
|
|
|
6240d7 |
+ }
|
|
|
6240d7 |
+ else
|
|
|
6240d7 |
+ debug_print_missing (_("the main executable file"), build_id_filename);
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ do_cleanups (back_to);
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ /* No automatic SOLIB_ADD as the libraries would get read twice. */
|
|
|
6240d7 |
+}
|
|
|
6240d7 |
+
|
|
|
6240d7 |
/* Issue a message saying we have no core to debug, if FROM_TTY. */
|
|
|
6240d7 |
|
|
|
6240d7 |
static void
|
|
|
6240d7 |
@@ -455,6 +507,14 @@ core_target_open (const char *arg, int from_tty)
|
|
|
6240d7 |
switch_to_thread (thread);
|
|
|
6240d7 |
}
|
|
|
6240d7 |
|
|
|
6240d7 |
+ /* Find the build_id identifiers. If it gets executed after
|
|
|
6240d7 |
+ POST_CREATE_INFERIOR we would clash with asking to discard the already
|
|
|
6240d7 |
+ loaded VDSO symbols. If it gets executed before bfd_map_over_sections
|
|
|
6240d7 |
+ INFERIOR_PTID is still not set and libthread_db initialization crashes on
|
|
|
6240d7 |
+ PID == 0 in ps_pglobal_lookup. */
|
|
|
6240d7 |
+ if (build_id_core_loads != 0)
|
|
|
6240d7 |
+ build_id_locate_exec (from_tty);
|
|
|
6240d7 |
+
|
|
|
6240d7 |
post_create_inferior (target, from_tty);
|
|
|
6240d7 |
|
|
|
6240d7 |
/* Now go through the target stack looking for threads since there
|
|
|
6240d7 |
@@ -1063,4 +1123,11 @@ void
|
|
|
6240d7 |
_initialize_corelow (void)
|
|
|
6240d7 |
{
|
|
|
6240d7 |
add_target (core_target_info, core_target_open, filename_completer);
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ add_setshow_boolean_cmd ("build-id-core-loads", class_files,
|
|
|
6240d7 |
+ &build_id_core_loads, _("\
|
|
|
6240d7 |
+Set whether CORE-FILE loads the build-id associated files automatically."), _("\
|
|
|
6240d7 |
+Show whether CORE-FILE loads the build-id associated files automatically."),
|
|
|
6240d7 |
+ NULL, NULL, NULL,
|
|
|
6240d7 |
+ &setlist, &showlist);
|
|
|
6240d7 |
}
|
|
|
6240d7 |
diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
|
|
|
6240d7 |
--- a/gdb/doc/gdb.texinfo
|
|
|
6240d7 |
+++ b/gdb/doc/gdb.texinfo
|
|
|
6240d7 |
@@ -19949,6 +19949,27 @@ information files.
|
|
|
6240d7 |
|
|
|
6240d7 |
@end table
|
|
|
6240d7 |
|
|
|
6240d7 |
+You can also adjust the current verbosity of the @dfn{build id} locating.
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+@table @code
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+@kindex set build-id-verbose
|
|
|
6240d7 |
+@item set build-id-verbose 0
|
|
|
6240d7 |
+No additional messages are printed.
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+@item set build-id-verbose 1
|
|
|
6240d7 |
+Missing separate debug filenames are printed.
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+@item set build-id-verbose 2
|
|
|
6240d7 |
+Missing separate debug filenames are printed and also all the parsing of the
|
|
|
6240d7 |
+binaries to find their @dfn{build id} content is printed.
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+@kindex show build-id-verbose
|
|
|
6240d7 |
+@item show build-id-verbose
|
|
|
6240d7 |
+Show the current verbosity value for the @dfn{build id} content locating.
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+@end table
|
|
|
6240d7 |
+
|
|
|
6240d7 |
@cindex @code{.gnu_debuglink} sections
|
|
|
6240d7 |
@cindex debug link sections
|
|
|
6240d7 |
A debug link is a special section of the executable file named
|
|
|
6240d7 |
diff --git a/gdb/dwarf-index-cache.c b/gdb/dwarf-index-cache.c
|
|
|
6240d7 |
--- a/gdb/dwarf-index-cache.c
|
|
|
6240d7 |
+++ b/gdb/dwarf-index-cache.c
|
|
|
6240d7 |
@@ -93,7 +93,7 @@ index_cache::store (struct dwarf2_per_objfile *dwarf2_per_objfile)
|
|
|
6240d7 |
if (!enabled ())
|
|
|
6240d7 |
return;
|
|
|
6240d7 |
|
|
|
6240d7 |
- const bfd_build_id *build_id = build_id_bfd_get (obj->obfd);
|
|
|
6240d7 |
+ const bfd_build_id *build_id = build_id_bfd_shdr_get (obj->obfd);
|
|
|
6240d7 |
if (build_id == nullptr)
|
|
|
6240d7 |
{
|
|
|
6240d7 |
if (debug_index_cache)
|
|
|
6240d7 |
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
|
|
|
6240d7 |
--- a/gdb/dwarf2read.c
|
|
|
6240d7 |
+++ b/gdb/dwarf2read.c
|
|
|
6240d7 |
@@ -2727,7 +2727,7 @@ dwarf2_get_dwz_file (struct dwarf2_per_objfile *dwarf2_per_objfile)
|
|
|
6240d7 |
}
|
|
|
6240d7 |
|
|
|
6240d7 |
if (dwz_bfd == NULL)
|
|
|
6240d7 |
- dwz_bfd = build_id_to_debug_bfd (buildid_len, buildid);
|
|
|
6240d7 |
+ dwz_bfd = build_id_to_debug_bfd (buildid_len, buildid, NULL, 1);
|
|
|
6240d7 |
|
|
|
6240d7 |
if (dwz_bfd == NULL)
|
|
|
6240d7 |
error (_("could not find '.gnu_debugaltlink' file for %s"),
|
|
|
6240d7 |
@@ -6237,7 +6237,7 @@ get_gdb_index_contents_from_section (objfile *obj, T *section_owner)
|
|
|
6240d7 |
static gdb::array_view<const gdb_byte>
|
|
|
6240d7 |
get_gdb_index_contents_from_cache (objfile *obj, dwarf2_per_objfile *dwarf2_obj)
|
|
|
6240d7 |
{
|
|
|
6240d7 |
- const bfd_build_id *build_id = build_id_bfd_get (obj->obfd);
|
|
|
6240d7 |
+ const bfd_build_id *build_id = build_id_bfd_shdr_get (obj->obfd);
|
|
|
6240d7 |
if (build_id == nullptr)
|
|
|
6240d7 |
return {};
|
|
|
6240d7 |
|
|
|
6240d7 |
@@ -6250,7 +6250,7 @@ get_gdb_index_contents_from_cache (objfile *obj, dwarf2_per_objfile *dwarf2_obj)
|
|
|
6240d7 |
static gdb::array_view<const gdb_byte>
|
|
|
6240d7 |
get_gdb_index_contents_from_cache_dwz (objfile *obj, dwz_file *dwz)
|
|
|
6240d7 |
{
|
|
|
6240d7 |
- const bfd_build_id *build_id = build_id_bfd_get (dwz->dwz_bfd.get ());
|
|
|
6240d7 |
+ const bfd_build_id *build_id = build_id_bfd_shdr_get (dwz->dwz_bfd.get ());
|
|
|
6240d7 |
if (build_id == nullptr)
|
|
|
6240d7 |
return {};
|
|
|
6240d7 |
|
|
|
6240d7 |
diff --git a/gdb/elfread.c b/gdb/elfread.c
|
|
|
6240d7 |
--- a/gdb/elfread.c
|
|
|
6240d7 |
+++ b/gdb/elfread.c
|
|
|
6240d7 |
@@ -1287,7 +1287,9 @@ elf_symfile_read (struct objfile *objfile, symfile_add_flags symfile_flags)
|
|
|
6240d7 |
&& objfile->separate_debug_objfile == NULL
|
|
|
6240d7 |
&& objfile->separate_debug_objfile_backlink == NULL)
|
|
|
6240d7 |
{
|
|
|
6240d7 |
- std::string debugfile = find_separate_debug_file_by_buildid (objfile);
|
|
|
6240d7 |
+ gdb::unique_xmalloc_ptr<char> build_id_filename;
|
|
|
6240d7 |
+ std::string debugfile
|
|
|
6240d7 |
+ = find_separate_debug_file_by_buildid (objfile, &build_id_filename);
|
|
|
6240d7 |
|
|
|
6240d7 |
if (debugfile.empty ())
|
|
|
6240d7 |
debugfile = find_separate_debug_file_by_debuglink (objfile);
|
|
|
6240d7 |
@@ -1299,6 +1301,10 @@ elf_symfile_read (struct objfile *objfile, symfile_add_flags symfile_flags)
|
|
|
6240d7 |
symbol_file_add_separate (debug_bfd.get (), debugfile.c_str (),
|
|
|
6240d7 |
symfile_flags, objfile);
|
|
|
6240d7 |
}
|
|
|
6240d7 |
+ /* Check if any separate debug info has been extracted out. */
|
|
|
6240d7 |
+ else if (bfd_get_section_by_name (objfile->obfd, ".gnu_debuglink")
|
|
|
6240d7 |
+ != NULL)
|
|
|
6240d7 |
+ debug_print_missing (objfile_name (objfile), build_id_filename.get ());
|
|
|
6240d7 |
}
|
|
|
6240d7 |
}
|
|
|
6240d7 |
|
|
|
6240d7 |
diff --git a/gdb/objfiles.h b/gdb/objfiles.h
|
|
|
6240d7 |
--- a/gdb/objfiles.h
|
|
|
6240d7 |
+++ b/gdb/objfiles.h
|
|
|
6240d7 |
@@ -554,6 +554,10 @@ struct objfile
|
|
|
6240d7 |
htab_t static_links {};
|
|
|
6240d7 |
};
|
|
|
6240d7 |
|
|
|
6240d7 |
+/* This file was loaded according to the BUILD_ID_CORE_LOADS rules. */
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+#define OBJF_BUILD_ID_CORE_LOADED static_cast<enum objfile_flag>(1 << 12)
|
|
|
6240d7 |
+
|
|
|
6240d7 |
/* Declarations for functions defined in objfiles.c */
|
|
|
6240d7 |
|
|
|
6240d7 |
extern struct gdbarch *get_objfile_arch (const struct objfile *);
|
|
|
6240d7 |
diff --git a/gdb/python/py-objfile.c b/gdb/python/py-objfile.c
|
|
|
6240d7 |
--- a/gdb/python/py-objfile.c
|
|
|
6240d7 |
+++ b/gdb/python/py-objfile.c
|
|
|
6240d7 |
@@ -132,7 +132,7 @@ objfpy_get_build_id (PyObject *self, void *closure)
|
|
|
6240d7 |
|
|
|
6240d7 |
TRY
|
|
|
6240d7 |
{
|
|
|
6240d7 |
- build_id = build_id_bfd_get (objfile->obfd);
|
|
|
6240d7 |
+ build_id = build_id_bfd_shdr_get (objfile->obfd);
|
|
|
6240d7 |
}
|
|
|
6240d7 |
CATCH (except, RETURN_MASK_ALL)
|
|
|
6240d7 |
{
|
|
|
6240d7 |
@@ -535,7 +535,7 @@ objfpy_lookup_objfile_by_build_id (const char *build_id)
|
|
|
6240d7 |
/* Don't return separate debug files. */
|
|
|
6240d7 |
if (objfile->separate_debug_objfile_backlink != NULL)
|
|
|
6240d7 |
continue;
|
|
|
6240d7 |
- obfd_build_id = build_id_bfd_get (objfile->obfd);
|
|
|
6240d7 |
+ obfd_build_id = build_id_bfd_shdr_get (objfile->obfd);
|
|
|
6240d7 |
if (obfd_build_id == NULL)
|
|
|
6240d7 |
continue;
|
|
|
6240d7 |
if (objfpy_build_id_matches (obfd_build_id, build_id))
|
|
|
6240d7 |
diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c
|
|
|
6240d7 |
--- a/gdb/solib-svr4.c
|
|
|
6240d7 |
+++ b/gdb/solib-svr4.c
|
|
|
6240d7 |
@@ -45,6 +45,7 @@
|
|
|
6240d7 |
#include "auxv.h"
|
|
|
6240d7 |
#include "gdb_bfd.h"
|
|
|
6240d7 |
#include "probe.h"
|
|
|
6240d7 |
+#include "build-id.h"
|
|
|
6240d7 |
|
|
|
6240d7 |
static struct link_map_offsets *svr4_fetch_link_map_offsets (void);
|
|
|
6240d7 |
static int svr4_have_link_map_offsets (void);
|
|
|
6240d7 |
@@ -1345,9 +1346,51 @@ svr4_read_so_list (CORE_ADDR lm, CORE_ADDR prev_lm,
|
|
|
6240d7 |
continue;
|
|
|
6240d7 |
}
|
|
|
6240d7 |
|
|
|
6240d7 |
- strncpy (newobj->so_name, buffer.get (), SO_NAME_MAX_PATH_SIZE - 1);
|
|
|
6240d7 |
- newobj->so_name[SO_NAME_MAX_PATH_SIZE - 1] = '\0';
|
|
|
6240d7 |
- strcpy (newobj->so_original_name, newobj->so_name);
|
|
|
6240d7 |
+ {
|
|
|
6240d7 |
+ struct bfd_build_id *build_id;
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ strncpy (newobj->so_original_name, buffer.get (), SO_NAME_MAX_PATH_SIZE - 1);
|
|
|
6240d7 |
+ newobj->so_original_name[SO_NAME_MAX_PATH_SIZE - 1] = '\0';
|
|
|
6240d7 |
+ /* May get overwritten below. */
|
|
|
6240d7 |
+ strcpy (newobj->so_name, newobj->so_original_name);
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ build_id = build_id_addr_get (((lm_info_svr4 *) newobj->lm_info)->l_ld);
|
|
|
6240d7 |
+ if (build_id != NULL)
|
|
|
6240d7 |
+ {
|
|
|
6240d7 |
+ char *name, *build_id_filename;
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ /* Missing the build-id matching separate debug info file
|
|
|
6240d7 |
+ would be handled while SO_NAME gets loaded. */
|
|
|
6240d7 |
+ name = build_id_to_filename (build_id, &build_id_filename);
|
|
|
6240d7 |
+ if (name != NULL)
|
|
|
6240d7 |
+ {
|
|
|
6240d7 |
+ strncpy (newobj->so_name, name, SO_NAME_MAX_PATH_SIZE - 1);
|
|
|
6240d7 |
+ newobj->so_name[SO_NAME_MAX_PATH_SIZE - 1] = '\0';
|
|
|
6240d7 |
+ xfree (name);
|
|
|
6240d7 |
+ }
|
|
|
6240d7 |
+ else
|
|
|
6240d7 |
+ {
|
|
|
6240d7 |
+ debug_print_missing (newobj->so_name, build_id_filename);
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ /* In the case the main executable was found according to
|
|
|
6240d7 |
+ its build-id (from a core file) prevent loading
|
|
|
6240d7 |
+ a different build of a library with accidentally the
|
|
|
6240d7 |
+ same SO_NAME.
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ It suppresses bogus backtraces (and prints "??" there
|
|
|
6240d7 |
+ instead) if the on-disk files no longer match the
|
|
|
6240d7 |
+ running program version. */
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ if (symfile_objfile != NULL
|
|
|
6240d7 |
+ && (symfile_objfile->flags
|
|
|
6240d7 |
+ & OBJF_BUILD_ID_CORE_LOADED) != 0)
|
|
|
6240d7 |
+ newobj->so_name[0] = 0;
|
|
|
6240d7 |
+ }
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ xfree (build_id_filename);
|
|
|
6240d7 |
+ xfree (build_id);
|
|
|
6240d7 |
+ }
|
|
|
6240d7 |
+ }
|
|
|
6240d7 |
|
|
|
6240d7 |
/* If this entry has no name, or its name matches the name
|
|
|
6240d7 |
for the main executable, don't include it in the list. */
|
|
|
6240d7 |
diff --git a/gdb/symfile.h b/gdb/symfile.h
|
|
|
6240d7 |
--- a/gdb/symfile.h
|
|
|
6240d7 |
+++ b/gdb/symfile.h
|
|
|
6240d7 |
@@ -531,6 +531,10 @@ void expand_symtabs_matching
|
|
|
6240d7 |
void map_symbol_filenames (symbol_filename_ftype *fun, void *data,
|
|
|
6240d7 |
int need_fullname);
|
|
|
6240d7 |
|
|
|
6240d7 |
+/* build-id support. */
|
|
|
6240d7 |
+extern struct bfd_build_id *build_id_addr_get (CORE_ADDR addr);
|
|
|
6240d7 |
+extern void debug_print_missing (const char *binary, const char *debug);
|
|
|
6240d7 |
+
|
|
|
6240d7 |
/* From dwarf2read.c */
|
|
|
6240d7 |
|
|
|
6240d7 |
/* Names for a dwarf2 debugging section. The field NORMAL is the normal
|
|
|
6240d7 |
diff --git a/gdb/testsuite/gdb.base/corefile.exp b/gdb/testsuite/gdb.base/corefile.exp
|
|
|
6240d7 |
--- a/gdb/testsuite/gdb.base/corefile.exp
|
|
|
6240d7 |
+++ b/gdb/testsuite/gdb.base/corefile.exp
|
|
|
6240d7 |
@@ -311,3 +311,33 @@ gdb_test_multiple "core-file $corefile" $test {
|
|
|
6240d7 |
pass $test
|
|
|
6240d7 |
}
|
|
|
6240d7 |
}
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+# Test auto-loading of binary files through build-id from the core file.
|
|
|
6240d7 |
+set buildid [build_id_debug_filename_get $binfile]
|
|
|
6240d7 |
+set wholetest "binfile found by build-id"
|
|
|
6240d7 |
+if {$buildid == ""} {
|
|
|
6240d7 |
+ untested "$wholetest (binary has no build-id)"
|
|
|
6240d7 |
+} else {
|
|
|
6240d7 |
+ gdb_exit
|
|
|
6240d7 |
+ gdb_start
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ regsub {\.debug$} $buildid {} buildid
|
|
|
6240d7 |
+ set debugdir [standard_output_file ${testfile}-debugdir]
|
|
|
6240d7 |
+ file delete -force -- $debugdir
|
|
|
6240d7 |
+ file mkdir $debugdir/[file dirname $buildid]
|
|
|
6240d7 |
+ file copy $binfile $debugdir/$buildid
|
|
|
6240d7 |
+
|
|
|
6240d7 |
+ set test "show debug-file-directory"
|
|
|
6240d7 |
+ gdb_test_multiple $test $test {
|
|
|
6240d7 |
+ -re "The directory where separate debug symbols are searched for is \"(.*)\"\\.\r\n$gdb_prompt $" {
|
|
|
6240d7 |
+ set debugdir_orig $expect_out(1,string)
|
|
|
6240d7 |
+ pass $test
|
|
|
6240d7 |
+ }
|
|
|
6240d7 |
+ }
|
|
|
6240d7 |
+ gdb_test_no_output "set debug-file-directory $debugdir:$debugdir_orig" "set debug-file-directory"
|
|
|
6240d7 |
+ gdb_test "show build-id-core-loads" {Whether CORE-FILE loads the build-id associated files automatically is on\.}
|
|
|
6240d7 |
+ gdb_test "core-file $corefile" "\r\nProgram terminated with .*" "core-file without executable"
|
|
|
6240d7 |
+ gdb_test "info files" "Local exec file:\r\n\[ \t\]*`[string_to_regexp $debugdir/$buildid]', file type .*"
|
|
|
6240d7 |
+ pass $wholetest
|
|
|
6240d7 |
+}
|
|
|
6240d7 |
diff --git a/gdb/testsuite/gdb.base/new-ui-pending-input.exp b/gdb/testsuite/gdb.base/new-ui-pending-input.exp
|
|
|
6240d7 |
--- a/gdb/testsuite/gdb.base/new-ui-pending-input.exp
|
|
|
6240d7 |
+++ b/gdb/testsuite/gdb.base/new-ui-pending-input.exp
|
|
|
6240d7 |
@@ -62,6 +62,7 @@ proc test_command_line_new_ui_pending_input {} {
|
|
|
6240d7 |
set options ""
|
|
|
6240d7 |
append options " -iex \"set height 0\""
|
|
|
6240d7 |
append options " -iex \"set width 0\""
|
|
|
6240d7 |
+ append options " -iex \"set build-id-verbose 0\""
|
|
|
6240d7 |
append options " -iex \"new-ui console $extra_tty_name\""
|
|
|
6240d7 |
append options " -ex \"b $bpline\""
|
|
|
6240d7 |
append options " -ex \"run\""
|
|
|
6240d7 |
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
|
|
|
6240d7 |
--- a/gdb/testsuite/lib/gdb.exp
|
|
|
6240d7 |
+++ b/gdb/testsuite/lib/gdb.exp
|
|
|
6240d7 |
@@ -1716,6 +1716,16 @@ proc default_gdb_start { } {
|
|
|
6240d7 |
warning "Couldn't set the width to 0."
|
|
|
6240d7 |
}
|
|
|
6240d7 |
}
|
|
|
6240d7 |
+ # Turn off the missing warnings as the testsuite does not expect it.
|
|
|
6240d7 |
+ send_gdb "set build-id-verbose 0\n"
|
|
|
6240d7 |
+ gdb_expect 10 {
|
|
|
6240d7 |
+ -re "$gdb_prompt $" {
|
|
|
6240d7 |
+ verbose "Disabled the missing debug infos warnings." 2
|
|
|
6240d7 |
+ }
|
|
|
6240d7 |
+ timeout {
|
|
|
6240d7 |
+ warning "Could not disable the missing debug infos warnings.."
|
|
|
6240d7 |
+ }
|
|
|
6240d7 |
+ }
|
|
|
6240d7 |
return 0
|
|
|
6240d7 |
}
|
|
|
6240d7 |
|
|
|
6240d7 |
diff --git a/gdb/testsuite/lib/mi-support.exp b/gdb/testsuite/lib/mi-support.exp
|
|
|
6240d7 |
--- a/gdb/testsuite/lib/mi-support.exp
|
|
|
6240d7 |
+++ b/gdb/testsuite/lib/mi-support.exp
|
|
|
6240d7 |
@@ -309,6 +309,16 @@ proc default_mi_gdb_start { args } {
|
|
|
6240d7 |
warning "Couldn't set the width to 0."
|
|
|
6240d7 |
}
|
|
|
6240d7 |
}
|
|
|
6240d7 |
+ # Turn off the missing warnings as the testsuite does not expect it.
|
|
|
6240d7 |
+ send_gdb "190-gdb-set build-id-verbose 0\n"
|
|
|
6240d7 |
+ gdb_expect 10 {
|
|
|
6240d7 |
+ -re ".*190-gdb-set build-id-verbose 0\r\n190\\\^done\r\n$mi_gdb_prompt$" {
|
|
|
6240d7 |
+ verbose "Disabled the missing debug infos warnings." 2
|
|
|
6240d7 |
+ }
|
|
|
6240d7 |
+ timeout {
|
|
|
6240d7 |
+ warning "Could not disable the missing debug infos warnings.."
|
|
|
6240d7 |
+ }
|
|
|
6240d7 |
+ }
|
|
|
6240d7 |
|
|
|
6240d7 |
if { $separate_inferior_pty } {
|
|
|
6240d7 |
mi_create_inferior_pty
|