2f50d1
diff -rcp ../binutils-2.20.51.0.2-orignal/bfd/archive.c ./bfd/archive.c
2f50d1
*** ../binutils-2.20.51.0.2-orignal/bfd/archive.c	2010-05-04 16:59:09.000000000 +0100
2f50d1
--- ./bfd/archive.c	2010-05-04 17:00:33.000000000 +0100
2f50d1
*************** _bfd_compute_and_write_armap (bfd *arch,
2f50d1
*** 2145,2150 ****
2f50d1
--- 2145,2151 ----
2f50d1
  		  if ((flags & BSF_GLOBAL
2f50d1
  		       || flags & BSF_WEAK
2f50d1
  		       || flags & BSF_INDIRECT
2f50d1
+ 		       || flags & BSF_GNU_UNIQUE
2f50d1
  		       || bfd_is_com_section (sec))
2f50d1
  		      && ! bfd_is_und_section (sec))
2f50d1
  		    {
2f50d1
diff -rcp ../binutils-2.20.51.0.2-orignal/bfd/ChangeLog ./bfd/ChangeLog
2f50d1
*** ../binutils-2.20.51.0.2-orignal/bfd/ChangeLog	2010-05-04 16:59:09.000000000 +0100
2f50d1
--- ./bfd/ChangeLog	2010-05-04 17:09:38.000000000 +0100
2f50d1
***************
2f50d1
*** 1,3 ****
2f50d1
--- 1,12 ----
2f50d1
+ 2010-05-04  Nick Clifton  <nickc@redhat.com>
2f50d1
+ 
2f50d1
+ 	Import this patch:
2f50d1
+ 
2f50d1
+ 	010-03-18  Matt Rice  <ratmice@gmail.com>
2f50d1
+ 
2f50d1
+         * archive.c (_bfd_compute_and_write_armap): Allow symbols flagged
2f50d1
+         as unique in the armap.
2f50d1
+ 
2f50d1
  2010-04-08  Nick Clifton  <nickc@redhat.com>
2f50d1
  
2f50d1
  	Import these patches from the mainline: