summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Jaeger <aj@suse.de>2001-02-28 12:33:07 +0000
committerAndreas Jaeger <aj@suse.de>2001-02-28 12:33:07 +0000
commitfbc9e2f773cb4fe138fd72039bf309848eac0373 (patch)
treede10c2b498e23ae79b6a2c0d96f90cf36073cbab
parentdf99f638a2a9528b7cf70d19b00b5594ae05f3ba (diff)
downloadgdb-fbc9e2f773cb4fe138fd72039bf309848eac0373.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/ChangeLog5
-rw-r--r--bfd/elf64-x86-64.c6
2 files changed, 8 insertions, 3 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 4ec2e05f161..ce7276447e8 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2001-02-28 Andreas Jaeger <aj@suse.de>
+
+ * elf64-x86-64.c (elf64_x86_64_relocate_section): Add relocation
+ to addend.
+
2001-02-26 Andreas Jaeger <aj@suse.de>
* elf64-x86-64.c (x86_64_elf_howto_table): Fix order of entries.
diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
index 88549b976d6..aedd2b8134f 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;
}
}