Preps for gcc-4.6.1.

28 files changed, 170 insertions, 66 deletions

diff --git a/contrib/crossrpms/rtems4.11/arm-eabi/Makefile.am b/contrib/crossrpms/rtems4.11/arm-eabi/Makefile.am
index c50ee7dd81..8660958745 100644
--- a/contrib/crossrpms/rtems4.11/arm-eabi/Makefile.am
+++ b/contrib/crossrpms/rtems4.11/arm-eabi/Makefile.am
@@ -11,13 +11,12 @@ BINUTILS_RPMREL = 1
 include ../binutils.am
 BINUTILS_OPTS +=
 
-GCC_VERS = 4.6.0
-GCC_PKGVERS = $(GCC_VERS)
+GCC_VERS = 4.6.1
+GCC_PKGVERS = $(GCC_VERS)-RC-20110620
 GCC_RPMREL = 1
-
 NEWLIB_VERS = 1.19.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
-NEWLIB_RPMREL = $(GCC_RPMREL)
+NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 10`
 include ../gcc.am
 GCC_OPTS += --languages=cxx
 
diff --git a/contrib/crossrpms/rtems4.11/arm-eabi/gcc-sources.add b/contrib/crossrpms/rtems4.11/arm-eabi/gcc-sources.add
index 3ddc53ffdf..b52a34f661 100644
--- a/contrib/crossrpms/rtems4.11/arm-eabi/gcc-sources.add
+++ b/contrib/crossrpms/rtems4.11/arm-eabi/gcc-sources.add
@@ -1,3 +1,7 @@
+%if "%{gcc_version}" == "4.6.1"
+Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
+Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.1-rtems4.11-20110621.diff
+%endif
 %if "%{gcc_version}" == "4.6.0"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.0-rtems4.11-20110522.diff
@@ -12,6 +16,9 @@ Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.2-rtems4
 %endif
 
 %if %build_cxx
+%if "%{gcc_version}" == "4.6.1"
+Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
+%endif
 %if "%{gcc_version}" == "4.6.0"
 Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
 %endif
diff --git a/contrib/crossrpms/rtems4.11/arm/Makefile.am b/contrib/crossrpms/rtems4.11/arm/Makefile.am
index 2adb14c1ef..f913d63e37 100644
--- a/contrib/crossrpms/rtems4.11/arm/Makefile.am
+++ b/contrib/crossrpms/rtems4.11/arm/Makefile.am
@@ -11,13 +11,13 @@ BINUTILS_RPMREL = 2
 include ../binutils.am
 BINUTILS_OPTS +=
 
-GCC_VERS = 4.6.0
-GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 4
+GCC_VERS = 4.6.1
+GCC_PKGVERS = $(GCC_VERS)-RC-20110620
+GCC_RPMREL = 1
 
 NEWLIB_VERS = 1.19.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
-NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 6`
+NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 10`
 include ../gcc.am
 GCC_OPTS += --languages=cxx
 
diff --git a/contrib/crossrpms/rtems4.11/arm/gcc-sources.add b/contrib/crossrpms/rtems4.11/arm/gcc-sources.add
index cdb0d72997..b52a34f661 100644
--- a/contrib/crossrpms/rtems4.11/arm/gcc-sources.add
+++ b/contrib/crossrpms/rtems4.11/arm/gcc-sources.add
@@ -1,6 +1,10 @@
+%if "%{gcc_version}" == "4.6.1"
+Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
+Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.1-rtems4.11-20110621.diff
+%endif
 %if "%{gcc_version}" == "4.6.0"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.0-rtems4.11-20110325.diff
+Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.0-rtems4.11-20110522.diff
 %endif
 %if "%{gcc_version}" == "4.5.3"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
@@ -12,6 +16,9 @@ Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.2-rtems4
 %endif
 
 %if %build_cxx
+%if "%{gcc_version}" == "4.6.1"
+Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
+%endif
 %if "%{gcc_version}" == "4.6.0"
 Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
 %endif
diff --git a/contrib/crossrpms/rtems4.11/avr/Makefile.am b/contrib/crossrpms/rtems4.11/avr/Makefile.am
index 4913051c48..685f06f0f9 100644
--- a/contrib/crossrpms/rtems4.11/avr/Makefile.am
+++ b/contrib/crossrpms/rtems4.11/avr/Makefile.am
@@ -11,12 +11,12 @@ BINUTILS_RPMREL = 2
 include ../binutils.am
 BINUTILS_OPTS +=
 
-GCC_VERS = 4.6.0
-GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 4
+GCC_VERS = 4.6.1
+GCC_PKGVERS = $(GCC_VERS)-RC-20110620
+GCC_RPMREL = 1
 NEWLIB_VERS = 1.19.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
-NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 6`
+NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 10`
 include ../gcc.am
 GCC_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.11/avr/gcc-sources.add b/contrib/crossrpms/rtems4.11/avr/gcc-sources.add
index cdb0d72997..b52a34f661 100644
--- a/contrib/crossrpms/rtems4.11/avr/gcc-sources.add
+++ b/contrib/crossrpms/rtems4.11/avr/gcc-sources.add
@@ -1,6 +1,10 @@
+%if "%{gcc_version}" == "4.6.1"
+Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
+Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.1-rtems4.11-20110621.diff
+%endif
 %if "%{gcc_version}" == "4.6.0"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.0-rtems4.11-20110325.diff
+Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.0-rtems4.11-20110522.diff
 %endif
 %if "%{gcc_version}" == "4.5.3"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
@@ -12,6 +16,9 @@ Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.2-rtems4
 %endif
 
 %if %build_cxx
+%if "%{gcc_version}" == "4.6.1"
+Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
+%endif
 %if "%{gcc_version}" == "4.6.0"
 Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
 %endif
diff --git a/contrib/crossrpms/rtems4.11/bfin/Makefile.am b/contrib/crossrpms/rtems4.11/bfin/Makefile.am
index b941734f58..ee81ed681c 100644
--- a/contrib/crossrpms/rtems4.11/bfin/Makefile.am
+++ b/contrib/crossrpms/rtems4.11/bfin/Makefile.am
@@ -11,12 +11,12 @@ BINUTILS_RPMREL = 2
 include ../binutils.am
 BINUTILS_OPTS +=
 
-GCC_VERS = 4.6.0
-GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 4
+GCC_VERS = 4.6.1
+GCC_PKGVERS = $(GCC_VERS)-RC-20110620
+GCC_RPMREL = 1
 NEWLIB_VERS = 1.19.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
-NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 6`
+NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 10`
 include ../gcc.am
 GCC_OPTS += --languages=cxx
 
diff --git a/contrib/crossrpms/rtems4.11/bfin/gcc-sources.add b/contrib/crossrpms/rtems4.11/bfin/gcc-sources.add
index cdb0d72997..b52a34f661 100644
--- a/contrib/crossrpms/rtems4.11/bfin/gcc-sources.add
+++ b/contrib/crossrpms/rtems4.11/bfin/gcc-sources.add
@@ -1,6 +1,10 @@
+%if "%{gcc_version}" == "4.6.1"
+Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
+Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.1-rtems4.11-20110621.diff
+%endif
 %if "%{gcc_version}" == "4.6.0"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.0-rtems4.11-20110325.diff
+Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.0-rtems4.11-20110522.diff
 %endif
 %if "%{gcc_version}" == "4.5.3"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
@@ -12,6 +16,9 @@ Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.2-rtems4
 %endif
 
 %if %build_cxx
+%if "%{gcc_version}" == "4.6.1"
+Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
+%endif
 %if "%{gcc_version}" == "4.6.0"
 Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
 %endif
diff --git a/contrib/crossrpms/rtems4.11/h8300/gcc-sources.add b/contrib/crossrpms/rtems4.11/h8300/gcc-sources.add
index cdb0d72997..b52a34f661 100644
--- a/contrib/crossrpms/rtems4.11/h8300/gcc-sources.add
+++ b/contrib/crossrpms/rtems4.11/h8300/gcc-sources.add
@@ -1,6 +1,10 @@
+%if "%{gcc_version}" == "4.6.1"
+Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
+Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.1-rtems4.11-20110621.diff
+%endif
 %if "%{gcc_version}" == "4.6.0"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.0-rtems4.11-20110325.diff
+Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.0-rtems4.11-20110522.diff
 %endif
 %if "%{gcc_version}" == "4.5.3"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
@@ -12,6 +16,9 @@ Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.2-rtems4
 %endif
 
 %if %build_cxx
+%if "%{gcc_version}" == "4.6.1"
+Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
+%endif
 %if "%{gcc_version}" == "4.6.0"
 Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
 %endif
diff --git a/contrib/crossrpms/rtems4.11/i386/Makefile.am b/contrib/crossrpms/rtems4.11/i386/Makefile.am
index 5674e09933..b0cc9e44cd 100644
--- a/contrib/crossrpms/rtems4.11/i386/Makefile.am
+++ b/contrib/crossrpms/rtems4.11/i386/Makefile.am
@@ -11,12 +11,12 @@ BINUTILS_RPMREL = 2
 include ../binutils.am
 BINUTILS_OPTS +=
 
-GCC_VERS = 4.6.0
-GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 4
+GCC_VERS = 4.6.1
+GCC_PKGVERS = $(GCC_VERS)-RC-20110620
+GCC_RPMREL = 1
 NEWLIB_VERS = 1.19.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
-NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 6`
+NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 10`
 include ../gcc.am
 GCC_OPTS += --languages=cxx
 
diff --git a/contrib/crossrpms/rtems4.11/i386/gcc-sources.add b/contrib/crossrpms/rtems4.11/i386/gcc-sources.add
index cdb0d72997..b52a34f661 100644
--- a/contrib/crossrpms/rtems4.11/i386/gcc-sources.add
+++ b/contrib/crossrpms/rtems4.11/i386/gcc-sources.add
@@ -1,6 +1,10 @@
+%if "%{gcc_version}" == "4.6.1"
+Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
+Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.1-rtems4.11-20110621.diff
+%endif
 %if "%{gcc_version}" == "4.6.0"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.0-rtems4.11-20110325.diff
+Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.0-rtems4.11-20110522.diff
 %endif
 %if "%{gcc_version}" == "4.5.3"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
@@ -12,6 +16,9 @@ Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.2-rtems4
 %endif
 
 %if %build_cxx
+%if "%{gcc_version}" == "4.6.1"
+Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
+%endif
 %if "%{gcc_version}" == "4.6.0"
 Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
 %endif
diff --git a/contrib/crossrpms/rtems4.11/lm32/gcc-sources.add b/contrib/crossrpms/rtems4.11/lm32/gcc-sources.add
index cdb0d72997..b52a34f661 100644
--- a/contrib/crossrpms/rtems4.11/lm32/gcc-sources.add
+++ b/contrib/crossrpms/rtems4.11/lm32/gcc-sources.add
@@ -1,6 +1,10 @@
+%if "%{gcc_version}" == "4.6.1"
+Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
+Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.1-rtems4.11-20110621.diff
+%endif
 %if "%{gcc_version}" == "4.6.0"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.0-rtems4.11-20110325.diff
+Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.0-rtems4.11-20110522.diff
 %endif
 %if "%{gcc_version}" == "4.5.3"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
@@ -12,6 +16,9 @@ Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.2-rtems4
 %endif
 
 %if %build_cxx
+%if "%{gcc_version}" == "4.6.1"
+Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
+%endif
 %if "%{gcc_version}" == "4.6.0"
 Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
 %endif
diff --git a/contrib/crossrpms/rtems4.11/m32c/Makefile.am b/contrib/crossrpms/rtems4.11/m32c/Makefile.am
index 797a3ff869..180c7ef346 100644
--- a/contrib/crossrpms/rtems4.11/m32c/Makefile.am
+++ b/contrib/crossrpms/rtems4.11/m32c/Makefile.am
@@ -11,12 +11,12 @@ BINUTILS_RPMREL = 2
 include ../binutils.am
 BINUTILS_OPTS +=
 
-GCC_VERS = 4.6.0
-GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 4
+GCC_VERS = 4.6.1
+GCC_PKGVERS = $(GCC_VERS)-RC-20110620
+GCC_RPMREL = 1
 NEWLIB_VERS = 1.19.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
-NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 6`
+NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 10`
 include ../gcc.am
 GCC_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.11/m32c/gcc-sources.add b/contrib/crossrpms/rtems4.11/m32c/gcc-sources.add
index cdb0d72997..b52a34f661 100644
--- a/contrib/crossrpms/rtems4.11/m32c/gcc-sources.add
+++ b/contrib/crossrpms/rtems4.11/m32c/gcc-sources.add
@@ -1,6 +1,10 @@
+%if "%{gcc_version}" == "4.6.1"
+Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
+Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.1-rtems4.11-20110621.diff
+%endif
 %if "%{gcc_version}" == "4.6.0"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.0-rtems4.11-20110325.diff
+Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.0-rtems4.11-20110522.diff
 %endif
 %if "%{gcc_version}" == "4.5.3"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
@@ -12,6 +16,9 @@ Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.2-rtems4
 %endif
 
 %if %build_cxx
+%if "%{gcc_version}" == "4.6.1"
+Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
+%endif
 %if "%{gcc_version}" == "4.6.0"
 Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
 %endif
diff --git a/contrib/crossrpms/rtems4.11/m32r/Makefile.am b/contrib/crossrpms/rtems4.11/m32r/Makefile.am
index f960128b9d..734ace7078 100644
--- a/contrib/crossrpms/rtems4.11/m32r/Makefile.am
+++ b/contrib/crossrpms/rtems4.11/m32r/Makefile.am
@@ -11,12 +11,12 @@ BINUTILS_RPMREL = 2
 include ../binutils.am
 BINUTILS_OPTS +=
 
-GCC_VERS = 4.6.0
-GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 4
+GCC_VERS = 4.6.1
+GCC_PKGVERS = $(GCC_VERS)-RC-20110620
+GCC_RPMREL = 1
 NEWLIB_VERS = 1.19.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
-NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 6`
+NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 10`
 include ../gcc.am
 GCC_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.11/m32r/gcc-sources.add b/contrib/crossrpms/rtems4.11/m32r/gcc-sources.add
index cdb0d72997..b52a34f661 100644
--- a/contrib/crossrpms/rtems4.11/m32r/gcc-sources.add
+++ b/contrib/crossrpms/rtems4.11/m32r/gcc-sources.add
@@ -1,6 +1,10 @@
+%if "%{gcc_version}" == "4.6.1"
+Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
+Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.1-rtems4.11-20110621.diff
+%endif
 %if "%{gcc_version}" == "4.6.0"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.0-rtems4.11-20110325.diff
+Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.0-rtems4.11-20110522.diff
 %endif
 %if "%{gcc_version}" == "4.5.3"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
@@ -12,6 +16,9 @@ Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.2-rtems4
 %endif
 
 %if %build_cxx
+%if "%{gcc_version}" == "4.6.1"
+Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
+%endif
 %if "%{gcc_version}" == "4.6.0"
 Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
 %endif
diff --git a/contrib/crossrpms/rtems4.11/m68k/Makefile.am b/contrib/crossrpms/rtems4.11/m68k/Makefile.am
index a79261202d..dae720b228 100644
--- a/contrib/crossrpms/rtems4.11/m68k/Makefile.am
+++ b/contrib/crossrpms/rtems4.11/m68k/Makefile.am
@@ -11,12 +11,12 @@ BINUTILS_RPMREL = 2
 include ../binutils.am
 BINUTILS_OPTS +=
 
-GCC_VERS = 4.6.0
-GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 4
+GCC_VERS = 4.6.1
+GCC_PKGVERS = $(GCC_VERS)-RC-20110620
+GCC_RPMREL = 1
 NEWLIB_VERS = 1.19.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
-NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 6`
+NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 10`
 include ../gcc.am
 GCC_OPTS += --languages=cxx
 
diff --git a/contrib/crossrpms/rtems4.11/m68k/gcc-sources.add b/contrib/crossrpms/rtems4.11/m68k/gcc-sources.add
index cdb0d72997..b52a34f661 100644
--- a/contrib/crossrpms/rtems4.11/m68k/gcc-sources.add
+++ b/contrib/crossrpms/rtems4.11/m68k/gcc-sources.add
@@ -1,6 +1,10 @@
+%if "%{gcc_version}" == "4.6.1"
+Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
+Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.1-rtems4.11-20110621.diff
+%endif
 %if "%{gcc_version}" == "4.6.0"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.0-rtems4.11-20110325.diff
+Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.0-rtems4.11-20110522.diff
 %endif
 %if "%{gcc_version}" == "4.5.3"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
@@ -12,6 +16,9 @@ Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.2-rtems4
 %endif
 
 %if %build_cxx
+%if "%{gcc_version}" == "4.6.1"
+Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
+%endif
 %if "%{gcc_version}" == "4.6.0"
 Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
 %endif
diff --git a/contrib/crossrpms/rtems4.11/mips/Makefile.am b/contrib/crossrpms/rtems4.11/mips/Makefile.am
index 1bdaa18f4b..8bad8e0e0a 100644
--- a/contrib/crossrpms/rtems4.11/mips/Makefile.am
+++ b/contrib/crossrpms/rtems4.11/mips/Makefile.am
@@ -11,12 +11,12 @@ BINUTILS_RPMREL = 2
 include ../binutils.am
 BINUTILS_OPTS +=
 
-GCC_VERS = 4.6.0
-GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 4
+GCC_VERS = 4.6.1
+GCC_PKGVERS = $(GCC_VERS)-RC-20110620
+GCC_RPMREL = 1
 NEWLIB_VERS = 1.19.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
-NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 6`
+NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 10`
 include ../gcc.am
 GCC_OPTS += --languages=cxx
 
diff --git a/contrib/crossrpms/rtems4.11/mips/gcc-sources.add b/contrib/crossrpms/rtems4.11/mips/gcc-sources.add
index cdb0d72997..b52a34f661 100644
--- a/contrib/crossrpms/rtems4.11/mips/gcc-sources.add
+++ b/contrib/crossrpms/rtems4.11/mips/gcc-sources.add
@@ -1,6 +1,10 @@
+%if "%{gcc_version}" == "4.6.1"
+Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
+Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.1-rtems4.11-20110621.diff
+%endif
 %if "%{gcc_version}" == "4.6.0"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.0-rtems4.11-20110325.diff
+Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.0-rtems4.11-20110522.diff
 %endif
 %if "%{gcc_version}" == "4.5.3"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
@@ -12,6 +16,9 @@ Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.2-rtems4
 %endif
 
 %if %build_cxx
+%if "%{gcc_version}" == "4.6.1"
+Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
+%endif
 %if "%{gcc_version}" == "4.6.0"
 Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
 %endif
diff --git a/contrib/crossrpms/rtems4.11/powerpc/Makefile.am b/contrib/crossrpms/rtems4.11/powerpc/Makefile.am
index aa8abc1420..0cc5104fe1 100644
--- a/contrib/crossrpms/rtems4.11/powerpc/Makefile.am
+++ b/contrib/crossrpms/rtems4.11/powerpc/Makefile.am
@@ -11,12 +11,12 @@ BINUTILS_RPMREL = 2
 include ../binutils.am
 BINUTILS_OPTS +=
 
-GCC_VERS = 4.6.0
-GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 4
+GCC_VERS = 4.6.1
+GCC_PKGVERS = $(GCC_VERS)-RC-20110620
+GCC_RPMREL = 1
 NEWLIB_VERS = 1.19.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
-NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 6`
+NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 10`
 include ../gcc.am
 GCC_OPTS += --languages=cxx
 
diff --git a/contrib/crossrpms/rtems4.11/powerpc/gcc-sources.add b/contrib/crossrpms/rtems4.11/powerpc/gcc-sources.add
index cdb0d72997..b52a34f661 100644
--- a/contrib/crossrpms/rtems4.11/powerpc/gcc-sources.add
+++ b/contrib/crossrpms/rtems4.11/powerpc/gcc-sources.add
@@ -1,6 +1,10 @@
+%if "%{gcc_version}" == "4.6.1"
+Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
+Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.1-rtems4.11-20110621.diff
+%endif
 %if "%{gcc_version}" == "4.6.0"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.0-rtems4.11-20110325.diff
+Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.0-rtems4.11-20110522.diff
 %endif
 %if "%{gcc_version}" == "4.5.3"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
@@ -12,6 +16,9 @@ Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.2-rtems4
 %endif
 
 %if %build_cxx
+%if "%{gcc_version}" == "4.6.1"
+Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
+%endif
 %if "%{gcc_version}" == "4.6.0"
 Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
 %endif
diff --git a/contrib/crossrpms/rtems4.11/sh/Makefile.am b/contrib/crossrpms/rtems4.11/sh/Makefile.am
index 58716826db..8be5c1aeb4 100644
--- a/contrib/crossrpms/rtems4.11/sh/Makefile.am
+++ b/contrib/crossrpms/rtems4.11/sh/Makefile.am
@@ -11,12 +11,12 @@ BINUTILS_RPMREL = 2
 include ../binutils.am
 BINUTILS_OPTS +=
 
-GCC_VERS = 4.6.0
-GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 4
+GCC_VERS = 4.6.1
+GCC_PKGVERS = $(GCC_VERS)-RC-20110620
+GCC_RPMREL = 1
 NEWLIB_VERS = 1.19.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
-NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 6`
+NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 10`
 include ../gcc.am
 GCC_OPTS += --languages=cxx
 
diff --git a/contrib/crossrpms/rtems4.11/sh/gcc-sources.add b/contrib/crossrpms/rtems4.11/sh/gcc-sources.add
index cdb0d72997..b52a34f661 100644
--- a/contrib/crossrpms/rtems4.11/sh/gcc-sources.add
+++ b/contrib/crossrpms/rtems4.11/sh/gcc-sources.add
@@ -1,6 +1,10 @@
+%if "%{gcc_version}" == "4.6.1"
+Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
+Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.1-rtems4.11-20110621.diff
+%endif
 %if "%{gcc_version}" == "4.6.0"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.0-rtems4.11-20110325.diff
+Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.0-rtems4.11-20110522.diff
 %endif
 %if "%{gcc_version}" == "4.5.3"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
@@ -12,6 +16,9 @@ Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.2-rtems4
 %endif
 
 %if %build_cxx
+%if "%{gcc_version}" == "4.6.1"
+Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
+%endif
 %if "%{gcc_version}" == "4.6.0"
 Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
 %endif
diff --git a/contrib/crossrpms/rtems4.11/sparc/Makefile.am b/contrib/crossrpms/rtems4.11/sparc/Makefile.am
index 70ed49be58..1fdcd01883 100644
--- a/contrib/crossrpms/rtems4.11/sparc/Makefile.am
+++ b/contrib/crossrpms/rtems4.11/sparc/Makefile.am
@@ -11,12 +11,12 @@ BINUTILS_RPMREL = 2
 include ../binutils.am
 BINUTILS_OPTS +=
 
-GCC_VERS = 4.6.0
-GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 4
+GCC_VERS = 4.6.1
+GCC_PKGVERS = $(GCC_VERS)-RC-20110620
+GCC_RPMREL = 1
 NEWLIB_VERS = 1.19.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
-NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 6`
+NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 10`
 include ../gcc.am
 GCC_OPTS += --languages=cxx
 
diff --git a/contrib/crossrpms/rtems4.11/sparc/gcc-sources.add b/contrib/crossrpms/rtems4.11/sparc/gcc-sources.add
index cdb0d72997..b52a34f661 100644
--- a/contrib/crossrpms/rtems4.11/sparc/gcc-sources.add
+++ b/contrib/crossrpms/rtems4.11/sparc/gcc-sources.add
@@ -1,6 +1,10 @@
+%if "%{gcc_version}" == "4.6.1"
+Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
+Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.1-rtems4.11-20110621.diff
+%endif
 %if "%{gcc_version}" == "4.6.0"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.0-rtems4.11-20110325.diff
+Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.0-rtems4.11-20110522.diff
 %endif
 %if "%{gcc_version}" == "4.5.3"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
@@ -12,6 +16,9 @@ Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.2-rtems4
 %endif
 
 %if %build_cxx
+%if "%{gcc_version}" == "4.6.1"
+Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
+%endif
 %if "%{gcc_version}" == "4.6.0"
 Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
 %endif
diff --git a/contrib/crossrpms/rtems4.11/sparc64/Makefile.am b/contrib/crossrpms/rtems4.11/sparc64/Makefile.am
index f619de8a5c..ded32231ea 100644
--- a/contrib/crossrpms/rtems4.11/sparc64/Makefile.am
+++ b/contrib/crossrpms/rtems4.11/sparc64/Makefile.am
@@ -11,12 +11,12 @@ BINUTILS_RPMREL = 2
 include ../binutils.am
 BINUTILS_OPTS +=
 
-GCC_VERS = 4.6.0
-GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 4
+GCC_VERS = 4.6.1
+GCC_PKGVERS = $(GCC_VERS)-RC-20110620
+GCC_RPMREL = 1
 NEWLIB_VERS = 1.19.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
-NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 6`
+NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 10`
 include ../gcc.am
 GCC_OPTS += --languages=cxx
 
diff --git a/contrib/crossrpms/rtems4.11/sparc64/gcc-sources.add b/contrib/crossrpms/rtems4.11/sparc64/gcc-sources.add
index cdb0d72997..b52a34f661 100644
--- a/contrib/crossrpms/rtems4.11/sparc64/gcc-sources.add
+++ b/contrib/crossrpms/rtems4.11/sparc64/gcc-sources.add
@@ -1,6 +1,10 @@
+%if "%{gcc_version}" == "4.6.1"
+Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
+Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.1-rtems4.11-20110621.diff
+%endif
 %if "%{gcc_version}" == "4.6.0"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.0-rtems4.11-20110325.diff
+Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.0-rtems4.11-20110522.diff
 %endif
 %if "%{gcc_version}" == "4.5.3"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
@@ -12,6 +16,9 @@ Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.2-rtems4
 %endif
 
 %if %build_cxx
+%if "%{gcc_version}" == "4.6.1"
+Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
+%endif
 %if "%{gcc_version}" == "4.6.0"
 Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
 %endif