2011-03-30 Catherine Moore <clm@codesourcery.com>

	* addr2line.c (translate_addresses): Sign extend the pc
	if sign_extend_vma is enabled.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index f9d8457..2ffd99b 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-30  Catherine Moore  <clm@codesourcery.com>
+
+       * addr2line.c (translate_addresses): Sign extend the pc
+       if sign_extend_vma is enabled.
+
 2011-03-30  Michael Snyder  <msnyder@msnyder-server.eng.vmware.com>
 
        * readelf.c (process_gnu_liblist): Stop memory leak.

diff --git a/binutils/addr2line.c b/binutils/addr2line.c
index 10c6cde..1ece80a 100644 (file)
--- a/binutils/addr2line.c
+++ b/binutils/addr2line.c
@@ -37,6 +37,7 @@
 #include "libiberty.h"
 #include "demangle.h"
 #include "bucomm.h"
+#include "elf-bfd.h"
 
 static bfd_boolean unwind_inlines;     /* -i, unwind inlined functions. */
 static bfd_boolean with_addresses;     /* -a, show addresses.  */
@@ -195,6 +196,8 @@ find_offset_in_section (bfd *abfd, asection *section)
 static void
 translate_addresses (bfd *abfd, asection *section)
 {
+  const struct elf_backend_data * bed;
+
   int read_stdin = (naddr == 0);
 
   for (;;)
@@ -215,6 +218,12 @@ translate_addresses (bfd *abfd, asection *section)
          pc = bfd_scan_vma (*addr++, NULL, 16);
        }
 
+      if (bfd_get_flavour (abfd) == bfd_target_elf_flavour
+         && (bed = get_elf_backend_data (abfd)) != NULL
+         && bed->sign_extend_vma
+         && (pc & (bfd_vma) 1 << (bed->s->arch_size - 1)))
+       pc |= ((bfd_vma) -1) << bed->s->arch_size;
+
       if (with_addresses)
         {
           printf ("0x");