From: Hans-Peter Nilsson <hp@axis.com>
Date: Fri, 18 Oct 2013 02:37:51 +0000 (+0000)
Subject: 	* elf32-cris.c (cris_elf_check_relocs): Don't assume
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6dd38d7935978de2a692f3042333a879eef18374;p=binutils-gdb.git

	* elf32-cris.c (cris_elf_check_relocs): Don't assume
	a registered dynobj means that a .got has been created.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 1f9b6989618..89774001c1b 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-18  Hans-Peter Nilsson  <hp@axis.com>
+
+	* elf32-cris.c (cris_elf_check_relocs): Don't assume
+	a registered dynobj means that a .got has been created.
+
 2013-10-17  Alan Modra  <amodra@gmail.com>
 
 	PR 16056
diff --git a/bfd/elf32-cris.c b/bfd/elf32-cris.c
index f40a07963be..f35292ed624 100644
--- a/bfd/elf32-cris.c
+++ b/bfd/elf32-cris.c
@@ -3236,15 +3236,20 @@ cris_elf_check_relocs (bfd *abfd,
 		     abfd, sec);
 		  return FALSE;
 		}
+	    }
 
-	      /* Create the .got section, so we can assume it's always
-		 present whenever there's a dynobj.  */
+	  if (sgot == NULL)
+	    {
+	      /* We may have a dynobj but no .got section, if machine-
+		 independent parts of the linker found a reason to create
+		 a dynobj.  We want to create the .got section now, so we
+		 can assume it's always present whenever there's a dynobj.
+		 It's ok to call this function more than once.  */
 	      if (!_bfd_elf_create_got_section (dynobj, info))
 		return FALSE;
-	    }
 
-	  if (sgot == NULL)
-	    sgot = bfd_get_linker_section (dynobj, ".got");
+	      sgot = bfd_get_linker_section (dynobj, ".got");
+	    }
 
 	  if (local_got_refcounts == NULL)
 	    {