Preps for gcc-4.6.2.

28 files changed, 93 insertions, 84 deletions

diff --git a/contrib/crossrpms/rtems4.11/arm-eabi/Makefile.am b/contrib/crossrpms/rtems4.11/arm-eabi/Makefile.am
index 539dc85f10..557c1f605a 100644
--- a/contrib/crossrpms/rtems4.11/arm-eabi/Makefile.am
+++ b/contrib/crossrpms/rtems4.11/arm-eabi/Makefile.am
@@ -11,12 +11,12 @@ BINUTILS_RPMREL = 1
 include ../binutils.am
 BINUTILS_OPTS +=
 
-GCC_VERS = 4.6.1
+GCC_VERS = 4.6.2
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 9
+GCC_RPMREL = 1
 NEWLIB_VERS = 1.19.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
-NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 10`
+NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 19`
 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 c5a0e381bb..e8f85d6c29 100644
--- a/contrib/crossrpms/rtems4.11/arm-eabi/gcc-sources.add
+++ b/contrib/crossrpms/rtems4.11/arm-eabi/gcc-sources.add
@@ -1,6 +1,6 @@
-%if "%{gcc_version}" == "4.6.1"
+%if "%{gcc_version}" == "4.6.2"
 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-20110715.diff
+Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.2-rtems4.11-20111028.diff
 %endif
 %if "%{gcc_version}" == "4.5.3"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
@@ -8,7 +8,7 @@ Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.3-rtems4
 %endif
 
 %if %build_cxx
-%if "%{gcc_version}" == "4.6.1"
+%if "%{gcc_version}" == "4.6.2"
 Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
 %endif
 %if "%{gcc_version}" == "4.5.3" 
diff --git a/contrib/crossrpms/rtems4.11/arm/Makefile.am b/contrib/crossrpms/rtems4.11/arm/Makefile.am
index ddaa220b42..73dbb65b6a 100644
--- a/contrib/crossrpms/rtems4.11/arm/Makefile.am
+++ b/contrib/crossrpms/rtems4.11/arm/Makefile.am
@@ -11,13 +11,13 @@ BINUTILS_RPMREL = 1
 include ../binutils.am
 BINUTILS_OPTS +=
 
-GCC_VERS = 4.6.1
+GCC_VERS = 4.6.2
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 9
+GCC_RPMREL = 1
 
 NEWLIB_VERS = 1.19.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
-NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 10`
+NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 19`
 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 c5a0e381bb..e8f85d6c29 100644
--- a/contrib/crossrpms/rtems4.11/arm/gcc-sources.add
+++ b/contrib/crossrpms/rtems4.11/arm/gcc-sources.add
@@ -1,6 +1,6 @@
-%if "%{gcc_version}" == "4.6.1"
+%if "%{gcc_version}" == "4.6.2"
 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-20110715.diff
+Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.2-rtems4.11-20111028.diff
 %endif
 %if "%{gcc_version}" == "4.5.3"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
@@ -8,7 +8,7 @@ Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.3-rtems4
 %endif
 
 %if %build_cxx
-%if "%{gcc_version}" == "4.6.1"
+%if "%{gcc_version}" == "4.6.2"
 Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
 %endif
 %if "%{gcc_version}" == "4.5.3" 
diff --git a/contrib/crossrpms/rtems4.11/avr/Makefile.am b/contrib/crossrpms/rtems4.11/avr/Makefile.am
index 806bda1a14..bdad2c1ed5 100644
--- a/contrib/crossrpms/rtems4.11/avr/Makefile.am
+++ b/contrib/crossrpms/rtems4.11/avr/Makefile.am
@@ -11,12 +11,12 @@ BINUTILS_RPMREL = 1
 include ../binutils.am
 BINUTILS_OPTS +=
 
-GCC_VERS = 4.6.1
+GCC_VERS = 4.6.2
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 9
+GCC_RPMREL = 1
 NEWLIB_VERS = 1.19.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
-NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 10`
+NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 19`
 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 c5a0e381bb..e8f85d6c29 100644
--- a/contrib/crossrpms/rtems4.11/avr/gcc-sources.add
+++ b/contrib/crossrpms/rtems4.11/avr/gcc-sources.add
@@ -1,6 +1,6 @@
-%if "%{gcc_version}" == "4.6.1"
+%if "%{gcc_version}" == "4.6.2"
 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-20110715.diff
+Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.2-rtems4.11-20111028.diff
 %endif
 %if "%{gcc_version}" == "4.5.3"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
@@ -8,7 +8,7 @@ Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.3-rtems4
 %endif
 
 %if %build_cxx
