From FEDORA_PATCHES Mon Sep 17 00:00:00 2001

From: Fedora GDB patches <invalid@email.com>

Date: Fri, 27 Oct 2017 21:07:50 +0200

Subject: gdb-6.6-buildid-locate.patch

;; New locating of the matching binaries from the pure core file (build-id).

;;=push+jan

diff --git a/bfd/libbfd-in.h b/bfd/libbfd-in.h

--- a/bfd/libbfd-in.h

+++ b/bfd/libbfd-in.h

@@ -121,7 +121,7 @@ static inline char *

 bfd_strdup (const char *str)

 {

   size_t len = strlen (str) + 1;

-  char *buf = bfd_malloc (len);

+  char *buf = (char *) bfd_malloc (len);

   if (buf != NULL)

     memcpy (buf, str, len);

   return buf;

diff --git a/bfd/libbfd.h b/bfd/libbfd.h

--- a/bfd/libbfd.h

+++ b/bfd/libbfd.h

@@ -126,7 +126,7 @@ static inline char *

 bfd_strdup (const char *str)

 {

   size_t len = strlen (str) + 1;

-  char *buf = bfd_malloc (len);

+  char *buf = (char *) bfd_malloc (len);

   if (buf != NULL)

     memcpy (buf, str, len);

   return buf;

diff --git a/gdb/build-id.c b/gdb/build-id.c

--- a/gdb/build-id.c

+++ b/gdb/build-id.c

@@ -24,13 +24,70 @@

 #include "gdbsupport/gdb_vecs.h"

 #include "symfile.h"

 #include "objfiles.h"

+#include <sys/stat.h>

+#include "elf-bfd.h"

+#include "elf/common.h"

+#include "elf/external.h"

+#include "elf/internal.h"

 #include "filenames.h"

+#include "gdb_bfd.h"

+#include "gdbcmd.h"

 #include "gdbcore.h"

+#include "objfiles.h"

+#include "observable.h"

+#include "symfile.h"

+

+#define BUILD_ID_VERBOSE_NONE 0

+#define BUILD_ID_VERBOSE_FILENAMES 1

+#define BUILD_ID_VERBOSE_BINARY_PARSE 2

+static int build_id_verbose = BUILD_ID_VERBOSE_FILENAMES;

+static void

+show_build_id_verbose (struct ui_file *file, int from_tty,

+		       struct cmd_list_element *c, const char *value)

+{

+  fprintf_filtered (file, _("Verbosity level of the build-id locator is %s.\n"),

+		    value);

+}

+/* Locate NT_GNU_BUILD_ID and return its matching debug filename.

+   FIXME: NOTE decoding should be unified with the BFD core notes decoding.  */

+

+static struct bfd_build_id *

+build_id_buf_get (bfd *templ, gdb_byte *buf, bfd_size_type size)

+{

+  bfd_byte *p;

+

+  p = buf;

+  while (p < buf + size)

+    {

+      /* FIXME: bad alignment assumption.  */

+      Elf_External_Note *xnp = (Elf_External_Note *) p;

+      size_t namesz = H_GET_32 (templ, xnp->namesz);

+      size_t descsz = H_GET_32 (templ, xnp->descsz);

+      bfd_byte *descdata = (gdb_byte *) xnp->name + BFD_ALIGN (namesz, 4);

+

+      if (H_GET_32 (templ, xnp->type) == NT_GNU_BUILD_ID

+	  && namesz == sizeof "GNU"

+	  && memcmp (xnp->name, "GNU", sizeof "GNU") == 0)

+	{

+	  size_t sz = descsz;

+	  gdb_byte *data = (gdb_byte *) descdata;

+	  struct bfd_build_id *retval;

+

+	  retval = (struct bfd_build_id *) xmalloc (sizeof *retval - 1 + sz);

+	  retval->size = sz;

+	  memcpy (retval->data, data, sz);

+

+	  return retval;

+	}

+      p = descdata + BFD_ALIGN (descsz, 4);

+    }

+  return NULL;

+}

 /* See build-id.h.  */

 const struct bfd_build_id *

-build_id_bfd_get (bfd *abfd)

+build_id_bfd_shdr_get (bfd *abfd)

 {

   if (!bfd_check_format (abfd, bfd_object)

       && !bfd_check_format (abfd, bfd_core))

@@ -43,6 +100,348 @@ build_id_bfd_get (bfd *abfd)

   return NULL;

 }

+/* Core files may have missing (corrupt) SHDR but PDHR is correct there.

+   bfd_elf_bfd_from_remote_memory () has too much overhead by

+   allocating/reading all the available ELF PT_LOADs.  */

+

+static struct bfd_build_id *

+build_id_phdr_get (bfd *templ, bfd_vma loadbase, unsigned e_phnum,

+		   Elf_Internal_Phdr *i_phdr)

+{

+  int i;

+  struct bfd_build_id *retval = NULL;

+

+  for (i = 0; i < e_phnum; i++)

+    if (i_phdr[i].p_type == PT_NOTE && i_phdr[i].p_filesz > 0)

+      {

+	Elf_Internal_Phdr *hdr = &i_phdr[i];

+	gdb_byte *buf;

+	int err;

+

+	buf = (gdb_byte *) xmalloc (hdr->p_filesz);

+	err = target_read_memory (loadbase + i_phdr[i].p_vaddr, buf,

+				  hdr->p_filesz);

+	if (err == 0)

+	  retval = build_id_buf_get (templ, buf, hdr->p_filesz);

+	else

+	  retval = NULL;

+	xfree (buf);

+	if (retval != NULL)

+	  break;

+      }

+  return retval;

+}

+

+/* First we validate the file by reading in the ELF header and checking

+   the magic number.  */

+

+static inline bfd_boolean

+elf_file_p (Elf64_External_Ehdr *x_ehdrp64)

+{

+  gdb_assert (sizeof (Elf64_External_Ehdr) >= sizeof (Elf32_External_Ehdr));

+  gdb_assert (offsetof (Elf64_External_Ehdr, e_ident)

+	      == offsetof (Elf32_External_Ehdr, e_ident));

+  gdb_assert (sizeof (((Elf64_External_Ehdr *) 0)->e_ident)

+	      == sizeof (((Elf32_External_Ehdr *) 0)->e_ident));

+

+  return ((x_ehdrp64->e_ident[EI_MAG0] == ELFMAG0)

+	  && (x_ehdrp64->e_ident[EI_MAG1] == ELFMAG1)

+	  && (x_ehdrp64->e_ident[EI_MAG2] == ELFMAG2)

+	  && (x_ehdrp64->e_ident[EI_MAG3] == ELFMAG3));

+}

+

+/* Translate an ELF file header in external format into an ELF file header in

+   internal format.  */

+

+#define H_GET_WORD(bfd, ptr) (is64 ? H_GET_64 (bfd, (ptr))		\

+				   : H_GET_32 (bfd, (ptr)))

+#define H_GET_SIGNED_WORD(bfd, ptr) (is64 ? H_GET_S64 (bfd, (ptr))	\

+					  : H_GET_S32 (bfd, (ptr)))

