* elf32-cris.c (cris_elf_relocate_section): <R_CRIS_32_IE>

	<R_CRIS_32_GOT_TPREL, R_CRIS_16_GOT_TPREL>: Handle references to
	thread common symbols.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 41e6264bc8f91bd48f5b17c065ef0087c040242c..39f5829224bee47d853d1d94c8a6022e3c433d20 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2012-06-17  Hans-Peter Nilsson  <hp@axis.com>
+
+       * elf32-cris.c (cris_elf_relocate_section): <R_CRIS_32_IE>
+       <R_CRIS_32_GOT_TPREL, R_CRIS_16_GOT_TPREL>: Handle references to
+       thread common symbols.
+
 2012-06-13  Nick Clifton  <nickc@redhat.com>
 
        * elf32-arm.c (bfd_arm_get_mach_from_attributes): New function.

diff --git a/bfd/elf32-cris.c b/bfd/elf32-cris.c
index 1f7d20d44c62d9e5f830ff9c8fb0adf1279ae7e1..3710d47b7063cf0f38ef8ec722b58c7680999ab6 100644 (file)
--- a/bfd/elf32-cris.c
+++ b/bfd/elf32-cris.c
@@ -1877,7 +1877,8 @@ cris_elf_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED,
              return FALSE;
            }
 
-         if (!info->shared && (h == NULL || h->def_regular))
+         if (!info->shared
+             && (h == NULL || h->def_regular || ELF_COMMON_DEF_P (h)))
            {
              /* Known contents of the GOT.  */
              bfd_vma off;