-%if "%{gcc_version}" == "4.6.1"
+%if "%{gcc_version}" == "4.6.2"
 Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
 %endif
 %if "%{gcc_version}" == "4.5.3" 
diff --git a/contrib/crossrpms/rtems4.11/bfin/Makefile.am b/contrib/crossrpms/rtems4.11/bfin/Makefile.am
index 68210ead68..ee22c46bb9 100644
--- a/contrib/crossrpms/rtems4.11/bfin/Makefile.am
+++ b/contrib/crossrpms/rtems4.11/bfin/Makefile.am
@@ -11,12 +11,12 @@ BINUTILS_RPMREL = 1
 include ../binutils.am
 BINUTILS_OPTS +=
 
-GCC_VERS = 4.6.1
+GCC_VERS = 4.6.2
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 9
+GCC_RPMREL = 1
 NEWLIB_VERS = 1.19.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
-NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 10`
+NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 19`
 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 c5a0e381bb..e8f85d6c29 100644
--- a/contrib/crossrpms/rtems4.11/bfin/gcc-sources.add
+++ b/contrib/crossrpms/rtems4.11/bfin/gcc-sources.add
@@ -1,6 +1,6 @@
-%if "%{gcc_version}" == "4.6.1"
+%if "%{gcc_version}" == "4.6.2"
 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-20110715.diff
+Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.2-rtems4.11-20111028.diff
 %endif
 %if "%{gcc_version}" == "4.5.3"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
@@ -8,7 +8,7 @@ Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.3-rtems4
 %endif
 
 %if %build_cxx
-%if "%{gcc_version}" == "4.6.1"
+%if "%{gcc_version}" == "4.6.2"
 Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
 %endif
 %if "%{gcc_version}" == "4.5.3" 
diff --git a/contrib/crossrpms/rtems4.11/h8300/gcc-sources.add b/contrib/crossrpms/rtems4.11/h8300/gcc-sources.add
index c5a0e381bb..e8f85d6c29 100644
--- a/contrib/crossrpms/rtems4.11/h8300/gcc-sources.add
+++ b/contrib/crossrpms/rtems4.11/h8300/gcc-sources.add
@@ -1,6 +1,6 @@
-%if "%{gcc_version}" == "4.6.1"
+%if "%{gcc_version}" == "4.6.2"
 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-20110715.diff
+Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.2-rtems4.11-20111028.diff
 %endif
 %if "%{gcc_version}" == "4.5.3"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
@@ -8,7 +8,7 @@ Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.3-rtems4
 %endif
 
 %if %build_cxx
-%if "%{gcc_version}" == "4.6.1"
+%if "%{gcc_version}" == "4.6.2"
 Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
 %endif
 %if "%{gcc_version}" == "4.5.3" 
diff --git a/contrib/crossrpms/rtems4.11/i386/Makefile.am b/contrib/crossrpms/rtems4.11/i386/Makefile.am
index fb18338a93..c10b7369f2 100644
--- a/contrib/crossrpms/rtems4.11/i386/Makefile.am
+++ b/contrib/crossrpms/rtems4.11/i386/Makefile.am
@@ -11,12 +11,12 @@ BINUTILS_RPMREL = 1
 include ../binutils.am
 BINUTILS_OPTS +=
 
-GCC_VERS = 4.6.1
+GCC_VERS = 4.6.2
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 9
+GCC_RPMREL = 1
 NEWLIB_VERS = 1.19.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
-NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 10`
+NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 19`
 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 c5a0e381bb..5d2c9ad9e9 100644
--- a/contrib/crossrpms/rtems4.11/i386/gcc-sources.add
+++ b/contrib/crossrpms/rtems4.11/i386/gcc-sources.add
@@ -1,6 +1,6 @@
-%if "%{gcc_version}" == "4.6.1"
+%if "%{gcc_version}" == "4.6.2"
 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-20110715.diff
+Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.2-rtems4.11-20111028.diff
 %endif
 %if "%{gcc_version}" == "4.5.3"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
@@ -8,7 +8,7 @@ Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.3-rtems4
 %endif
 
 %if %build_cxx
-%if "%{gcc_version}" == "4.6.1"
+%if "%{gcc_version}" == "4.6.2"
 Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
 %endif
 %if "%{gcc_version}" == "4.5.3" 
@@ -33,6 +33,15 @@ Source4:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-ada-%{gcc_pkgvers}.tar
 Source5:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-objc-%{gcc_pkgvers}.tar.bz2
 
 %endif
