diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 393a8e2e00..b4301ebd61 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-01  Dave Korn  <dave.korn.cygwin@gmail.com>
+
+	* cofflink.c (_bfd_coff_generic_relocate_section): Look for the aux
+	symbol for a weak undef in the auxbfd, not the input bfd.
+
 2009-10-01  Ulrich Weigand  <uweigand@de.ibm.com>
 
 	* elf32-spu.c (spu_elf_auto_overlay): Insert icache linker script
diff --git a/bfd/cofflink.c b/bfd/cofflink.c
index 12a693e0ed..3253e5eecd 100644
--- a/bfd/cofflink.c
+++ b/bfd/cofflink.c
@@ -2959,7 +2959,7 @@ _bfd_coff_generic_relocate_section (bfd *output_bfd,
 		     See also linker.c: generic_link_check_archive_element. */
 		  asection *sec;
 		  struct coff_link_hash_entry *h2 =
-		    input_bfd->tdata.coff_obj_data->sym_hashes[
+		    h->auxbfd->tdata.coff_obj_data->sym_hashes[
 		    h->aux->x_sym.x_tagndx.l];
 
 		  if (!h2 || h2->root.type == bfd_link_hash_undefined)