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 ce974488fe3d1bf8b3bfcb4fa3432de8eb19eb9d..60bffa0a5337b657918f25a6c184ec830e7c624b 100644 (file)
--- 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 88549b976d6051a10650139076b949c800abf6ed..aedd2b8134f18ba57b41e81348df104c799257d1 100644 (file)
--- 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;
                    }
                }