+%if %build_go
+%if !%build_gcj
+Source3:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-java-%{gcc_pkgvers}.tar.bz2
+
+%endif
+Source6:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-go-%{gcc_pkgvers}.tar.bz2
+Patch6:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-go-4.6.0-rtems4.11-20110401.diff
+
+%endif
 %if %build_newlib
 %if "%{newlib_version}" == "1.19.0"
 Source50:	ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_pkgvers}.tar.gz
diff --git a/contrib/crossrpms/rtems4.11/lm32/gcc-sources.add b/contrib/crossrpms/rtems4.11/lm32/gcc-sources.add
index c5a0e381bb..e8f85d6c29 100644
--- a/contrib/crossrpms/rtems4.11/lm32/gcc-sources.add
+++ b/contrib/crossrpms/rtems4.11/lm32/gcc-sources.add
@@ -1,6 +1,6 @@
-%if "%{gcc_version}" == "4.6.1"
+%if "%{gcc_version}" == "4.6.2"
 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-20110715.diff
+Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.2-rtems4.11-20111028.diff
 %endif
 %if "%{gcc_version}" == "4.5.3"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
@@ -8,7 +8,7 @@ Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.3-rtems4
 %endif
 
 %if %build_cxx
-%if "%{gcc_version}" == "4.6.1"
+%if "%{gcc_version}" == "4.6.2"
 Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
 %endif
 %if "%{gcc_version}" == "4.5.3" 
diff --git a/contrib/crossrpms/rtems4.11/m32c/Makefile.am b/contrib/crossrpms/rtems4.11/m32c/Makefile.am
index d667c7a765..52a9452cd4 100644
--- a/contrib/crossrpms/rtems4.11/m32c/Makefile.am
+++ b/contrib/crossrpms/rtems4.11/m32c/Makefile.am
@@ -11,12 +11,12 @@ BINUTILS_RPMREL = 1
 include ../binutils.am
 BINUTILS_OPTS +=
 
-GCC_VERS = 4.6.1
+GCC_VERS = 4.6.2
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 9
+GCC_RPMREL = 1
 NEWLIB_VERS = 1.19.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
-NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 10`
+NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 19`
 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 c5a0e381bb..e8f85d6c29 100644
--- a/contrib/crossrpms/rtems4.11/m32c/gcc-sources.add
+++ b/contrib/crossrpms/rtems4.11/m32c/gcc-sources.add
@@ -1,6 +1,6 @@
-%if "%{gcc_version}" == "4.6.1"
+%if "%{gcc_version}" == "4.6.2"
 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-20110715.diff
+Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.2-rtems4.11-20111028.diff
 %endif
 %if "%{gcc_version}" == "4.5.3"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
@@ -8,7 +8,7 @@ Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.3-rtems4
 %endif
 
 %if %build_cxx
-%if "%{gcc_version}" == "4.6.1"
+%if "%{gcc_version}" == "4.6.2"
 Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
 %endif
 %if "%{gcc_version}" == "4.5.3" 
diff --git a/contrib/crossrpms/rtems4.11/m32r/Makefile.am b/contrib/crossrpms/rtems4.11/m32r/Makefile.am
index 14a66079ed..e8c0f68ffa 100644
--- a/contrib/crossrpms/rtems4.11/m32r/Makefile.am
+++ b/contrib/crossrpms/rtems4.11/m32r/Makefile.am
@@ -11,12 +11,12 @@ BINUTILS_RPMREL = 1
 include ../binutils.am
 BINUTILS_OPTS +=
 
-GCC_VERS = 4.6.1
+GCC_VERS = 4.6.2
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 9
+GCC_RPMREL = 1
 NEWLIB_VERS = 1.19.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
-NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 10`
+NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 19`
 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 c5a0e381bb..e8f85d6c29 100644
--- a/contrib/crossrpms/rtems4.11/m32r/gcc-sources.add
+++ b/contrib/crossrpms/rtems4.11/m32r/gcc-sources.add
@@ -1,6 +1,6 @@
-%if "%{gcc_version}" == "4.6.1"
+%if "%{gcc_version}" == "4.6.2"
 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-20110715.diff
+Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.2-rtems4.11-20111028.diff
 %endif
 %if "%{gcc_version}" == "4.5.3"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
@@ -8,7 +8,7 @@ Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.3-rtems4
 %endif
 
 %if %build_cxx
-%if "%{gcc_version}" == "4.6.1"
+%if "%{gcc_version}" == "4.6.2"
 Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
 %endif
 %if "%{gcc_version}" == "4.5.3" 
