diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 31e4b4c186..a843386088 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2010-08-25  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/11939
+	* elflink.c (elf_link_add_object_symbols): Don't set
+	unique_global for non-ELF hash link table.
+
 2010-08-25  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR ld/11944
diff --git a/bfd/elflink.c b/bfd/elflink.c
index 2f67c4769a..28f012c2a2 100644
--- a/bfd/elflink.c
+++ b/bfd/elflink.c
@@ -4191,7 +4191,8 @@ error_free_dyn:
 	h = (struct elf_link_hash_entry *) h->root.u.i.link;
 
       *sym_hash = h;
-      h->unique_global = (flags & BSF_GNU_UNIQUE) != 0;
+      if (is_elf_hash_table (htab))
+	h->unique_global = (flags & BSF_GNU_UNIQUE) != 0;
 
       new_weakdef = FALSE;
       if (dynamic