Remove cygwin hacks.

26 files changed, 26 insertions, 78 deletions

diff --git a/contrib/crossrpms/rtems4.10/arm/Makefile.am b/contrib/crossrpms/rtems4.10/arm/Makefile.am
index 4b01cc97f0..1688ba4e37 100644
--- a/contrib/crossrpms/rtems4.10/arm/Makefile.am
+++ b/contrib/crossrpms/rtems4.10/arm/Makefile.am
@@ -6,7 +6,7 @@ include $(top_srcdir)/mkspec.am
 
 BINUTILS_VERS = 2.20
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 1
+BINUTILS_RPMREL = 2
 include ../binutils.am
 BINUTILS_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.10/arm/rtems-4.10-arm-rtems4.10-binutils.spec b/contrib/crossrpms/rtems4.10/arm/rtems-4.10-arm-rtems4.10-binutils.spec
index cd62e40994..b065af214e 100644
--- a/contrib/crossrpms/rtems4.10/arm/rtems-4.10-arm-rtems4.10-binutils.spec
+++ b/contrib/crossrpms/rtems4.10/arm/rtems-4.10-arm-rtems4.10-binutils.spec
@@ -53,7 +53,7 @@ Name:		rtems-4.10-arm-rtems4.10-binutils
 Summary:	Binutils for target arm-rtems4.10
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -88,10 +88,6 @@ cd ..
 
 %build
   export PATH="%{_bindir}:${PATH}"
-%if "arm-rtems4.10" == "i686-pc-cygwin"
-# The cygwin sources are leaking memory
-  RPM_OPT_FLAGS="$(echo "$RPM_OPT_FLAGS"|sed -e 's; -Wp,-D_FORTIFY_SOURCE=2;;')"
-%endif
   mkdir -p build
   cd build
 %if "%{_build}" != "%{_host}"
diff --git a/contrib/crossrpms/rtems4.10/avr/Makefile.am b/contrib/crossrpms/rtems4.10/avr/Makefile.am
index 2575fce462..57c051458e 100644
--- a/contrib/crossrpms/rtems4.10/avr/Makefile.am
+++ b/contrib/crossrpms/rtems4.10/avr/Makefile.am
@@ -6,7 +6,7 @@ include $(top_srcdir)/mkspec.am
 
 BINUTILS_VERS = 2.20
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 1
+BINUTILS_RPMREL = 2
 include ../binutils.am
 BINUTILS_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.10/avr/rtems-4.10-avr-rtems4.10-binutils.spec b/contrib/crossrpms/rtems4.10/avr/rtems-4.10-avr-rtems4.10-binutils.spec
index d938c8155e..06fb192f25 100644
--- a/contrib/crossrpms/rtems4.10/avr/rtems-4.10-avr-rtems4.10-binutils.spec
+++ b/contrib/crossrpms/rtems4.10/avr/rtems-4.10-avr-rtems4.10-binutils.spec
@@ -53,7 +53,7 @@ Name:		rtems-4.10-avr-rtems4.10-binutils
 Summary:	Binutils for target avr-rtems4.10
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -88,10 +88,6 @@ cd ..
 
 %build
   export PATH="%{_bindir}:${PATH}"
-%if "avr-rtems4.10" == "i686-pc-cygwin"
-# The cygwin sources are leaking memory
-  RPM_OPT_FLAGS="$(echo "$RPM_OPT_FLAGS"|sed -e 's; -Wp,-D_FORTIFY_SOURCE=2;;')"
-%endif
   mkdir -p build
   cd build
 %if "%{_build}" != "%{_host}"
diff --git a/contrib/crossrpms/rtems4.10/bfin/Makefile.am b/contrib/crossrpms/rtems4.10/bfin/Makefile.am
index 10cca077c9..ac4e7d216c 100644
--- a/contrib/crossrpms/rtems4.10/bfin/Makefile.am
+++ b/contrib/crossrpms/rtems4.10/bfin/Makefile.am
@@ -6,7 +6,7 @@ include $(top_srcdir)/mkspec.am
 
 BINUTILS_VERS = 2.20
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 1
+BINUTILS_RPMREL = 2
 include ../binutils.am
 BINUTILS_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-binutils.spec b/contrib/crossrpms/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-binutils.spec