+

+static void

+elf_swap_ehdr_in (bfd *abfd,

+		  const Elf64_External_Ehdr *src64,

+		  Elf_Internal_Ehdr *dst)

+{

+  int is64 = bfd_get_arch_size (abfd) == 64;

+#define SRC(field) (is64 ? src64->field \

+			 : ((const Elf32_External_Ehdr *) src64)->field)

+

+  int signed_vma = get_elf_backend_data (abfd)->sign_extend_vma;

+  memcpy (dst->e_ident, SRC (e_ident), EI_NIDENT);

+  dst->e_type = H_GET_16 (abfd, SRC (e_type));

+  dst->e_machine = H_GET_16 (abfd, SRC (e_machine));

+  dst->e_version = H_GET_32 (abfd, SRC (e_version));

+  if (signed_vma)

+    dst->e_entry = H_GET_SIGNED_WORD (abfd, SRC (e_entry));

+  else

+    dst->e_entry = H_GET_WORD (abfd, SRC (e_entry));

+  dst->e_phoff = H_GET_WORD (abfd, SRC (e_phoff));

+  dst->e_shoff = H_GET_WORD (abfd, SRC (e_shoff));

+  dst->e_flags = H_GET_32 (abfd, SRC (e_flags));

+  dst->e_ehsize = H_GET_16 (abfd, SRC (e_ehsize));

