binutils-2.21.1.

30 files changed, 59 insertions, 29 deletions

diff --git a/contrib/crossrpms/rtems4.11/arm-eabi/Makefile.am b/contrib/crossrpms/rtems4.11/arm-eabi/Makefile.am
index 8660958745..a5e2b5fa74 100644
--- a/contrib/crossrpms/rtems4.11/arm-eabi/Makefile.am
+++ b/contrib/crossrpms/rtems4.11/arm-eabi/Makefile.am
@@ -5,7 +5,7 @@ TARGET = arm-rtemseabi4.11
 
 include $(top_srcdir)/mkspec.am
 
-BINUTILS_VERS = 2.21
+BINUTILS_VERS = 2.21.1
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
 BINUTILS_RPMREL = 1
 include ../binutils.am
diff --git a/contrib/crossrpms/rtems4.11/arm-eabi/binutils-sources.add b/contrib/crossrpms/rtems4.11/arm-eabi/binutils-sources.add
index 6b94627799..59a4e09a91 100644
--- a/contrib/crossrpms/rtems4.11/arm-eabi/binutils-sources.add
+++ b/contrib/crossrpms/rtems4.11/arm-eabi/binutils-sources.add
@@ -1,2 +1,4 @@
 Source0: ftp://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
+%if "%{binutils_version}" == "2.21"
 Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/binutils-2.21-rtems4.11-20110107.diff
+%endif
diff --git a/contrib/crossrpms/rtems4.11/arm/Makefile.am b/contrib/crossrpms/rtems4.11/arm/Makefile.am
index f913d63e37..660caed5ee 100644
--- a/contrib/crossrpms/rtems4.11/arm/Makefile.am
+++ b/contrib/crossrpms/rtems4.11/arm/Makefile.am
@@ -5,9 +5,9 @@ TARGET = arm-rtems4.11
 
 include $(top_srcdir)/mkspec.am
 
-BINUTILS_VERS = 2.21
+BINUTILS_VERS = 2.21.1
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 2
+BINUTILS_RPMREL = 1
 include ../binutils.am
 BINUTILS_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.11/arm/binutils-sources.add b/contrib/crossrpms/rtems4.11/arm/binutils-sources.add
index 6b94627799..59a4e09a91 100644
--- a/contrib/crossrpms/rtems4.11/arm/binutils-sources.add
+++ b/contrib/crossrpms/rtems4.11/arm/binutils-sources.add
@@ -1,2 +1,4 @@
 Source0: ftp://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
+%if "%{binutils_version}" == "2.21"
 Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/binutils-2.21-rtems4.11-20110107.diff
+%endif
diff --git a/contrib/crossrpms/rtems4.11/avr/Makefile.am b/contrib/crossrpms/rtems4.11/avr/Makefile.am
index 685f06f0f9..3b043be879 100644
--- a/contrib/crossrpms/rtems4.11/avr/Makefile.am
+++ b/contrib/crossrpms/rtems4.11/avr/Makefile.am
@@ -5,9 +5,9 @@ TARGET = avr-rtems4.11
 
 include $(top_srcdir)/mkspec.am
 
-BINUTILS_VERS = 2.21
+BINUTILS_VERS = 2.21.1
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 2
+BINUTILS_RPMREL = 1
 include ../binutils.am
 BINUTILS_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.11/avr/binutils-sources.add b/contrib/crossrpms/rtems4.11/avr/binutils-sources.add
index 6b94627799..59a4e09a91 100644
--- a/contrib/crossrpms/rtems4.11/avr/binutils-sources.add
+++ b/contrib/crossrpms/rtems4.11/avr/binutils-sources.add
@@ -1,2 +1,4 @@
 Source0: ftp://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
+%if "%{binutils_version}" == "2.21"
 Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/binutils-2.21-rtems4.11-20110107.diff
+%endif
diff --git a/contrib/crossrpms/rtems4.11/bfin/Makefile.am b/contrib/crossrpms/rtems4.11/bfin/Makefile.am
index ee81ed681c..befa4f38a3 100644
--- a/contrib/crossrpms/rtems4.11/bfin/Makefile.am
+++ b/contrib/crossrpms/rtems4.11/bfin/Makefile.am
@@ -5,9 +5,9 @@ TARGET = bfin-rtems4.11
 
 include $(top_srcdir)/mkspec.am
 
-BINUTILS_VERS = 2.21
+BINUTILS_VERS = 2.21.1
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 2
+BINUTILS_RPMREL = 1
 include ../binutils.am
 BINUTILS_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.11/bfin/binutils-sources.add b/contrib/crossrpms/rtems4.11/bfin/binutils-sources.add