index c945d375b8..f58e85d251 100644
--- a/contrib/crossrpms/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-binutils.spec
+++ b/contrib/crossrpms/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-binutils.spec
@@ -53,7 +53,7 @@ Name:		rtems-4.10-bfin-rtems4.10-binutils
 Summary:	Binutils for target bfin-rtems4.10
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -88,10 +88,6 @@ cd ..
 
 %build
   export PATH="%{_bindir}:${PATH}"
-%if "bfin-rtems4.10" == "i686-pc-cygwin"
-# The cygwin sources are leaking memory
-  RPM_OPT_FLAGS="$(echo "$RPM_OPT_FLAGS"|sed -e 's; -Wp,-D_FORTIFY_SOURCE=2;;')"
-%endif
   mkdir -p build
   cd build
 %if "%{_build}" != "%{_host}"
diff --git a/contrib/crossrpms/rtems4.10/h8300/Makefile.am b/contrib/crossrpms/rtems4.10/h8300/Makefile.am
index 04cf1498fe..a6a6bf7b4b 100644
--- a/contrib/crossrpms/rtems4.10/h8300/Makefile.am
+++ b/contrib/crossrpms/rtems4.10/h8300/Makefile.am
@@ -6,7 +6,7 @@ include $(top_srcdir)/mkspec.am
 
 BINUTILS_VERS = 2.20
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 1
+BINUTILS_RPMREL = 2
 include ../binutils.am
 BINUTILS_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-binutils.spec b/contrib/crossrpms/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-binutils.spec
index 763e3e1608..7a6237c0ad 100644
--- a/contrib/crossrpms/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-binutils.spec
+++ b/contrib/crossrpms/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-binutils.spec
@@ -53,7 +53,7 @@ Name:		rtems-4.10-h8300-rtems4.10-binutils
 Summary:	Binutils for target h8300-rtems4.10
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -88,10 +88,6 @@ cd ..
 
 %build
   export PATH="%{_bindir}:${PATH}"
-%if "h8300-rtems4.10" == "i686-pc-cygwin"
-# The cygwin sources are leaking memory
-  RPM_OPT_FLAGS="$(echo "$RPM_OPT_FLAGS"|sed -e 's; -Wp,-D_FORTIFY_SOURCE=2;;')"
-%endif
   mkdir -p build
   cd build
 %if "%{_build}" != "%{_host}"
diff --git a/contrib/crossrpms/rtems4.10/i386/Makefile.am b/contrib/crossrpms/rtems4.10/i386/Makefile.am
index 1e3496c304..2489f189d6 100644
--- a/contrib/crossrpms/rtems4.10/i386/Makefile.am
+++ b/contrib/crossrpms/rtems4.10/i386/Makefile.am
@@ -6,7 +6,7 @@ include $(top_srcdir)/mkspec.am
 
 BINUTILS_VERS = 2.20
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 1
+BINUTILS_RPMREL = 2
 include ../binutils.am
 BINUTILS_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.10/i386/rtems-4.10-i386-rtems4.10-binutils.spec b/contrib/crossrpms/rtems4.10/i386/rtems-4.10-i386-rtems4.10-binutils.spec
index 2db8b1447b..b02365002b 100644
--- a/contrib/crossrpms/rtems4.10/i386/rtems-4.10-i386-rtems4.10-binutils.spec
+++ b/contrib/crossrpms/rtems4.10/i386/rtems-4.10-i386-rtems4.10-binutils.spec
@@ -53,7 +53,7 @@ Name:		rtems-4.10-i386-rtems4.10-binutils
 Summary:	Binutils for target i386-rtems4.10
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -88,10 +88,6 @@ cd ..
 
 %build
   export PATH="%{_bindir}:${PATH}"
-%if "i386-rtems4.10" == "i686-pc-cygwin"
-# The cygwin sources are leaking memory
-  RPM_OPT_FLAGS="$(echo "$RPM_OPT_FLAGS"|sed -e 's; -Wp,-D_FORTIFY_SOURCE=2;;')"
-%endif
   mkdir -p build
   cd build
 %if "%{_build}" != "%{_host}"