+  dst->e_phentsize = H_GET_16 (abfd, SRC (e_phentsize));

+  dst->e_phnum = H_GET_16 (abfd, SRC (e_phnum));

+  dst->e_shentsize = H_GET_16 (abfd, SRC (e_shentsize));

+  dst->e_shnum = H_GET_16 (abfd, SRC (e_shnum));

+  dst->e_shstrndx = H_GET_16 (abfd, SRC (e_shstrndx));

+

+#undef SRC

+}

+

+/* Translate an ELF program header table entry in external format into an

+   ELF program header table entry in internal format.  */

+

+static void

+elf_swap_phdr_in (bfd *abfd,

+		  const Elf64_External_Phdr *src64,

+		  Elf_Internal_Phdr *dst)

+{

+  int is64 = bfd_get_arch_size (abfd) == 64;

+#define SRC(field) (is64 ? src64->field					\

+			 : ((const Elf32_External_Phdr *) src64)->field)

+

+  int signed_vma = get_elf_backend_data (abfd)->sign_extend_vma;

+

+  dst->p_type = H_GET_32 (abfd, SRC (p_type));

+  dst->p_flags = H_GET_32 (abfd, SRC (p_flags));

+  dst->p_offset = H_GET_WORD (abfd, SRC (p_offset));

+  if (signed_vma)

+    {

+      dst->p_vaddr = H_GET_SIGNED_WORD (abfd, SRC (p_vaddr));

+      dst->p_paddr = H_GET_SIGNED_WORD (abfd, SRC (p_paddr));

+    }

+  else

+    {

+      dst->p_vaddr = H_GET_WORD (abfd, SRC (p_vaddr));

+      dst->p_paddr = H_GET_WORD (abfd, SRC (p_paddr));

+    }

+  dst->p_filesz = H_GET_WORD (abfd, SRC (p_filesz));

+  dst->p_memsz = H_GET_WORD (abfd, SRC (p_memsz));

+  dst->p_align = H_GET_WORD (abfd, SRC (p_align));

+

+#undef SRC

+}

+

+#undef H_GET_SIGNED_WORD

+#undef H_GET_WORD

+

+static Elf_Internal_Phdr *

+elf_get_phdr (bfd *templ, bfd_vma ehdr_vma, unsigned *e_phnum_pointer,

+              bfd_vma *loadbase_pointer)

