diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 41e6264bc8..39f5829224 100644
--- 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 1f7d20d44c..3710d47b70 100644
--- 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;