Remove section VMA adjustment when computing the address of the line to show.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 5ce9f2c195eeb1923fe07bb25c6bdbb11f43a19b..714d37f3a817171aa0c95f3d7d4b62c4e7710ad4 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+2001-05-28  Nick Clifton  <nickc@cambridge.redhat.com>
+
+       * objdump.c (disassemble_bytes): Remove section VMA adjustment
+       when computing the address of the line to show.
+
 2001-05-16  Richard Henderson  <rth@redhat.com>
 
        * readelf.c (do_debug_frames_interp): New.

diff --git a/binutils/objdump.c b/binutils/objdump.c
index 27002ab80ff748a91c230fe55428ec7bb697de1b..96b6031588ec23b28757b0a193691fc0b9a1b0ba 100644 (file)
--- a/binutils/objdump.c
+++ b/binutils/objdump.c
@@ -1328,7 +1328,10 @@ disassemble_bytes (info, disassemble_fn, insns, data,
          done_dot = false;
 
          if (with_line_numbers || with_source_code)
-           show_line (aux->abfd, section, addr_offset);
+           /* The line number tables will refer to unadjusted
+              section VMAs, so we must undo any VMA modifications
+              when calling show_line.  */
+           show_line (aux->abfd, section, addr_offset - adjust_section_vma);
 
          if (! prefix_addresses)
            {