+{

+  /* sizeof (Elf64_External_Ehdr) >= sizeof (Elf32_External_Ehdr)  */

+  Elf64_External_Ehdr x_ehdr64;	/* Elf file header, external form */

+  Elf_Internal_Ehdr i_ehdr;	/* Elf file header, internal form */

+  bfd_size_type x_phdrs_size;

+  gdb_byte *x_phdrs_ptr;

+  Elf_Internal_Phdr *i_phdrs;

+  int err;

+  unsigned int i;

+  bfd_vma loadbase;

+  int loadbase_set;

+

+  gdb_assert (templ != NULL);

+  gdb_assert (sizeof (Elf64_External_Ehdr) >= sizeof (Elf32_External_Ehdr));

+

+  /* Read in the ELF header in external format.  */

+  err = target_read_memory (ehdr_vma, (bfd_byte *) &x_ehdr64, sizeof x_ehdr64);

+  if (err)

+    {

+      if (build_id_verbose >= BUILD_ID_VERBOSE_BINARY_PARSE)

+        warning (_("build-id: Error reading ELF header at address 0x%lx"),

+		 (unsigned long) ehdr_vma);

+      return NULL;

+    }

+

+  /* Now check to see if we have a valid ELF file, and one that BFD can

+     make use of.  The magic number must match, the address size ('class')

+     and byte-swapping must match our XVEC entry.  */

+

+  if (! elf_file_p (&x_ehdr64)

+      || x_ehdr64.e_ident[EI_VERSION] != EV_CURRENT

+      || !((bfd_get_arch_size (templ) == 64

+            && x_ehdr64.e_ident[EI_CLASS] == ELFCLASS64)

+           || (bfd_get_arch_size (templ) == 32

+	       && x_ehdr64.e_ident[EI_CLASS] == ELFCLASS32)))

+    {

+      if (build_id_verbose >= BUILD_ID_VERBOSE_BINARY_PARSE)

+        warning (_("build-id: Unrecognized ELF header at address 0x%lx"),

+		 (unsigned long) ehdr_vma);

+      return NULL;

+    }

+

+  /* Check that file's byte order matches xvec's */

+  switch (x_ehdr64.e_ident[EI_DATA])

+    {

+    case ELFDATA2MSB:		/* Big-endian */

+      if (! bfd_header_big_endian (templ))

+	{

+	  if (build_id_verbose >= BUILD_ID_VERBOSE_BINARY_PARSE)

+	    warning (_("build-id: Unrecognized "

+		       "big-endian ELF header at address 0x%lx"),

+		     (unsigned long) ehdr_vma);

+	  return NULL;

+	}

+      break;

+    case ELFDATA2LSB:		/* Little-endian */

+      if (! bfd_header_little_endian (templ))

+	{

+	  if (build_id_verbose >= BUILD_ID_VERBOSE_BINARY_PARSE)

+	    warning (_("build-id: Unrecognized "

+		       "little-endian ELF header at address 0x%lx"),

+		     (unsigned long) ehdr_vma);

+	  return NULL;

+	}

+      break;

+    case ELFDATANONE:		/* No data encoding specified */

+    default:			/* Unknown data encoding specified */

+      if (build_id_verbose >= BUILD_ID_VERBOSE_BINARY_PARSE)

+	warning (_("build-id: Unrecognized "

+		   "ELF header endianity at address 0x%lx"),

+		 (unsigned long) ehdr_vma);

+      return NULL;

+    }

+

+  elf_swap_ehdr_in (templ, &x_ehdr64, &i_ehdr);

+

+  /* The file header tells where to find the program headers.

+     These are what we use to actually choose what to read.  */

+

+  if (i_ehdr.e_phentsize != (bfd_get_arch_size (templ) == 64

+                             ? sizeof (Elf64_External_Phdr)

+			     : sizeof (Elf32_External_Phdr))

+      || i_ehdr.e_phnum == 0)

+    {

+      if (build_id_verbose >= BUILD_ID_VERBOSE_BINARY_PARSE)

+	warning (_("build-id: Invalid ELF program headers from the ELF header "

+		   "at address 0x%lx"), (unsigned long) ehdr_vma);

+      return NULL;

+    }

+

+  x_phdrs_size = (bfd_get_arch_size (templ) == 64 ? sizeof (Elf64_External_Phdr)

+						: sizeof (Elf32_External_Phdr));

+

+  i_phdrs = (Elf_Internal_Phdr *) xmalloc (i_ehdr.e_phnum * (sizeof *i_phdrs + x_phdrs_size));

+  x_phdrs_ptr = (gdb_byte *) &i_phdrs[i_ehdr.e_phnum];

+  err = target_read_memory (ehdr_vma + i_ehdr.e_phoff, (bfd_byte *) x_phdrs_ptr,

+			    i_ehdr.e_phnum * x_phdrs_size);

+  if (err)

+    {

+      free (i_phdrs);

+      if (build_id_verbose >= BUILD_ID_VERBOSE_BINARY_PARSE)

+        warning (_("build-id: Error reading "

+		   "ELF program headers at address 0x%lx"),

+		 (unsigned long) (ehdr_vma + i_ehdr.e_phoff));

+      return NULL;

+    }

+

+  loadbase = ehdr_vma;

+  loadbase_set = 0;

+  for (i = 0; i < i_ehdr.e_phnum; ++i)

+    {

+      elf_swap_phdr_in (templ, (Elf64_External_Phdr *)

+			       (x_phdrs_ptr + i * x_phdrs_size), &i_phdrs[i]);

+      /* IA-64 vDSO may have two mappings for one segment, where one mapping

+	 is executable only, and one is read only.  We must not use the

+	 executable one (PF_R is the first one, PF_X the second one).  */

+      if (i_phdrs[i].p_type == PT_LOAD && (i_phdrs[i].p_flags & PF_R))

+	{

+	  /* Only the first PT_LOAD segment indicates the file bias.

+	     Next segments may have P_VADDR arbitrarily higher.

+	     If the first segment has P_VADDR zero any next segment must not

+	     confuse us, the first one sets LOADBASE certainly enough.  */

+	  if (!loadbase_set && i_phdrs[i].p_offset == 0)

+	    {

+	      loadbase = ehdr_vma - i_phdrs[i].p_vaddr;

+	      loadbase_set = 1;

+	    }

+	}

+    }

+

+  if (build_id_verbose >= BUILD_ID_VERBOSE_BINARY_PARSE)

+    warning (_("build-id: Found ELF header at address 0x%lx, loadbase 0x%lx"),

+	     (unsigned long) ehdr_vma, (unsigned long) loadbase);

+

+  *e_phnum_pointer = i_ehdr.e_phnum;

+  *loadbase_pointer = loadbase;

+  return i_phdrs;

+}