index 6b94627799..59a4e09a91 100644
--- a/contrib/crossrpms/rtems4.11/bfin/binutils-sources.add
+++ b/contrib/crossrpms/rtems4.11/bfin/binutils-sources.add
@@ -1,2 +1,4 @@
 Source0: ftp://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
+%if "%{binutils_version}" == "2.21"
 Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/binutils-2.21-rtems4.11-20110107.diff
+%endif
diff --git a/contrib/crossrpms/rtems4.11/h8300/Makefile.am b/contrib/crossrpms/rtems4.11/h8300/Makefile.am
index 194307341a..cc73a37ca2 100644
--- a/contrib/crossrpms/rtems4.11/h8300/Makefile.am
+++ b/contrib/crossrpms/rtems4.11/h8300/Makefile.am
@@ -5,9 +5,9 @@ TARGET = h8300-rtems4.11
 
 include $(top_srcdir)/mkspec.am
 
-BINUTILS_VERS = 2.21
+BINUTILS_VERS = 2.21.1
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 2
+BINUTILS_RPMREL = 1
 include ../binutils.am
 BINUTILS_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.11/h8300/binutils-sources.add b/contrib/crossrpms/rtems4.11/h8300/binutils-sources.add
index 6b94627799..59a4e09a91 100644
--- a/contrib/crossrpms/rtems4.11/h8300/binutils-sources.add
+++ b/contrib/crossrpms/rtems4.11/h8300/binutils-sources.add
@@ -1,2 +1,4 @@
 Source0: ftp://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
+%if "%{binutils_version}" == "2.21"
 Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/binutils-2.21-rtems4.11-20110107.diff
+%endif
diff --git a/contrib/crossrpms/rtems4.11/i386/Makefile.am b/contrib/crossrpms/rtems4.11/i386/Makefile.am
index b0cc9e44cd..1a0abcb74f 100644
--- a/contrib/crossrpms/rtems4.11/i386/Makefile.am
+++ b/contrib/crossrpms/rtems4.11/i386/Makefile.am
@@ -5,9 +5,9 @@ TARGET = i386-rtems4.11
 
 include $(top_srcdir)/mkspec.am
 
-BINUTILS_VERS = 2.21
+BINUTILS_VERS = 2.21.1
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 2
+BINUTILS_RPMREL = 1
 include ../binutils.am
 BINUTILS_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.11/i386/binutils-sources.add b/contrib/crossrpms/rtems4.11/i386/binutils-sources.add
index 6b94627799..59a4e09a91 100644
--- a/contrib/crossrpms/rtems4.11/i386/binutils-sources.add
+++ b/contrib/crossrpms/rtems4.11/i386/binutils-sources.add
@@ -1,2 +1,4 @@
 Source0: ftp://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
+%if "%{binutils_version}" == "2.21"
 Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/binutils-2.21-rtems4.11-20110107.diff
+%endif
diff --git a/contrib/crossrpms/rtems4.11/lm32/Makefile.am b/contrib/crossrpms/rtems4.11/lm32/Makefile.am
index 9d7e8026a0..d32fd7507d 100644
--- a/contrib/crossrpms/rtems4.11/lm32/Makefile.am
+++ b/contrib/crossrpms/rtems4.11/lm32/Makefile.am
@@ -5,9 +5,9 @@ TARGET = lm32-rtems4.11
 
 include $(top_srcdir)/mkspec.am
 
-BINUTILS_VERS = 2.21
+BINUTILS_VERS = 2.21.1
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 2
+BINUTILS_RPMREL = 1
 include ../binutils.am
 BINUTILS_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.11/lm32/binutils-sources.add b/contrib/crossrpms/rtems4.11/lm32/binutils-sources.add
index 6b94627799..59a4e09a91 100644
--- a/contrib/crossrpms/rtems4.11/lm32/binutils-sources.add
+++ b/contrib/crossrpms/rtems4.11/lm32/binutils-sources.add
@@ -1,2 +1,4 @@
 Source0: ftp://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
+%if "%{binutils_version}" == "2.21"
 Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/binutils-2.21-rtems4.11-20110107.diff
+%endif
diff --git a/contrib/crossrpms/rtems4.11/m32c/Makefile.am b/contrib/crossrpms/rtems4.11/m32c/Makefile.am
index 180c7ef346..21824410e2 100644
--- a/contrib/crossrpms/rtems4.11/m32c/Makefile.am
+++ b/contrib/crossrpms/rtems4.11/m32c/Makefile.am
@@ -5,9 +5,9 @@ TARGET = m32c-rtems4.11
 
 include $(top_srcdir)/mkspec.am
 
