From: Alan Modra <amodra@gmail.com>
Date: Tue, 25 Oct 2011 02:54:25 +0000 (+0000)
Subject: 	PR ld/13229
X-Git-Tag: binutils-2_22~58
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7c94611e4b601a39eccdf409620fb4b647a57013;p=thirdparty%2Fbinutils-gdb.git

	PR ld/13229
	PR ld/13244
	Apply mainline patches
	2011-10-08  Alan Modra  <amodra@gmail.com>
	* elflink.c (elf_link_add_object_symbols): Don't make IR symbols
	dynamic.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 1399037e781..b97235b1d53 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,6 +1,12 @@
 2011-10-25  Alan Modra  <amodra@gmail.com>
 
 	Apply mainline patches
+	2011-10-08  Alan Modra  <amodra@gmail.com>
+	PR ld/13229
+	PR ld/13244
+	* elflink.c (elf_link_add_object_symbols): Don't make IR symbols
+	dynamic.
+
 	2011-10-08  Alan Modra  <amodra@gmail.com>
 	* elflink.c (elf_link_output_extsym): Strip defined plugin symbols
 	even when strip_discarded is false.
diff --git a/bfd/elflink.c b/bfd/elflink.c
index c1b5bee357b..9558a2593cd 100644
--- a/bfd/elflink.c
+++ b/bfd/elflink.c
@@ -4376,11 +4376,13 @@ error_free_dyn:
 		dynsym = TRUE;
 	    }
 
+	  /* We don't want to make debug symbol dynamic.  */
 	  if (definition && (sec->flags & SEC_DEBUGGING) && !info->relocatable)
-	    {
-	      /* We don't want to make debug symbol dynamic.  */
-	      dynsym = FALSE;
-	    }
+	    dynsym = FALSE;
+
+	  /* Nor should we make plugin symbols dynamic.  */
+	  if ((abfd->flags & BFD_PLUGIN) != 0)
+	    dynsym = FALSE;
 
 	  if (definition)
 	    h->target_internal = isym->st_target_internal;