+

+/* BUILD_ID_ADDR_GET gets ADDR located somewhere in the object.

+   Find the first section before ADDR containing an ELF header.

+   We rely on the fact the sections from multiple files do not mix.

+   FIXME: We should check ADDR is contained _inside_ the section with possibly

+   missing content (P_FILESZ < P_MEMSZ).  These omitted sections are currently

+   hidden by _BFD_ELF_MAKE_SECTION_FROM_PHDR.  */

+

+static CORE_ADDR build_id_addr;

+struct build_id_addr_sect

+  {

+    struct build_id_addr_sect *next;

+    asection *sect;

+  };

+static struct build_id_addr_sect *build_id_addr_sect;

+

+static void build_id_addr_candidate (bfd *abfd, asection *sect, void *obj)

+{

+  if (build_id_addr >= bfd_section_vma (sect))

+    {

+      struct build_id_addr_sect *candidate;

+

+      candidate = (struct build_id_addr_sect *) xmalloc (sizeof *candidate);

+      candidate->next = build_id_addr_sect;

+      build_id_addr_sect = candidate;

+      candidate->sect = sect;

+    }

+}

+

+struct bfd_build_id *

+build_id_addr_get (CORE_ADDR addr)

+{

+  struct build_id_addr_sect *candidate;

+  struct bfd_build_id *retval = NULL;

+  Elf_Internal_Phdr *i_phdr = NULL;

+  bfd_vma loadbase = 0;

+  unsigned e_phnum = 0;

+

+  if (core_bfd == NULL)

+    return NULL;

+

+  build_id_addr = addr;

+  gdb_assert (build_id_addr_sect == NULL);

+  bfd_map_over_sections (core_bfd, build_id_addr_candidate, NULL);

+

+  /* Sections are sorted in the high-to-low VMAs order.

+     Stop the search on the first ELF header we find.

+     Do not continue the search even if it does not contain NT_GNU_BUILD_ID.  */

+

+  for (candidate = build_id_addr_sect; candidate != NULL;

+       candidate = candidate->next)

+    {

+      i_phdr = elf_get_phdr (core_bfd,

+			     bfd_section_vma (candidate->sect),

+			     &e_phnum, &loadbase);

+      if (i_phdr != NULL)

+	break;

+    }

+

+  if (i_phdr != NULL)

+    {

+      retval = build_id_phdr_get (core_bfd, loadbase, e_phnum, i_phdr);

+      xfree (i_phdr);

+    }

+

+  while (build_id_addr_sect != NULL)

+    {

+      candidate = build_id_addr_sect;

+      build_id_addr_sect = candidate->next;

+      xfree (candidate);

+    }

+

+  return retval;

+}

+

 /* See build-id.h.  */

 int

@@ -51,7 +450,7 @@ build_id_verify (bfd *abfd, size_t check_len, const bfd_byte *check)

   const struct bfd_build_id *found;

   int retval = 0;

-  found = build_id_bfd_get (abfd);

+  found = build_id_bfd_shdr_get (abfd);

   if (found == NULL)

     warning (_("File \"%s\" has no build-id, file skipped"),

@@ -66,56 +465,159 @@ build_id_verify (bfd *abfd, size_t check_len, const bfd_byte *check)

   return retval;

 }

+static char *

+link_resolve (const char *symlink, int level)

