summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Jaeger <aj@suse.de>2001-02-28 12:32:10 +0000
committerAndreas Jaeger <aj@suse.de>2001-02-28 12:32:10 +0000
commit6077ffb454feb8f5a1ac82364b735daaf2aaf31e (patch)
tree3b5f1ca212645067ddb0815ec58803f5806077ff
parent114db3533e61bcb8043cbd67da22f6fb1b719d93 (diff)
downloadbinutils-redhat-6077ffb454feb8f5a1ac82364b735daaf2aaf31e.tar.gz
2001-02-28 Andreas Jaeger <aj@suse.de>
* elf64-x86-64.c (elf64_x86_64_relocate_section): Add relocation to addend.
-rw-r--r--bfd/ChangeLog9
-rw-r--r--bfd/elf64-x86-64.c6
2 files changed, 10 insertions, 5 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index ce974488fe..60bffa0a53 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,7 +1,12 @@
+2001-02-28 Andreas Jaeger <aj@suse.de>
+
+ * elf64-x86-64.c (elf64_x86_64_relocate_section): Add relocation
+ to addend.
+
2001-02-28 Philip Blundell <pb@futuretv.com>
* elf32-arm.h: Update mentions of renamed EF_xx constants.
- (elf32_arm_print_private_bfd_data): Handle ARM EABI version 2.
+ (elf32_arm_print_private_bfd_data): Handle ARM EABI version 2.
2001-02-27 H.J. Lu <hjl@gnu.org>
@@ -25,7 +30,7 @@
2001-02-26 Timothy Wall <twall@cygnus.com>
* elfxx-ia64.c (elfNN_ia64_aix_add_symbol_hook): Remove obsolete
- comments.
+ comments.
2001-02-26 Nick Clifton <nickc@redhat.com>
diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
index 88549b976d..aedd2b8134 100644
--- a/bfd/elf64-x86-64.c
+++ b/bfd/elf64-x86-64.c
@@ -1495,7 +1495,7 @@ elf64_x86_64_relocate_section (output_bfd, info, input_bfd, input_section,
BFD_ASSERT (h != NULL && h->dynindx != -1);
relocate = false;
outrel.r_info = ELF64_R_INFO (h->dynindx, r_type);
- outrel.r_addend = rela->r_addend;
+ outrel.r_addend = relocation + rela->r_addend;
}
else
{
@@ -1508,14 +1508,14 @@ elf64_x86_64_relocate_section (output_bfd, info, input_bfd, input_section,
{
relocate = true;
outrel.r_info = ELF64_R_INFO (0, R_X86_64_RELATIVE);
- outrel.r_addend = rela->r_addend;
+ outrel.r_addend = relocation + rela->r_addend;
}
else
{
BFD_ASSERT (h->dynindx != -1);
relocate = false;
outrel.r_info = ELF64_R_INFO (h->dynindx, R_X86_64_32);
- outrel.r_addend = rela->r_addend;
+ outrel.r_addend = relocation + rela->r_addend;
}
}