-BINUTILS_VERS = 2.21
+BINUTILS_VERS = 2.21.1
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 2
+BINUTILS_RPMREL = 1
 include ../binutils.am
 BINUTILS_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.11/m32c/binutils-sources.add b/contrib/crossrpms/rtems4.11/m32c/binutils-sources.add
index 6b94627799..59a4e09a91 100644
--- a/contrib/crossrpms/rtems4.11/m32c/binutils-sources.add
+++ b/contrib/crossrpms/rtems4.11/m32c/binutils-sources.add
@@ -1,2 +1,4 @@
 Source0: ftp://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
+%if "%{binutils_version}" == "2.21"
 Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/binutils-2.21-rtems4.11-20110107.diff
+%endif
diff --git a/contrib/crossrpms/rtems4.11/m32r/Makefile.am b/contrib/crossrpms/rtems4.11/m32r/Makefile.am
index 734ace7078..ac36d21f77 100644
--- a/contrib/crossrpms/rtems4.11/m32r/Makefile.am
+++ b/contrib/crossrpms/rtems4.11/m32r/Makefile.am
@@ -5,9 +5,9 @@ TARGET = m32r-rtems4.11
 
 include $(top_srcdir)/mkspec.am
 
-BINUTILS_VERS = 2.21
+BINUTILS_VERS = 2.21.1
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 2
+BINUTILS_RPMREL = 1
 include ../binutils.am
 BINUTILS_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.11/m32r/binutils-sources.add b/contrib/crossrpms/rtems4.11/m32r/binutils-sources.add
index 6b94627799..59a4e09a91 100644
--- a/contrib/crossrpms/rtems4.11/m32r/binutils-sources.add
+++ b/contrib/crossrpms/rtems4.11/m32r/binutils-sources.add
@@ -1,2 +1,4 @@
 Source0: ftp://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
+%if "%{binutils_version}" == "2.21"
 Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/binutils-2.21-rtems4.11-20110107.diff
+%endif
diff --git a/contrib/crossrpms/rtems4.11/m68k/Makefile.am b/contrib/crossrpms/rtems4.11/m68k/Makefile.am
index dae720b228..bfb5799811 100644
--- a/contrib/crossrpms/rtems4.11/m68k/Makefile.am
+++ b/contrib/crossrpms/rtems4.11/m68k/Makefile.am
@@ -5,9 +5,9 @@ TARGET = m68k-rtems4.11
 
 include $(top_srcdir)/mkspec.am
 
-BINUTILS_VERS = 2.21
+BINUTILS_VERS = 2.21.1
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 2
+BINUTILS_RPMREL = 1
 include ../binutils.am
 BINUTILS_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.11/m68k/binutils-sources.add b/contrib/crossrpms/rtems4.11/m68k/binutils-sources.add
index 6b94627799..59a4e09a91 100644
--- a/contrib/crossrpms/rtems4.11/m68k/binutils-sources.add
+++ b/contrib/crossrpms/rtems4.11/m68k/binutils-sources.add
@@ -1,2 +1,4 @@
 Source0: ftp://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
+%if "%{binutils_version}" == "2.21"
 Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/binutils-2.21-rtems4.11-20110107.diff
+%endif
diff --git a/contrib/crossrpms/rtems4.11/mips/Makefile.am b/contrib/crossrpms/rtems4.11/mips/Makefile.am
index 8bad8e0e0a..4eb89108ac 100644
--- a/contrib/crossrpms/rtems4.11/mips/Makefile.am
+++ b/contrib/crossrpms/rtems4.11/mips/Makefile.am
@@ -5,9 +5,9 @@ TARGET = mips-rtems4.11
 
 include $(top_srcdir)/mkspec.am
 
-BINUTILS_VERS = 2.21
+BINUTILS_VERS = 2.21.1
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 2
+BINUTILS_RPMREL = 1
 include ../binutils.am
 BINUTILS_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.11/mips/binutils-sources.add b/contrib/crossrpms/rtems4.11/mips/binutils-sources.add
index 6b94627799..59a4e09a91 100644
--- a/contrib/crossrpms/rtems4.11/mips/binutils-sources.add
+++ b/contrib/crossrpms/rtems4.11/mips/binutils-sources.add
@@ -1,2 +1,4 @@
 Source0: ftp://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
+%if "%{binutils_version}" == "2.21"
 Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/binutils-2.21-rtems4.11-20110107.diff
+%endif
diff --git a/contrib/crossrpms/rtems4.11/powerpc/Makefile.am b/contrib/crossrpms/rtems4.11/powerpc/Makefile.am
index 0cc5104fe1..21a7039608 100644
--- a/contrib/crossrpms/rtems4.11/powerpc/Makefile.am
+++ b/contrib/crossrpms/rtems4.11/powerpc/Makefile.am
@@ -5,9 +5,9 @@ TARGET = powerpc-rtems4.11
 
 include $(top_srcdir)/mkspec.am
 