+{

+  char buf[PATH_MAX + 1], *target, *retval;

+  ssize_t got;

+

+  if (level > 10)

+    return xstrdup (symlink);

+

+  got = readlink (symlink, buf, sizeof (buf));

+  if (got < 0 || got >= sizeof (buf))

+    return xstrdup (symlink);

+  buf[got] = '\0';

+

+  if (IS_ABSOLUTE_PATH (buf))

+    target = xstrdup (buf);

+  else

+    {

+      const std::string dir (ldirname (symlink));

+

+      target = xstrprintf ("%s"

+#ifndef HAVE_DOS_BASED_FILE_SYSTEM

+			   "/"

+#else /* HAVE_DOS_BASED_FILE_SYSTEM */

+			   "\\"

+#endif /* HAVE_DOS_BASED_FILE_SYSTEM */

+			   "%s", dir.c_str(), buf);

+    }

+

+  retval = link_resolve (target, level + 1);

+  xfree (target);

+  return retval;

+}

+

 /* Helper for build_id_to_debug_bfd.  LINK is a path to a potential

    build-id-based separate debug file, potentially a symlink to the real file.

    If the file exists and matches BUILD_ID, return a BFD reference to it.  */

 static gdb_bfd_ref_ptr

-build_id_to_debug_bfd_1 (const std::string &link, size_t build_id_len,

-			 const bfd_byte *build_id)

+build_id_to_debug_bfd_1 (const std::string &orig_link, size_t build_id_len,

+			 const bfd_byte *build_id, char **link_return)

 {

+  gdb_bfd_ref_ptr ret_bfd = {};

+  std::string ret_link;

+

   if (separate_debug_file_debug)

     {

-      printf_unfiltered (_("  Trying %s..."), link.c_str ());

+      printf_unfiltered (_("  Trying %s..."), orig_link.c_str ());

       gdb_flush (gdb_stdout);

     }

-  /* lrealpath() is expensive even for the usually non-existent files.  */

-  gdb::unique_xmalloc_ptr<char> filename;

-  if (access (link.c_str (), F_OK) == 0)

-    filename.reset (lrealpath (link.c_str ()));

-

-  if (filename == NULL)

+  for (unsigned seqno = 0;; seqno++)

     {

-      if (separate_debug_file_debug)

-	printf_unfiltered (_(" no, unable to compute real path\n"));

+      std::string link = orig_link;

-      return {};

-    }

+      if (seqno > 0)

+	{

+	  /* There can be multiple build-id symlinks pointing to real files

+	     with the same build-id (such as hard links).  Some of the real

+	     files may not be installed.  */

+

+	  string_appendf (link, ".%u", seqno);

+	}

-  /* We expect to be silent on the non-existing files.  */

-  gdb_bfd_ref_ptr debug_bfd = gdb_bfd_open (filename.get (), gnutarget);

+      ret_link = link;

-  if (debug_bfd == NULL)

-    {

-      if (separate_debug_file_debug)

-	printf_unfiltered (_(" no, unable to open.\n"));

+      struct stat statbuf_trash;

+

+      /* `access' automatically dereferences LINK.  */

+      if (lstat (link.c_str (), &statbuf_trash) != 0)

+	{

+	  /* Stop increasing SEQNO.  */

+	  break;

+	}

+

+      /* lrealpath() is expensive even for the usually non-existent files.  */

+      gdb::unique_xmalloc_ptr<char> filename;

+

+      if (access (link.c_str (), F_OK) == 0)

+	filename.reset (lrealpath (link.c_str ()));

+

+      if (filename == NULL)

+	{

+	  if (separate_debug_file_debug)

+	    printf_unfiltered (_(" no, unable to compute real path\n"));

+

+	  continue;

+	}

+

+      /* We expect to be silent on the non-existing files.  */

+      gdb_bfd_ref_ptr debug_bfd = gdb_bfd_open (filename.get (), gnutarget, -1);

-      return {};

+      if (debug_bfd == NULL)

+	{

+	  if (separate_debug_file_debug)

+	    printf_unfiltered (_(" no, unable to open.\n"));

+

+	  continue;

+	}

+

+      if (!build_id_verify (debug_bfd.get(), build_id_len, build_id))

+	{

+	  if (separate_debug_file_debug)

+	    printf_unfiltered (_(" no, build-id does not match.\n"));

+

+	  continue;

+	}

+

+      ret_bfd = debug_bfd;

+      break;

     }

-  if (!build_id_verify (debug_bfd.get(), build_id_len, build_id))

+  std::string link_all;

+

+  if (ret_bfd != NULL)

     {

       if (separate_debug_file_debug)

-	printf_unfiltered (_(" no, build-id does not match.\n"));

-

-      return {};

+	printf_unfiltered (_(" yes!\n"));

+    }

+  else

+    {

+      /* If none of the real files is found report as missing file

+	 always the non-.%u-suffixed file.  */

+      std::string link0 = orig_link;

+

+      /* If the symlink has target request to install the target.

+	 BASE-debuginfo.rpm contains the symlink but BASE.rpm may be missing.

+	 https://bugzilla.redhat.com/show_bug.cgi?id=981154  */

+      std::string link0_resolved (link_resolve (link0.c_str (), 0));

+

+      if (link_all.empty ())

+	link_all = link0_resolved;

+      else

+	{

+	  /* Use whitespace instead of DIRNAME_SEPARATOR to be compatible with

+	     its possible use as an argument for installation command.  */

+	  link_all += " " + link0_resolved;

+	}

     }

-  if (separate_debug_file_debug)

-    printf_unfiltered (_(" yes!\n"));

+  if (link_return != NULL)

+    {

+      if (ret_bfd != NULL)

+	{

+	  *link_return = xstrdup (ret_link.c_str ());

+	}

+      else

+	{

+	  *link_return = xstrdup (link_all.c_str ());

+	}

+    }

-  return debug_bfd;

+  return ret_bfd;

 }

 /* Common code for finding BFDs of a given build-id.  This function

@@ -124,7 +626,7 @@ build_id_to_debug_bfd_1 (const std::string &link, size_t build_id_len,

 static gdb_bfd_ref_ptr

 build_id_to_bfd_suffix (size_t build_id_len, const bfd_byte *build_id,

-			const char *suffix)

+			const char *suffix, char **link_return)

 {

   /* Keep backward compatibility so that DEBUG_FILE_DIRECTORY being "" will

      cause "/.build-id/..." lookups.  */

