CVS commit: src/external/gpl3/gdb/dist/gdb

[Christos Zoulas]

Module Name:    src
Committed By:   christos
Date:           Sun Dec 14 19:58:06 UTC 2014

Modified Files:
        src/external/gpl3/gdb/dist/gdb: solib.c

Log Message:
When debugging 32 bit binaries on a 64 bit arch in NetBSD the dynamic
linker magically converts the dynamic linker name to ld.elf_so-<32bitarch>
like ld.elf_so-i386. We do the same magic here.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 src/external/gpl3/gdb/dist/gdb/solib.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/external/gpl3/gdb/dist/gdb/solib.c
diff -u src/external/gpl3/gdb/dist/gdb/solib.c:1.1.1.3 src/external/gpl3/gdb/dist/gdb/solib.c:1.2
--- src/external/gpl3/gdb/dist/gdb/solib.c:1.1.1.3	Sun Jun 22 19:41:01 2014
+++ src/external/gpl3/gdb/dist/gdb/solib.c	Sun Dec 14 14:58:06 2014
@@ -413,13 +413,12 @@ solib_bfd_fopen (char *pathname, int fd)
 
 /* Find shared library PATHNAME and open a BFD for it.  */
 
-bfd *
-solib_bfd_open (char *pathname)
+static bfd *
+solib_bfd_open1 (char *pathname)
 {
   char *found_pathname;
   int found_file;
   bfd *abfd;
-  const struct bfd_arch_info *b;
 
   /* Search for shared library file.  */
   found_pathname = solib_find (pathname, &found_file);
@@ -443,13 +442,41 @@ solib_bfd_open (char *pathname)
       error (_("`%s': not in executable format: %s"),
 	     bfd_get_filename (abfd), bfd_errmsg (bfd_get_error ()));
     }
+  return abfd;
+}
+
+bfd *
+solib_bfd_open (char *pathname)
+{
+  bfd *abfd, *bbfd;
+  const struct bfd_arch_info *b;
+  char pname[PATH_MAX];
+
+  abfd = solib_bfd_open1 (pathname);
+  if (abfd == NULL)
+    return NULL;
 
   /* Check bfd arch.  */
   b = gdbarch_bfd_arch_info (target_gdbarch ());
-  if (!b->compatible (b, bfd_get_arch_info (abfd)))
-    warning (_("`%s': Shared library architecture %s is not compatible "
-               "with target architecture %s."), bfd_get_filename (abfd),
-             bfd_get_arch_info (abfd)->printable_name, b->printable_name);
+  if (b->compatible (b, bfd_get_arch_info (abfd)))
+     return abfd;
+
+  snprintf (pname, sizeof(pname), "%s-%s", pathname, b->printable_name);
+  bbfd = solib_bfd_open1 (pname);
+  if (bbfd == NULL)
+    goto out;
+
+  gdb_bfd_unref (abfd);
+  abfd = bbfd;
+
+  /* Check bfd arch.  */
+  if (b->compatible (b, bfd_get_arch_info (abfd)))
+    return abfd;
+
+out:
+  warning (_("`%s': Shared library architecture %s is not compatible "
+             "with target architecture %s."), bfd_get_filename (abfd),
+           bfd_get_arch_info (abfd)->printable_name, b->printable_name);
 
   return abfd;
 }