From: kkojima <kkojima>
Date: Sun, 22 Oct 2006 01:02:38 +0000 (+0000)
Subject: 	* elf32-sh64.c (sh64_elf_merge_symbol_attribute): Do merging
X-Git-Tag: drop_9x_support_start~1363
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d1c5669d73a1e3386e23da074b9444348e351d71;p=pf3gnuchains%2Fpf3gnuchains4x.git

	* elf32-sh64.c (sh64_elf_merge_symbol_attribute): Do merging
	only when the non visibility part of st_other is non-zero.
	* elf64-sh64.c (sh64_elf64_merge_symbol_attribute): Likewise.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index d00759366b..b99745081f 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2006-10-21  Kaz Kojima  <kkojima@rr.iij4u.or.jp>
+
+	* elf32-sh64.c (sh64_elf_merge_symbol_attribute): Do merging
+	only when the non visibility part of st_other is non-zero.
+	* elf64-sh64.c (sh64_elf64_merge_symbol_attribute): Likewise.
+
 2006-10-20  Richard Sandiford  <richard@codesourcery.com>
 
 	* elfxx-mips.c (_bfd_mips_elf_modify_segment_map): Don't extend
diff --git a/bfd/elf32-sh64.c b/bfd/elf32-sh64.c
index 03d5e3e9df..9ad795e79d 100644
--- a/bfd/elf32-sh64.c
+++ b/bfd/elf32-sh64.c
@@ -742,9 +742,9 @@ static void
 sh64_elf_merge_symbol_attribute (struct elf_link_hash_entry *h,
 				 const Elf_Internal_Sym *isym,
 				 bfd_boolean definition,
-				 bfd_boolean dynamic)
+				 bfd_boolean dynamic ATTRIBUTE_UNUSED)
 {
-  if (isym->st_other != 0 && dynamic)
+  if ((isym->st_other & ~ELF_ST_VISIBILITY (-1)) != 0)
     {
       unsigned char other;
 
diff --git a/bfd/elf64-sh64.c b/bfd/elf64-sh64.c
index 5ebea96d4c..731995f2b8 100644
--- a/bfd/elf64-sh64.c
+++ b/bfd/elf64-sh64.c
@@ -4020,9 +4020,9 @@ static void
 sh64_elf64_merge_symbol_attribute (struct elf_link_hash_entry *h,
 				   const Elf_Internal_Sym *isym,
 				   bfd_boolean definition,
-				   bfd_boolean dynamic)
+				   bfd_boolean dynamic ATTRIBUTE_UNUSED)
 {
-  if (isym->st_other != 0 && dynamic)
+  if ((isym->st_other & ~ELF_ST_VISIBILITY (-1)) != 0)
     {
       unsigned char other;