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

	PR ld/12975
	PR ld/13195
	2011-10-17  Alan Modra  <amodra@gmail.com>
	* elf64-ppc.c (ppc64_elf_gc_mark_dynamic_ref): Apply 2011-09-15
	and 2011-09-29 bfd_elf_gc_mark_dynamic_ref_symbol changes here too.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index aabe22d51e7..20793ed93d5 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,6 +1,12 @@
 2011-10-25  Alan Modra  <amodra@gmail.com>
 
 	Apply mainline patches
+	2011-10-17  Alan Modra  <amodra@gmail.com>
+	PR ld/12975
+	PR ld/13195
+	* elf64-ppc.c (ppc64_elf_gc_mark_dynamic_ref): Apply 2011-09-15
+	and 2011-09-29 bfd_elf_gc_mark_dynamic_ref_symbol changes here too.
+
 	2011-10-11  Alan Modra  <amodra@gmail.com>
 	PR binutils/13278
 	* archive.c (bfd_generic_archive_p): Only check first element
diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c
index 5f5c8111609..837568cef18 100644
--- a/bfd/elf64-ppc.c
+++ b/bfd/elf64-ppc.c
@@ -5717,7 +5717,10 @@ ppc64_elf_gc_mark_dynamic_ref (struct elf_link_hash_entry *h, void *inf)
 	  || (!info->executable
 	      && eh->elf.def_regular
 	      && ELF_ST_VISIBILITY (eh->elf.other) != STV_INTERNAL
-	      && ELF_ST_VISIBILITY (eh->elf.other) != STV_HIDDEN)))
+	      && ELF_ST_VISIBILITY (eh->elf.other) != STV_HIDDEN
+	      && (strchr (eh->elf.root.root.string, ELF_VER_CHR) != NULL
+		  || !bfd_hide_sym_by_version (info->version_info,
+					       eh->elf.root.root.string)))))
     {
       asection *code_sec;
       struct ppc_link_hash_entry *fh;