diff --git a/contrib/crossrpms/rtems4.11/m68k/Makefile.am b/contrib/crossrpms/rtems4.11/m68k/Makefile.am
index 94f0113b68..b932f54490 100644
--- a/contrib/crossrpms/rtems4.11/m68k/Makefile.am
+++ b/contrib/crossrpms/rtems4.11/m68k/Makefile.am
@@ -11,12 +11,12 @@ BINUTILS_RPMREL = 1
 include ../binutils.am
 BINUTILS_OPTS +=
 
-GCC_VERS = 4.6.1
+GCC_VERS = 4.6.2
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 9
+GCC_RPMREL = 1
 NEWLIB_VERS = 1.19.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
-NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 10`
+NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 19`
 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 c5a0e381bb..e8f85d6c29 100644
--- a/contrib/crossrpms/rtems4.11/m68k/gcc-sources.add
+++ b/contrib/crossrpms/rtems4.11/m68k/gcc-sources.add
@@ -1,6 +1,6 @@
-%if "%{gcc_version}" == "4.6.1"
+%if "%{gcc_version}" == "4.6.2"
 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-20110715.diff
+Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.2-rtems4.11-20111028.diff
 %endif
 %if "%{gcc_version}" == "4.5.3"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
@@ -8,7 +8,7 @@ Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.3-rtems4
 %endif
 
 %if %build_cxx
-%if "%{gcc_version}" == "4.6.1"
+%if "%{gcc_version}" == "4.6.2"
 Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
 %endif
 %if "%{gcc_version}" == "4.5.3" 
diff --git a/contrib/crossrpms/rtems4.11/mips/Makefile.am b/contrib/crossrpms/rtems4.11/mips/Makefile.am
index 961cfdca61..b356039c40 100644
--- a/contrib/crossrpms/rtems4.11/mips/Makefile.am
+++ b/contrib/crossrpms/rtems4.11/mips/Makefile.am
@@ -11,12 +11,12 @@ BINUTILS_RPMREL = 1
 include ../binutils.am
 BINUTILS_OPTS +=
 
-GCC_VERS = 4.6.1
+GCC_VERS = 4.6.2
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 9
+GCC_RPMREL = 1
 NEWLIB_VERS = 1.19.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
-NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 10`
+NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 19`
 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 c5a0e381bb..e8f85d6c29 100644
--- a/contrib/crossrpms/rtems4.11/mips/gcc-sources.add
+++ b/contrib/crossrpms/rtems4.11/mips/gcc-sources.add
@@ -1,6 +1,6 @@
-%if "%{gcc_version}" == "4.6.1"
+%if "%{gcc_version}" == "4.6.2"
 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-20110715.diff
+Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.2-rtems4.11-20111028.diff
 %endif
 %if "%{gcc_version}" == "4.5.3"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
@@ -8,7 +8,7 @@ Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.3-rtems4
 %endif
 
 %if %build_cxx
-%if "%{gcc_version}" == "4.6.1"
+%if "%{gcc_version}" == "4.6.2"
 Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
 %endif
 %if "%{gcc_version}" == "4.5.3" 
diff --git a/contrib/crossrpms/rtems4.11/powerpc/Makefile.am b/contrib/crossrpms/rtems4.11/powerpc/Makefile.am
index 18cde108cf..a705e341f1 100644
--- a/contrib/crossrpms/rtems4.11/powerpc/Makefile.am
+++ b/contrib/crossrpms/rtems4.11/powerpc/Makefile.am
@@ -11,12 +11,12 @@ BINUTILS_RPMREL = 1
 include ../binutils.am
 BINUTILS_OPTS +=
 
-GCC_VERS = 4.6.1
+GCC_VERS = 4.6.2
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 9
+GCC_RPMREL = 1
 NEWLIB_VERS = 1.19.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
-NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 10`
+NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 19`
 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 d41cc07048..e8f85d6c29 100644
--- a/contrib/crossrpms/rtems4.11/powerpc/gcc-sources.add
+++ b/contrib/crossrpms/rtems4.11/powerpc/gcc-sources.add
@@ -1,6 +1,6 @@
-%if "%{gcc_version}" == "4.6.1"
+%if "%{gcc_version}" == "4.6.2"
 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-20110825.diff
+Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.2-rtems4.11-20111028.diff
 %endif
 %if "%{gcc_version}" == "4.5.3"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
@@ -8,7 +8,7 @@ Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.3-rtems4
 %endif
 
 %if %build_cxx
-%if "%{gcc_version}" == "4.6.1"
+%if "%{gcc_version}" == "4.6.2"
 Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
 %endif
 %if "%{gcc_version}" == "4.5.3" 
