2005-05-01 Paul Brook <paul@codesourcery.com>
* bfd/elflink.c (_bfd_elf_merge_symbol): Skip weak definitions if a
strong definition has already been seen.
diff --git a/ChangeLog.csl b/ChangeLog.csl
index c381846..6978c1c 100644
--- a/ChangeLog.csl
+++ b/ChangeLog.csl
@@ -1,5 +1,10 @@
2005-05-01 Paul Brook <paul@codesourcery.com>
+ * bfd/elflink.c (_bfd_elf_merge_symbol): Skip weak definitions if a
+ strong definition has already been seen.
+
+2005-05-01 Paul Brook <paul@codesourcery.com>
+
* bfd/elf32-arm.c (bfd_elf32_arm_process_before_allocation): Treat
R_ARM_PLT32 the same as R_ARM_PC24.
(arm_add_to_rel): Ditto.
diff --git a/bfd/elflink.c b/bfd/elflink.c
index 0554a0f..37272c6 100644
--- a/bfd/elflink.c
+++ b/bfd/elflink.c
@@ -1075,6 +1075,13 @@
|| h->root.type == bfd_link_hash_undefined)
*size_change_ok = TRUE;
+ /* Skip weak definitions of symbols that are already defined. */
+ if (newdef && olddef && newweak && !oldweak)
+ {
+ *skip = TRUE;
+ return TRUE;
+ }
+
/* NEWDYNCOMMON and OLDDYNCOMMON indicate whether the new or old
symbol, respectively, appears to be a common symbol in a dynamic
object. If a symbol appears in an uninitialized section, and is