diff --git a/contrib/crossrpms/rtems4.10/lm32/Makefile.am b/contrib/crossrpms/rtems4.10/lm32/Makefile.am
index efaa9acdc6..a16d00e753 100644
--- a/contrib/crossrpms/rtems4.10/lm32/Makefile.am
+++ b/contrib/crossrpms/rtems4.10/lm32/Makefile.am
@@ -6,7 +6,7 @@ include $(top_srcdir)/mkspec.am
 
 BINUTILS_VERS = 2.20
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 1
+BINUTILS_RPMREL = 2
 include ../binutils.am
 BINUTILS_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.10/lm32/rtems-4.10-lm32-rtems4.10-binutils.spec b/contrib/crossrpms/rtems4.10/lm32/rtems-4.10-lm32-rtems4.10-binutils.spec
index 449ecb7699..bed1a4f4cc 100644
--- a/contrib/crossrpms/rtems4.10/lm32/rtems-4.10-lm32-rtems4.10-binutils.spec
+++ b/contrib/crossrpms/rtems4.10/lm32/rtems-4.10-lm32-rtems4.10-binutils.spec
@@ -53,7 +53,7 @@ Name:		rtems-4.10-lm32-rtems4.10-binutils
 Summary:	Binutils for target lm32-rtems4.10
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -88,10 +88,6 @@ cd ..
 
 %build
   export PATH="%{_bindir}:${PATH}"
-%if "lm32-rtems4.10" == "i686-pc-cygwin"
-# The cygwin sources are leaking memory
-  RPM_OPT_FLAGS="$(echo "$RPM_OPT_FLAGS"|sed -e 's; -Wp,-D_FORTIFY_SOURCE=2;;')"
-%endif
   mkdir -p build
   cd build
 %if "%{_build}" != "%{_host}"
diff --git a/contrib/crossrpms/rtems4.10/m32c/Makefile.am b/contrib/crossrpms/rtems4.10/m32c/Makefile.am
index 2baec09189..f7f5e4ef66 100644
--- a/contrib/crossrpms/rtems4.10/m32c/Makefile.am
+++ b/contrib/crossrpms/rtems4.10/m32c/Makefile.am
@@ -6,7 +6,7 @@ include $(top_srcdir)/mkspec.am
 
 BINUTILS_VERS = 2.20
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 1
+BINUTILS_RPMREL = 2
 include ../binutils.am
 BINUTILS_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-binutils.spec b/contrib/crossrpms/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-binutils.spec
index 6ec4f9e8ff..3e841a7367 100644
--- a/contrib/crossrpms/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-binutils.spec
+++ b/contrib/crossrpms/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-binutils.spec
@@ -53,7 +53,7 @@ Name:		rtems-4.10-m32c-rtems4.10-binutils
 Summary:	Binutils for target m32c-rtems4.10
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -88,10 +88,6 @@ cd ..
 
 %build
   export PATH="%{_bindir}:${PATH}"
-%if "m32c-rtems4.10" == "i686-pc-cygwin"
-# The cygwin sources are leaking memory
-  RPM_OPT_FLAGS="$(echo "$RPM_OPT_FLAGS"|sed -e 's; -Wp,-D_FORTIFY_SOURCE=2;;')"
-%endif
   mkdir -p build
   cd build
 %if "%{_build}" != "%{_host}"
diff --git a/contrib/crossrpms/rtems4.10/m32r/Makefile.am b/contrib/crossrpms/rtems4.10/m32r/Makefile.am
index 4d1e98d6fa..346272a114 100644
--- a/contrib/crossrpms/rtems4.10/m32r/Makefile.am
+++ b/contrib/crossrpms/rtems4.10/m32r/Makefile.am
@@ -6,7 +6,7 @@ include $(top_srcdir)/mkspec.am
 
 BINUTILS_VERS = 2.20
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 1
+BINUTILS_RPMREL = 2
 include ../binutils.am
 BINUTILS_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-binutils.spec b/contrib/crossrpms/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-binutils.spec
index dedde6ec8e..30fc4e318b 100644
--- a/contrib/crossrpms/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-binutils.spec
+++ b/contrib/crossrpms/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-binutils.spec
@@ -53,7 +53,7 @@ Name:		rtems-4.10-m32r-rtems4.10-binutils
 Summary:	Binutils for target m32r-rtems4.10
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -88,10 +88,6 @@ cd ..
 
 %build
   export PATH="%{_bindir}:${PATH}"
