* elf64-alpha.c (elf64_alpha_merge_symbol_attribute): New function.

	(elf_backend_merge_symbol_attribute): Define.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 92cfcd6e23e437f69c4b3d15244f733e36f914c3..8b1911c715c35955570c579d1361fd3c10d66cf4 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-06  Alan Modra  <amodra@bigpond.net.au>
+
+       * elf64-alpha.c (elf64_alpha_merge_symbol_attribute): New function.
+       (elf_backend_merge_symbol_attribute): Define.
+
 2006-12-04  Jan Beulich  <jbeulich@novell.com>
 
        * elflink.c (_bfd_elf_link_create_dynamic_sections): Don't create

diff --git a/bfd/elf64-alpha.c b/bfd/elf64-alpha.c
index 1f7e546d335d89fc25f6daa9d2ca62840b6f4a23..5732823be612c72c32cb9baf95b75e9333ea6181 100644 (file)
--- a/bfd/elf64-alpha.c
+++ b/bfd/elf64-alpha.c
@@ -2035,6 +2035,19 @@ elf64_alpha_adjust_dynamic_symbol (struct bfd_link_info *info,
   return TRUE;
 }
 
+/* Record STO_ALPHA_NOPV and STO_ALPHA_STD_GPLOAD.  */
+
+static void
+elf64_alpha_merge_symbol_attribute (struct elf_link_hash_entry *h,
+                                   const Elf_Internal_Sym *isym,
+                                   bfd_boolean definition,
+                                   bfd_boolean dynamic)
+{
+  if (!dynamic && definition)
+    h->other = ((h->other & ELF_ST_VISIBILITY (-1))
+               | (isym->st_other & ~ELF_ST_VISIBILITY (-1)));
+}
+
 /* Symbol versioning can create new symbols, and make our old symbols
    indirect to the new ones.  Consolidate the got and reloc information
    in these situations.  */
@@ -5271,6 +5284,8 @@ static const struct elf_size_info alpha_elf_size_info =
   elf64_alpha_create_dynamic_sections
 #define elf_backend_adjust_dynamic_symbol \
   elf64_alpha_adjust_dynamic_symbol
+#define elf_backend_merge_symbol_attribute \
+  elf64_alpha_merge_symbol_attribute
 #define elf_backend_always_size_sections \
   elf64_alpha_always_size_sections
 #define elf_backend_size_dynamic_sections \