* elf32-cris.c (cris_elf_relocate_section) <case R_CRIS_32_GD>

	<R_CRIS_16_GOT_GD, R_CRIS_32_GOT_GD>: Don't include the TLS size
	when emitting a known TP offset in the GOT.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 9dfb87ed6bbaf5449a31fd8dbeb6183009b39a36..8336ac4292881b5f09e1ddf6d4302f9f06ea1f23 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2009-03-24  Hans-Peter Nilsson  <hp@axis.com>
+
+       * elf32-cris.c (cris_elf_relocate_section) <case R_CRIS_32_GD>
+       <R_CRIS_16_GOT_GD, R_CRIS_32_GOT_GD>: Don't include the TLS size
+       when emitting a known TP offset in the GOT.
+
 2009-03-23  Alan Modra  <amodra@bigpond.net.au>
 
        * elf64-ppc.c (synthetic_opd): Delete.

diff --git a/bfd/elf32-cris.c b/bfd/elf32-cris.c
index bd6de292a67cc81e1d9dfe7b5e9aaf74f27c2bb6..6dc669a493962a4947d0a866436afeec7777b6cb 100644 (file)
--- a/bfd/elf32-cris.c
+++ b/bfd/elf32-cris.c
@@ -1735,9 +1735,8 @@ cris_elf_relocate_section (output_bfd, info, input_bfd, input_section,
              bfd_vma off;
 
              /* The symbol is defined in the program, so just write
-                (1, -prog_tls_size+known_tpoffset) into the GOT.  */
+                (1, known_tpoffset) into the GOT.  */
              relocation -= elf_hash_table (info)->tls_sec->vma;
-             relocation -= elf_hash_table (info)->tls_size;
 
              if (h != NULL)
                {