From af36af768410688c097d314764175aa4910ef9d8 Mon Sep 17 00:00:00 2001
From: Hans-Peter Nilsson <hp@axis.com>
Date: Wed, 25 Mar 2009 03:03:40 +0000
Subject: 	* elf32-cris.c (cris_elf_relocate_section) <case R_CRIS_32_GD>
 	<R_CRIS_16_GOT_GD, case R_CRIS_32_GOT_GD>: Handle COMMON symbols. 
 <case R_CRIS_16_TPREL, R_CRIS_32_TPREL>: Ditto.

---
 bfd/elf32-cris.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'bfd/elf32-cris.c')

diff --git a/bfd/elf32-cris.c b/bfd/elf32-cris.c
index ed1f3e8d50..2037b10f59 100644
--- a/bfd/elf32-cris.c
+++ b/bfd/elf32-cris.c
@@ -1733,7 +1733,8 @@ cris_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 	      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;
@@ -2000,7 +2001,7 @@ cris_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 
 	  if (h != NULL
 	      && ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
-	      && !h->def_regular
+	      && !(h->def_regular || ELF_COMMON_DEF_P (h))
 	      /* If it's undefined, then an error message has already
 		 been emitted.  */
 	      && h->root.type != bfd_link_hash_undefined)
-- 
cgit v1.2.1