@@ -147,16 +649,17 @@ build_id_to_bfd_suffix (size_t build_id_len, const bfd_byte *build_id,

       if (size > 0)

 	{

 	  size--;

-	  string_appendf (link, "%02x/", (unsigned) *data++);

+	  string_appendf (link, "%02x", (unsigned) *data++);

 	}

-

+      if (size > 0)

+	link += "/";

       while (size-- > 0)

 	string_appendf (link, "%02x", (unsigned) *data++);

       link += suffix;

       gdb_bfd_ref_ptr debug_bfd

-	= build_id_to_debug_bfd_1 (link, build_id_len, build_id);

+	= build_id_to_debug_bfd_1 (link, build_id_len, build_id, link_return);

       if (debug_bfd != NULL)

 	return debug_bfd;

@@ -170,7 +673,8 @@ build_id_to_bfd_suffix (size_t build_id_len, const bfd_byte *build_id,

       if (strcmp (gdb_sysroot, TARGET_SYSROOT_PREFIX) != 0)

 	{

 	  link = gdb_sysroot + link;

-	  debug_bfd = build_id_to_debug_bfd_1 (link, build_id_len, build_id);

+	  debug_bfd = build_id_to_debug_bfd_1 (link, build_id_len, build_id,

+					       link_return);

 	  if (debug_bfd != NULL)

 	    return debug_bfd;

 	}

@@ -179,38 +683,208 @@ build_id_to_bfd_suffix (size_t build_id_len, const bfd_byte *build_id,

   return {};

 }

+char *

+build_id_to_filename (const struct bfd_build_id *build_id, char **link_return)

+{

+  gdb_bfd_ref_ptr abfd;

+  char *result;

+

+  abfd = build_id_to_exec_bfd (build_id->size, build_id->data, link_return);

+  if (abfd == NULL)

+    return NULL;

+

+  result = xstrdup (bfd_get_filename (abfd.get ()));

+  return result;

+}

+

+/* This MISSING_FILEPAIR_HASH tracker is used only for the duplicite messages

+     Try to install the hash file ...

+   avoidance.  */

+

+struct missing_filepair

+  {

+    char *binary;

+    char *debug;

+    char data[1];