* archive.c (_bfd_compute_and_write_armap): Allow symbols flagged

	as unique in the armap.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index e0061dce78c086c03551e726493f3fe3b94993da..4aba050bf66d1354d42d06d27085b0eaa85674ad 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-26  Matt Rice  <ratmice@gmail.com>
+
+       * archive.c (_bfd_compute_and_write_armap): Allow symbols flagged
+       as unique in the armap.
+
 2010-03-26  Alan Modra  <amodra@gmail.com>
 
        PR ld/11375
@@ -369,7 +374,7 @@
        elfcore_write_s390_prefix): New.
        (elfcore_grok_note): Handle NT_S390_TIMER, NT_S390_TODCMP,
        NT_S390_TODPREG, NT_S390_CTRS and NT_S390_PREFIX.
-       (elfcore_write_register_note): Handle .reg-s390-timer, 
+       (elfcore_write_register_note): Handle .reg-s390-timer,
        .reg-s390-todcmp, .reg-s390-todpreg, .reg-s390-ctrs,
        .reg-s390-prefix section.
 
@@ -765,10 +770,10 @@
 2010-01-19  Daisuke Hatayama  <d.hatayama@jp.fujitsu.com>
            Alan Modra <amodra@gmail.com>
 
-        * elfcode.h (elf_swap_ehdr_out): Handle e_phnum > 0xffff.
+       * elfcode.h (elf_swap_ehdr_out): Handle e_phnum > 0xffff.
        (elf_object_p): Read e_phnum extension.
        (elf_write_shdrs_and_ehdr): Write e_phnum extension.
-        * elfcore.h (elf_core_file_p): Read e_phnum extension.  Sanity check
+       * elfcore.h (elf_core_file_p): Read e_phnum extension.  Sanity check
        that we can read last program header.
 
 2010-01-19  Matthew Gretton-Dann  <matthew.gretton-dann@arm.com>

diff --git a/bfd/archive.c b/bfd/archive.c
index 6fad826d9346bdc285bac646b579abe095628c6d..15eea03629b78b78391c9d137745a4fb0bb856bf 100644 (file)
--- a/bfd/archive.c
+++ b/bfd/archive.c
@@ -2196,6 +2196,7 @@ _bfd_compute_and_write_armap (bfd *arch, unsigned int elength)
                  if ((flags & BSF_GLOBAL
                       || flags & BSF_WEAK
                       || flags & BSF_INDIRECT
+                      || flags & BSF_GNU_UNIQUE
                       || bfd_is_com_section (sec))
                      && ! bfd_is_und_section (sec))
                    {