-BINUTILS_VERS = 2.21
+BINUTILS_VERS = 2.21.1
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 2
+BINUTILS_RPMREL = 1
 include ../binutils.am
 BINUTILS_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.11/powerpc/binutils-sources.add b/contrib/crossrpms/rtems4.11/powerpc/binutils-sources.add
index 6b94627799..59a4e09a91 100644
--- a/contrib/crossrpms/rtems4.11/powerpc/binutils-sources.add
+++ b/contrib/crossrpms/rtems4.11/powerpc/binutils-sources.add
@@ -1,2 +1,4 @@
 Source0: ftp://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
+%if "%{binutils_version}" == "2.21"
 Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/binutils-2.21-rtems4.11-20110107.diff
+%endif
diff --git a/contrib/crossrpms/rtems4.11/sh/Makefile.am b/contrib/crossrpms/rtems4.11/sh/Makefile.am
index 8be5c1aeb4..3f9049ec76 100644
--- a/contrib/crossrpms/rtems4.11/sh/Makefile.am
+++ b/contrib/crossrpms/rtems4.11/sh/Makefile.am
@@ -5,9 +5,9 @@ TARGET = sh-rtems4.11
 
 include $(top_srcdir)/mkspec.am
 
-BINUTILS_VERS = 2.21
+BINUTILS_VERS = 2.21.1
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 2
+BINUTILS_RPMREL = 1
 include ../binutils.am
 BINUTILS_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.11/sh/binutils-sources.add b/contrib/crossrpms/rtems4.11/sh/binutils-sources.add
index 6b94627799..59a4e09a91 100644
--- a/contrib/crossrpms/rtems4.11/sh/binutils-sources.add
+++ b/contrib/crossrpms/rtems4.11/sh/binutils-sources.add
@@ -1,2 +1,4 @@
 Source0: ftp://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
+%if "%{binutils_version}" == "2.21"
 Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/binutils-2.21-rtems4.11-20110107.diff
+%endif
diff --git a/contrib/crossrpms/rtems4.11/sparc/Makefile.am b/contrib/crossrpms/rtems4.11/sparc/Makefile.am
index 1fdcd01883..dcc05d1dac 100644
--- a/contrib/crossrpms/rtems4.11/sparc/Makefile.am
+++ b/contrib/crossrpms/rtems4.11/sparc/Makefile.am
@@ -5,9 +5,9 @@ TARGET = sparc-rtems4.11
 
 include $(top_srcdir)/mkspec.am
 
-BINUTILS_VERS = 2.21
+BINUTILS_VERS = 2.21.1
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 2
+BINUTILS_RPMREL = 1
 include ../binutils.am
 BINUTILS_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.11/sparc/binutils-sources.add b/contrib/crossrpms/rtems4.11/sparc/binutils-sources.add
index 6b94627799..59a4e09a91 100644
--- a/contrib/crossrpms/rtems4.11/sparc/binutils-sources.add
+++ b/contrib/crossrpms/rtems4.11/sparc/binutils-sources.add
@@ -1,2 +1,4 @@
 Source0: ftp://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
+%if "%{binutils_version}" == "2.21"
 Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/binutils-2.21-rtems4.11-20110107.diff
+%endif
diff --git a/contrib/crossrpms/rtems4.11/sparc64/Makefile.am b/contrib/crossrpms/rtems4.11/sparc64/Makefile.am
index ded32231ea..c8523917be 100644
--- a/contrib/crossrpms/rtems4.11/sparc64/Makefile.am
+++ b/contrib/crossrpms/rtems4.11/sparc64/Makefile.am
@@ -5,9 +5,9 @@ TARGET = sparc64-rtems4.11
 
 include $(top_srcdir)/mkspec.am
 
-BINUTILS_VERS = 2.21
+BINUTILS_VERS = 2.21.1
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 2
+BINUTILS_RPMREL = 1
 include ../binutils.am
 BINUTILS_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.11/sparc64/binutils-sources.add b/contrib/crossrpms/rtems4.11/sparc64/binutils-sources.add
index 6b94627799..59a4e09a91 100644
--- a/contrib/crossrpms/rtems4.11/sparc64/binutils-sources.add
+++ b/contrib/crossrpms/rtems4.11/sparc64/binutils-sources.add
@@ -1,2 +1,4 @@
 Source0: ftp://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
+%if "%{binutils_version}" == "2.21"
 Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/binutils-2.21-rtems4.11-20110107.diff
+%endif