* addr2line.c (slurp_symtab): If canonicalization reveals that

	there were no ordinary symbols, try loading the dynamic symbols
	instead.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 13bded15e3b0e013171be2c4cd338a7ae70d6431..43f490f20d412281b3ed7fda2dacef49758f3c83 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,9 @@
+2013-03-15  Nick Clifton  <nickc@redhat.com>
+
+       * addr2line.c (slurp_symtab): If canonicalization reveals that
+       there were no ordinary symbols, try loading the dynamic symbols
+       instead.
+
 2013-03-14  Markos Chandras  <markos.chandras@imgtec.com>
 
        * MAINTAINERS: Add myself as Meta maintainer.

diff --git a/binutils/addr2line.c b/binutils/addr2line.c
index b4f604b4b9209f535b3bd70f5fdeaf6d43c80e5a..0de73982f54ffd0960d64a2e864a45af0b3c399e 100644 (file)
--- a/binutils/addr2line.c
+++ b/binutils/addr2line.c
@@ -130,6 +130,17 @@ slurp_symtab (bfd *abfd)
     symcount = bfd_canonicalize_symtab (abfd, syms);
   if (symcount < 0)
     bfd_fatal (bfd_get_filename (abfd));
+
+  /* If there are no symbols left after canonicalization and
+     we have not tried the dynamic symbols then give them a go.  */
+  if (symcount == 0
+      && ! dynamic
+      && (storage = bfd_get_dynamic_symtab_upper_bound (abfd)) > 0)
+    {
+      free (syms);
+      syms = xmalloc (storage);
+      symcount = bfd_canonicalize_dynamic_symtab (abfd, syms);
+    }
 }
 \f
 /* These global variables are used to pass information between