[binutils] - Rebase on 2.21.51.0.5 tarball. - Delete redundant patches. - Fix gold+ld configure command line op

[Nicholas Clifton]

commit 19db05c0fb7744fb3ad8b3cb778cde51eecf7eaa
Author: nick clifton <nickc at Gift.(none)>
Date:   Wed Jan 5 10:55:17 2011 +0000

    - Rebase on 2.21.51.0.5 tarball.
    - Delete redundant patches.
    - Fix gold+ld configure command line option.

 .gitignore                                         |    1 +
 binutils-2.20.51.0.10-ldlex-add-caret-pling.patch  |   19 -
 binutils-2.20.51.0.10-update-gold.patch            | 7999 --------------------
 binutils-2.20.51.0.11-compress-compile.patch       |   19 -
 binutils-2.20.51.0.2-build-id.patch                |   67 -
 binutils-2.20.51.0.2-envvar-revert.patch           |   91 -
 ...51.0.7-do-not-bind-unique-symbols-locally.patch |   41 -
 binutils-2.20.51.0.7-dwarf4.patch                  | 1326 ----
 binutils-2.20.51.0.7-gold-INPUT.patch              |   61 -
 binutils-2.20.51.0.7-unique-archive-symbols.patch  |   31 -
 binutils.spec                                      |   27 +-
 sources                                            |    2 +-
 12 files changed, 18 insertions(+), 9666 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 69698a6..dfac6c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ i386
 binutils-2.20.51.0.10.tar.bz2
 /binutils-2.20.51.0.11.tar.bz2
 /binutils-2.20.51.0.12.tar.bz2
+/binutils-2.21.51.0.5.tar.bz2
diff --git a/binutils.spec b/binutils.spec
index d8846c4..42586e0 100644
--- a/binutils.spec
+++ b/binutils.spec
@@ -16,8 +16,8 @@
 
 Summary: A GNU collection of binary utilities
 Name: %{?cross}binutils%{?_with_debug:-debug}
-Version: 2.20.51.0.12
-Release: 2%{?dist}
+Version: 2.21.51.0.5
+Release: 1%{?dist}
 License: GPLv3+
 Group: Development/Tools
 URL: http://sources.redhat.com/binutils
@@ -28,10 +28,8 @@ Patch02: binutils-2.20.51.0.10-ppc64-pie.patch
 Patch03: binutils-2.20.51.0.2-ia64-lib64.patch
 Patch04: binutils-2.20.51.0.2-version.patch
 Patch05: binutils-2.20.51.0.2-set-long-long.patch
-Patch06: binutils-2.20.51.0.2-build-id.patch
-Patch07: binutils-2.20.51.0.10-copy-osabi.patch
-Patch08: binutils-2.20.51.0.10-sec-merge-emit.patch
-Patch09: binutils-2.20.51.0.11-compress-compile.patch
+Patch06: binutils-2.20.51.0.10-copy-osabi.patch
+Patch07: binutils-2.20.51.0.10-sec-merge-emit.patch
 
 %define gold_arches %ix86 x86_64
 
@@ -127,10 +125,8 @@ using libelf instead of BFD.
 %endif
 %patch04 -p0 -b .version~
 %patch05 -p0 -b .set-long-long~
-%patch06 -p0 -b .build-id~
-%patch07 -p0 -b .copy-osabi~
-%patch08 -p0 -b .sec-merge-emit~
-%patch09 -p0 -b .compress~
+%patch06 -p0 -b .copy-osabi~
+%patch07 -p0 -b .sec-merge-emit~
 
 # We cannot run autotools as there is an exact requirement of autoconf-2.59.
 
@@ -186,7 +182,11 @@ CFLAGS="$CFLAGS -O0 -ggdb2"
   --build=%{_target_platform} --host=%{_target_platform} \
   --target=%{binutils_target} \
 %ifarch %gold_arches
-  --enable-gold=%{build_gold} \
+%if "%{build_gold}" == "both"
+  --enable-gold=default --enable-ld \
+%else
+  --enable-gold \
+%endif
 %endif
 %if !%{isnative}
   --enable-targets=%{_host} \
@@ -415,6 +415,11 @@ exit 0
 %endif # %{isnative}
 
 %changelog
+* Wed Jan   5 2011 Nick Clifton <nickc at redhat.com> - 2.21.51.0.5-1
+- Rebase on 2.21.51.0.5 tarball.
+- Delete redundant patches.
+- Fix gold+ld configure command line option.
+
 * Fri Nov   4 2010 Dan Horák <dan[at]danny.cz> - 2.20.51.0.12-2
 - "no" is not valid option for --enable-gold
 
diff --git a/sources b/sources
index eef472f..64ee61f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f3a1f0535935ddae61ded2bcd3c7ce09  binutils-2.20.51.0.12.tar.bz2
+85cdd97069c230b0a8771d50e309754f  binutils-2.21.51.0.5.tar.bz2