diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index a0782606aa14827edde9322adc01bcd02a252704..7d836d1e3df5824c9cb347c1f714bc40c7a4f4ce 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,11 @@
+2005-07-15  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.c (bfd_elf_record_link_assignment): Remove output_bfd param.
+	(_bfd_elf_provide_symbol): Allow redefinition of weak syms and those
+	defined in output sections.  Call bfd_elf_record_link_assignment.
+	* bfd-in.h (bfd_elf_record_link_assignment): Update prototype.
+	* bfd-in2.h: Regenerate.
+
 2005-07-14  Jim Blandy  <jimb@redhat.com>
 
 	Add support for m32c-*-elf (Renesas m32c and m16c).
diff --git a/bfd/bfd-in.h b/bfd/bfd-in.h
index 34188d118e96e5972be8ade9a54d1b3bcab6b0dc..33e19eac07eb59211c77dc7901a65738c57c5d5f 100644
--- a/bfd/bfd-in.h
+++ b/bfd/bfd-in.h
@@ -633,7 +633,7 @@ enum dynamic_lib_link_class {
 };
 
 extern bfd_boolean bfd_elf_record_link_assignment
-  (bfd *, struct bfd_link_info *, const char *, bfd_boolean);
+  (struct bfd_link_info *, const char *, bfd_boolean);
 extern struct bfd_link_needed_list *bfd_elf_get_needed_list
   (bfd *, struct bfd_link_info *);
 extern bfd_boolean bfd_elf_get_bfd_needed_list
diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index 96cf124a851f94237dbff790f96b10e7925e0a5c..062a819b160ac139196fe30f5ea83454f4dd347f 100644
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -640,7 +640,7 @@ enum dynamic_lib_link_class {
 };
 
 extern bfd_boolean bfd_elf_record_link_assignment
-  (bfd *, struct bfd_link_info *, const char *, bfd_boolean);
+  (struct bfd_link_info *, const char *, bfd_boolean);
 extern struct bfd_link_needed_list *bfd_elf_get_needed_list
   (bfd *, struct bfd_link_info *);
 extern bfd_boolean bfd_elf_get_bfd_needed_list
diff --git a/bfd/elflink.c b/bfd/elflink.c
index 791575ba07a37d66362f4670cf67586464bd0433..7307c15a4f87461eaaf3bd70a63efa17ee023b30 100644
--- a/bfd/elflink.c
+++ b/bfd/elflink.c
@@ -433,8 +433,7 @@ bfd_elf_link_record_dynamic_symbol (struct bfd_link_info *info,
    this in case some dynamic object refers to this symbol.  */
 
 bfd_boolean
-bfd_elf_record_link_assignment (bfd *output_bfd ATTRIBUTE_UNUSED,
-				struct bfd_link_info *info,
+bfd_elf_record_link_assignment (struct bfd_link_info *info,
 				const char *name,
 				bfd_boolean provide)
 {
@@ -9843,8 +9842,13 @@ _bfd_elf_provide_symbol (struct bfd_link_info *info, const char *name,
 {
   struct elf_link_hash_entry *h;
 
+  bfd_elf_record_link_assignment (info, name, TRUE);
+
   h = elf_link_hash_lookup (elf_hash_table (info), name, FALSE, FALSE, FALSE);
-  if (h != NULL && !h->def_regular)
+  if (h != NULL
+      && !(h->root.type == bfd_link_hash_defined
+	   && h->root.u.def.section != NULL
+	   && h->root.u.def.section != h->root.u.def.section->output_section))
     bfd_elf_set_symbol (h, val, s);
 }