-%if "m32r-rtems4.10" == "i686-pc-cygwin"
-# The cygwin sources are leaking memory
-  RPM_OPT_FLAGS="$(echo "$RPM_OPT_FLAGS"|sed -e 's; -Wp,-D_FORTIFY_SOURCE=2;;')"
-%endif
   mkdir -p build
   cd build
 %if "%{_build}" != "%{_host}"
diff --git a/contrib/crossrpms/rtems4.10/m68k/Makefile.am b/contrib/crossrpms/rtems4.10/m68k/Makefile.am
index e812b29c6a..71ba643491 100644
--- a/contrib/crossrpms/rtems4.10/m68k/Makefile.am
+++ b/contrib/crossrpms/rtems4.10/m68k/Makefile.am
@@ -6,7 +6,7 @@ include $(top_srcdir)/mkspec.am
 
 BINUTILS_VERS = 2.20
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 1
+BINUTILS_RPMREL = 2
 include ../binutils.am
 BINUTILS_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-binutils.spec b/contrib/crossrpms/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-binutils.spec
index bac3bee414..70653a3cb1 100644
--- a/contrib/crossrpms/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-binutils.spec
+++ b/contrib/crossrpms/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-binutils.spec
@@ -53,7 +53,7 @@ Name:		rtems-4.10-m68k-rtems4.10-binutils
 Summary:	Binutils for target m68k-rtems4.10
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -88,10 +88,6 @@ cd ..
 
 %build
   export PATH="%{_bindir}:${PATH}"
-%if "m68k-rtems4.10" == "i686-pc-cygwin"
-# The cygwin sources are leaking memory
-  RPM_OPT_FLAGS="$(echo "$RPM_OPT_FLAGS"|sed -e 's; -Wp,-D_FORTIFY_SOURCE=2;;')"
-%endif
   mkdir -p build
   cd build
 %if "%{_build}" != "%{_host}"
diff --git a/contrib/crossrpms/rtems4.10/mips/Makefile.am b/contrib/crossrpms/rtems4.10/mips/Makefile.am
index cce3d343ec..2c3262f096 100644
--- a/contrib/crossrpms/rtems4.10/mips/Makefile.am
+++ b/contrib/crossrpms/rtems4.10/mips/Makefile.am
@@ -6,7 +6,7 @@ include $(top_srcdir)/mkspec.am
 
 BINUTILS_VERS = 2.20
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 1
+BINUTILS_RPMREL = 2
 include ../binutils.am
 BINUTILS_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.10/mips/rtems-4.10-mips-rtems4.10-binutils.spec b/contrib/crossrpms/rtems4.10/mips/rtems-4.10-mips-rtems4.10-binutils.spec
index fe004567e3..55b2fda11f 100644
--- a/contrib/crossrpms/rtems4.10/mips/rtems-4.10-mips-rtems4.10-binutils.spec
+++ b/contrib/crossrpms/rtems4.10/mips/rtems-4.10-mips-rtems4.10-binutils.spec
@@ -53,7 +53,7 @@ Name:		rtems-4.10-mips-rtems4.10-binutils
 Summary:	Binutils for target mips-rtems4.10
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -88,10 +88,6 @@ cd ..
 
 %build
   export PATH="%{_bindir}:${PATH}"
-%if "mips-rtems4.10" == "i686-pc-cygwin"
-# The cygwin sources are leaking memory
-  RPM_OPT_FLAGS="$(echo "$RPM_OPT_FLAGS"|sed -e 's; -Wp,-D_FORTIFY_SOURCE=2;;')"
-%endif
   mkdir -p build
   cd build
 %if "%{_build}" != "%{_host}"
diff --git a/contrib/crossrpms/rtems4.10/powerpc/Makefile.am b/contrib/crossrpms/rtems4.10/powerpc/Makefile.am
index 1161193c3b..7006fafda2 100644
--- a/contrib/crossrpms/rtems4.10/powerpc/Makefile.am
+++ b/contrib/crossrpms/rtems4.10/powerpc/Makefile.am
@@ -6,7 +6,7 @@ include $(top_srcdir)/mkspec.am
 
 BINUTILS_VERS = 2.20
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 1
+BINUTILS_RPMREL = 2
 include ../binutils.am
 BINUTILS_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-binutils.spec b/contrib/crossrpms/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-binutils.spec
