From: Andreas Jaeger <aj@suse.de>
Date: Wed, 28 Feb 2001 12:33:07 +0000 (+0000)
Subject: 2001-02-28  Andreas Jaeger  <aj@suse.de>
X-Git-Tag: binutils-2_11~39
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=02eb10f241f044fb0dbd55ac5f2ca8e29ad31cd6;p=thirdparty%2Fbinutils-gdb.git

2001-02-28  Andreas Jaeger  <aj@suse.de>

	* elf64-x86-64.c (elf64_x86_64_relocate_section): Add relocation
	to addend.
---

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;
 		    }
 		}