From: Jakub Jelinek <jakub@redhat.com>
Date: Mon, 22 Dec 2003 10:49:59 +0000 (+0000)
Subject: 	* objdump.c (disassemble_bytes): Subtract rel_offset from printed
X-Git-Tag: gdb_6_1-branchpoint~404
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=68b3b8dc9e908a61e60a7af7b366e1a1de9b8d36;p=thirdparty%2Fbinutils-gdb.git

	* objdump.c (disassemble_bytes): Subtract rel_offset from printed
	reloc address.
	(disassemble_section): Set rel_offset to section->vma instead of
	pinfo->buffer_vma.
---

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 84ab4766082..8e6fe752ec3 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,10 @@
+2003-12-22  Jakub Jelinek  <jakub@redhat.com>
+
+	* objdump.c (disassemble_bytes): Subtract rel_offset from printed
+	reloc address.
+	(disassemble_section): Set rel_offset to section->vma instead of
+	pinfo->buffer_vma.
+
 2003-12-19  Kazuhiro Inaoka  <inaoka.kazuhiro@renesas.com>
 
 	* readelf.c (guess_is_rela): Changed m32r's default type to RELA.
diff --git a/binutils/objdump.c b/binutils/objdump.c
index f29ea714f57..f67aacb8881 100644
--- a/binutils/objdump.c
+++ b/binutils/objdump.c
@@ -1515,7 +1515,8 @@ disassemble_bytes (struct disassemble_info * info,
 	      else
 		printf ("\t\t\t");
 
-	      objdump_print_value (section->vma + q->address, info, TRUE);
+	      objdump_print_value (section->vma - rel_offset + q->address,
+				   info, TRUE);
 
 	      printf (": %s\t", q->howto->name);
 
@@ -1600,7 +1601,7 @@ disassemble_section (bfd *abfd, asection *section, void *info)
       /* Dynamic reloc addresses are absolute, non-dynamic are section
 	 relative.  REL_OFFSET specifies the reloc address corresponding
 	 to the start of this section.  */
-      rel_offset = pinfo->buffer_vma;
+      rel_offset = section->vma;
     }
   else
     {