index f3d33cb5e1..7909836adc 100644
--- a/contrib/crossrpms/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-binutils.spec
+++ b/contrib/crossrpms/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-binutils.spec
@@ -53,7 +53,7 @@ Name:		rtems-4.10-powerpc-rtems4.10-binutils
 Summary:	Binutils for target powerpc-rtems4.10
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -88,10 +88,6 @@ cd ..
 
 %build
   export PATH="%{_bindir}:${PATH}"
-%if "powerpc-rtems4.10" == "i686-pc-cygwin"
-# The cygwin sources are leaking memory
-  RPM_OPT_FLAGS="$(echo "$RPM_OPT_FLAGS"|sed -e 's; -Wp,-D_FORTIFY_SOURCE=2;;')"
-%endif
   mkdir -p build
   cd build
 %if "%{_build}" != "%{_host}"
diff --git a/contrib/crossrpms/rtems4.10/sh/Makefile.am b/contrib/crossrpms/rtems4.10/sh/Makefile.am
index efab393e98..415cbe07f4 100644
--- a/contrib/crossrpms/rtems4.10/sh/Makefile.am
+++ b/contrib/crossrpms/rtems4.10/sh/Makefile.am
@@ -6,7 +6,7 @@ include $(top_srcdir)/mkspec.am
 
 BINUTILS_VERS = 2.20
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 1
+BINUTILS_RPMREL = 2
 include ../binutils.am
 BINUTILS_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.10/sh/rtems-4.10-sh-rtems4.10-binutils.spec b/contrib/crossrpms/rtems4.10/sh/rtems-4.10-sh-rtems4.10-binutils.spec
index 43900bdccc..a5cf06170a 100644
--- a/contrib/crossrpms/rtems4.10/sh/rtems-4.10-sh-rtems4.10-binutils.spec
+++ b/contrib/crossrpms/rtems4.10/sh/rtems-4.10-sh-rtems4.10-binutils.spec
@@ -53,7 +53,7 @@ Name:		rtems-4.10-sh-rtems4.10-binutils
 Summary:	Binutils for target sh-rtems4.10
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -88,10 +88,6 @@ cd ..
 
 %build
   export PATH="%{_bindir}:${PATH}"
-%if "sh-rtems4.10" == "i686-pc-cygwin"
-# The cygwin sources are leaking memory
-  RPM_OPT_FLAGS="$(echo "$RPM_OPT_FLAGS"|sed -e 's; -Wp,-D_FORTIFY_SOURCE=2;;')"
-%endif
   mkdir -p build
   cd build
 %if "%{_build}" != "%{_host}"
diff --git a/contrib/crossrpms/rtems4.10/sparc/Makefile.am b/contrib/crossrpms/rtems4.10/sparc/Makefile.am
index 4a8e1a3e9c..edfb615de5 100644
--- a/contrib/crossrpms/rtems4.10/sparc/Makefile.am
+++ b/contrib/crossrpms/rtems4.10/sparc/Makefile.am
@@ -6,7 +6,7 @@ include $(top_srcdir)/mkspec.am
 
 BINUTILS_VERS = 2.20
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 1
+BINUTILS_RPMREL = 2
 include ../binutils.am
 BINUTILS_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-binutils.spec b/contrib/crossrpms/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-binutils.spec
index e3e0d4f189..c9ef3b01c0 100644
--- a/contrib/crossrpms/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-binutils.spec
+++ b/contrib/crossrpms/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-binutils.spec
@@ -53,7 +53,7 @@ Name:		rtems-4.10-sparc-rtems4.10-binutils
 Summary:	Binutils for target sparc-rtems4.10
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -88,10 +88,6 @@ cd ..
 
 %build
   export PATH="%{_bindir}:${PATH}"
-%if "sparc-rtems4.10" == "i686-pc-cygwin"
-# The cygwin sources are leaking memory
-  RPM_OPT_FLAGS="$(echo "$RPM_OPT_FLAGS"|sed -e 's; -Wp,-D_FORTIFY_SOURCE=2;;')"
-%endif
   mkdir -p build
   cd build
 %if "%{_build}" != "%{_host}"