diff --git a/contrib/crossrpms/rtems4.11/sh/Makefile.am b/contrib/crossrpms/rtems4.11/sh/Makefile.am
index 3b4500b200..aff073162e 100644
--- a/contrib/crossrpms/rtems4.11/sh/Makefile.am
+++ b/contrib/crossrpms/rtems4.11/sh/Makefile.am
@@ -11,12 +11,12 @@ BINUTILS_RPMREL = 1
 include ../binutils.am
 BINUTILS_OPTS +=
 
-GCC_VERS = 4.6.1
+GCC_VERS = 4.6.2
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 9
+GCC_RPMREL = 1
 NEWLIB_VERS = 1.19.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
-NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 10`
+NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 19`
 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 c5a0e381bb..e8f85d6c29 100644
--- a/contrib/crossrpms/rtems4.11/sh/gcc-sources.add
+++ b/contrib/crossrpms/rtems4.11/sh/gcc-sources.add
@@ -1,6 +1,6 @@
-%if "%{gcc_version}" == "4.6.1"
+%if "%{gcc_version}" == "4.6.2"
 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-20110715.diff
+Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.2-rtems4.11-20111028.diff
 %endif
 %if "%{gcc_version}" == "4.5.3"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
@@ -8,7 +8,7 @@ Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.3-rtems4
 %endif
 
 %if %build_cxx
-%if "%{gcc_version}" == "4.6.1"
+%if "%{gcc_version}" == "4.6.2"
 Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
 %endif
 %if "%{gcc_version}" == "4.5.3" 
diff --git a/contrib/crossrpms/rtems4.11/sparc/Makefile.am b/contrib/crossrpms/rtems4.11/sparc/Makefile.am
index 92edc8c133..0a4acccd0a 100644
--- a/contrib/crossrpms/rtems4.11/sparc/Makefile.am
+++ b/contrib/crossrpms/rtems4.11/sparc/Makefile.am
@@ -11,12 +11,12 @@ BINUTILS_RPMREL = 1
 include ../binutils.am
 BINUTILS_OPTS +=
 
-GCC_VERS = 4.6.1
+GCC_VERS = 4.6.2
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 9
+GCC_RPMREL = 1
 NEWLIB_VERS = 1.19.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
-NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 10`
+NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 19`
 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 c5a0e381bb..e8f85d6c29 100644
--- a/contrib/crossrpms/rtems4.11/sparc/gcc-sources.add
+++ b/contrib/crossrpms/rtems4.11/sparc/gcc-sources.add
@@ -1,6 +1,6 @@
-%if "%{gcc_version}" == "4.6.1"
+%if "%{gcc_version}" == "4.6.2"
 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-20110715.diff
+Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.2-rtems4.11-20111028.diff
 %endif
 %if "%{gcc_version}" == "4.5.3"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
@@ -8,7 +8,7 @@ Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.3-rtems4
 %endif
 
 %if %build_cxx
-%if "%{gcc_version}" == "4.6.1"
+%if "%{gcc_version}" == "4.6.2"
 Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
 %endif
 %if "%{gcc_version}" == "4.5.3" 
diff --git a/contrib/crossrpms/rtems4.11/sparc64/Makefile.am b/contrib/crossrpms/rtems4.11/sparc64/Makefile.am
index 91b052ba33..d9eca503ed 100644
--- a/contrib/crossrpms/rtems4.11/sparc64/Makefile.am
+++ b/contrib/crossrpms/rtems4.11/sparc64/Makefile.am
@@ -11,12 +11,12 @@ BINUTILS_RPMREL = 1
 include ../binutils.am
 BINUTILS_OPTS +=
 
-GCC_VERS = 4.6.1
+GCC_VERS = 4.6.2
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 9
+GCC_RPMREL = 1
 NEWLIB_VERS = 1.19.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
-NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 10`
+NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 19`
 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 c5a0e381bb..e8f85d6c29 100644
--- a/contrib/crossrpms/rtems4.11/sparc64/gcc-sources.add
+++ b/contrib/crossrpms/rtems4.11/sparc64/gcc-sources.add
@@ -1,6 +1,6 @@
-%if "%{gcc_version}" == "4.6.1"
+%if "%{gcc_version}" == "4.6.2"
 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-20110715.diff
+Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.2-rtems4.11-20111028.diff
 %endif
 %if "%{gcc_version}" == "4.5.3"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
@@ -8,7 +8,7 @@ Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.3-rtems4
 %endif
 
 %if %build_cxx
-%if "%{gcc_version}" == "4.6.1"
+%if "%{gcc_version}" == "4.6.2"
 Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
 %endif
 %if "%{gcc_version}" == "4.5.3"