Allow unique symbols in archive maps.

This commit is contained in:
Nicholas Clifton 2010-05-04 20:10:34 +00:00
parent f7c14791f0
commit b429324655
3 changed files with 38 additions and 1 deletions

View File

@ -1,2 +1,3 @@
binutils-2.20.51.0.7.tar.bz2
binutils-2.20.51.0.7
i386

View File

@ -0,0 +1,31 @@
diff -rcp ../binutils-2.20.51.0.7-original/bfd/archive.c ./bfd/archive.c
*** ../binutils-2.20.51.0.7-original/bfd/archive.c 2010-05-04 19:08:20.000000000 +0100
--- ./bfd/archive.c 2010-05-04 19:09:40.000000000 +0100
*************** _bfd_compute_and_write_armap (bfd *arch,
*** 2196,2201 ****
--- 2196,2202 ----
if ((flags & BSF_GLOBAL
|| flags & BSF_WEAK
|| flags & BSF_INDIRECT
+ || flags & BSF_GNU_UNIQUE
|| bfd_is_com_section (sec))
&& ! bfd_is_und_section (sec))
{
diff -rcp ../binutils-2.20.51.0.7-original/bfd/ChangeLog ./bfd/ChangeLog
*** ../binutils-2.20.51.0.7-original/bfd/ChangeLog 2010-05-04 19:08:20.000000000 +0100
--- ./bfd/ChangeLog 2010-05-04 19:11:04.000000000 +0100
***************
*** 1,3 ****
--- 1,12 ----
+ 2010-05-04 Nick Clifton <nickc@redhat.com>
+
+ Import this patch:
+
+ 2010-03-18 Matt Rice <ratmice@gmail.com>
+
+ * archive.c (_bfd_compute_and_write_armap): Allow symbols flagged
+ as unique in the armap.
+
2010-04-08 Nick Clifton <nickc@redhat.com>
Import these patches from the mainline:

View File

@ -17,7 +17,7 @@
Summary: A GNU collection of binary utilities
Name: %{?cross}binutils%{?_with_debug:-debug}
Version: 2.20.51.0.7
Release: 2%{?dist}
Release: 3%{?dist}
License: GPLv3+
Group: Development/Tools
URL: http://sources.redhat.com/binutils
@ -33,6 +33,7 @@ Patch07: binutils-2.20.51.0.2-build-id.patch
Patch08: binutils-2.20.51.0.2-copy-osabi.patch
Patch09: binutils-2.20.51.0.7-do-not-bind-unique-symbols-locally.patch
Patch10: binutils-2.20.51.0.7-dwarf4.patch
Patch11: binutils-2.20.51.0.7-unique-archive-symbols.patch
%define gold_arches %ix86 x86_64
@ -126,6 +127,7 @@ using libelf instead of BFD.
%patch08 -p0 -b .copy-osabi~
%patch09 -p0 -b .do-not-bind-unique~
%patch10 -p0 -b .dwarf4~
%patch11 -p0 -b .unique~
# We cannot run autotools as there is an exact requirement of autoconf-2.59.
@ -408,6 +410,9 @@ exit 0
%endif # %{isnative}
%changelog
* Tue May 4 2010 Nick Clifton <nickc@redhat.com> - 2.20.51.0.7-3
- Allow unique symbols in archive maps.
* Tue Apr 20 2010 Nick Clifton <nickc@redhat.com> - 2.20.51.0.7-2
- Merge binutils-devel package into binutils-static package. (BZ 576300)