backup.

13 files changed, 47 insertions, 216 deletions

diff --git a/contrib/crossrpms/rtems4.8/arm/rtems-4.8-arm-rtems4.8-gcc.spec b/contrib/crossrpms/rtems4.8/arm/rtems-4.8-arm-rtems4.8-gcc.spec
index 32e38b2753..2a11b716e3 100644
--- a/contrib/crossrpms/rtems4.8/arm/rtems-4.8-arm-rtems4.8-gcc.spec
+++ b/contrib/crossrpms/rtems4.8/arm/rtems-4.8-arm-rtems4.8-gcc.spec
@@ -26,7 +26,7 @@ Summary:      	arm-rtems4.8 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	23%{?dist}
+Release:      	25%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -53,25 +53,9 @@ Requires:	rtems-4.8-arm-rtems4.8-newlib = %{newlib_version}-%{release}
 %define gccexec %{_libdir}/gcc-lib
 %endif
 
-%if "%{gcc_version}" == "4.0.3"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		gcc-core-4.0.3-rtems-20060822.diff
-%endif
-%if "%{gcc_version}" == "4.1.1"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		gcc-core-4.1.1-rtems4.8-20070201.diff
-%endif
-%if "%{gcc_version}" == "4.1.2"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		gcc-core-4.1.2-rtems4.8-20070613.diff
-%endif
-%if "%{gcc_version}" == "4.2.0"
-Source0:	ftp://gcc.gnu.org/pub/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		gcc-core-%{gcc_pkgvers}-rtems4.8-20070613.diff
-%endif
 %if "%{gcc_version}" == "4.2.1"
 Source0:	ftp://gcc.gnu.org/pub/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		gcc-core-4.2.1-rtems4.8-20070804.diff
+Patch0:		gcc-core-4.2.1-rtems4.8-20071111.diff
 %endif
 %{?_without_sources:NoSource:	0}
 
@@ -376,9 +360,11 @@ GNU cc compiler for arm-rtems4.8.
 %dir %{gcclib}/arm-rtems4.8/%{gcc_version}/include
 %if "%{gcc_version}" > "4.0.3"
 %if "arm-rtems4.8" != "bfin-rtems4.8"
+%if "arm-rtems4.8" != "avr-rtems4.8"
 %dir %{gcclib}/arm-rtems4.8/%{gcc_version}/include/ssp
 %endif
 %endif
+%endif
 
 %dir %{gccexec}
 %dir %{gccexec}/arm-rtems4.8
diff --git a/contrib/crossrpms/rtems4.8/avr/Makefile.am b/contrib/crossrpms/rtems4.8/avr/Makefile.am
index 97b01b5136..e946642b67 100644
--- a/contrib/crossrpms/rtems4.8/avr/Makefile.am
+++ b/contrib/crossrpms/rtems4.8/avr/Makefile.am
@@ -12,7 +12,7 @@ BINUTILS_OPTS +=
 
 GCC_VERS = 4.0.3
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 12%{?dist}
+GCC_RPMREL = 13%{?dist}
 NEWLIB_VERS = 1.15.0
 include ../gcc.am
 
diff --git a/contrib/crossrpms/rtems4.8/avr/rtems-4.8-avr-rtems4.8-gcc.spec b/contrib/crossrpms/rtems4.8/avr/rtems-4.8-avr-rtems4.8-gcc.spec
index 2444120334..9cee550803 100644
--- a/contrib/crossrpms/rtems4.8/avr/rtems-4.8-avr-rtems4.8-gcc.spec
+++ b/contrib/crossrpms/rtems4.8/avr/rtems-4.8-avr-rtems4.8-gcc.spec
@@ -26,7 +26,7 @@ Summary:      	avr-rtems4.8 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	12%{?dist}
+Release:      	13%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -53,28 +53,13 @@ Requires:	rtems-4.8-avr-rtems4.8-newlib = %{newlib_version}-%{release}
 %define gccexec %{_libdir}/gcc-lib
 %endif
 
-%if "%{gcc_version}" == "3.4.6"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-3.4.6/gcc-core-%{gcc_pkgvers}.tar.bz2
-%endif
 %if "%{gcc_version}" == "4.0.3"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
 Patch0:		gcc-core-4.0.3-rtems-20060822.diff
 %endif
-%if "%{gcc_version}" == "4.1.1"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		gcc-core-4.1.1-rtems4.8-20070201.diff
-%endif
-%if "%{gcc_version}" == "4.1.2"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		gcc-core-4.1.2-rtems4.8-20070613.diff
-%endif
-%if "%{gcc_version}" == "4.2.0"
-Source0:	ftp://gcc.gnu.org/pub/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		gcc-core-%{gcc_pkgvers}-rtems4.8-20070613.diff
-%endif
 %if "%{gcc_version}" == "4.2.1"
 Source0:	ftp://gcc.gnu.org/pub/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		gcc-core-4.2.1-rtems4.8-20070804.diff
+Patch0:		gcc-core-4.2.1-rtems4.8-20071111.diff
 %endif
 %{?_without_sources:NoSource:	0}
 
@@ -373,9 +358,11 @@ GNU cc compiler for avr-rtems4.8.
 %dir %{gcclib}/avr-rtems4.8/%{gcc_version}/include
 %if "%{gcc_version}" > "4.0.3"
 %if "avr-rtems4.8" != "bfin-rtems4.8"
+%if "avr-rtems4.8" != "avr-rtems4.8"
 %dir %{gcclib}/avr-rtems4.8/%{gcc_version}/include/ssp
 %endif
 %endif
+%endif
 
 %dir %{gccexec}
 %dir %{gccexec}/avr-rtems4.8
diff --git a/contrib/crossrpms/rtems4.8/bfin/rtems-4.8-bfin-rtems4.8-gcc.spec b/contrib/crossrpms/rtems4.8/bfin/rtems-4.8-bfin-rtems4.8-gcc.spec
index 2aa8018a2f..5fb0f854bd 100644
--- a/contrib/crossrpms/rtems4.8/bfin/rtems-4.8-bfin-rtems4.8-gcc.spec
+++ b/contrib/crossrpms/rtems4.8/bfin/rtems-4.8-bfin-rtems4.8-gcc.spec
@@ -26,7 +26,7 @@ Summary:      	bfin-rtems4.8 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	23%{?dist}
+Release:      	25%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -53,25 +53,9 @@ Requires:	rtems-4.8-bfin-rtems4.8-newlib = %{newlib_version}-%{release}
 %define gccexec %{_libdir}/gcc-lib
 %endif
 
-%if "%{gcc_version}" == "4.0.3"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		gcc-core-4.0.3-rtems-20060822.diff
-%endif
-%if "%{gcc_version}" == "4.1.1"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		gcc-core-4.1.1-rtems4.8-20070201.diff
-%endif
-%if "%{gcc_version}" == "4.1.2"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		gcc-core-4.1.2-rtems4.8-20070613.diff
-%endif
-%if "%{gcc_version}" == "4.2.0"
-Source0:	ftp://gcc.gnu.org/pub/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		gcc-core-%{gcc_pkgvers}-rtems4.8-20070613.diff
-%endif
 %if "%{gcc_version}" == "4.2.1"
 Source0:	ftp://gcc.gnu.org/pub/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		gcc-core-4.2.1-rtems4.8-20070804.diff
+Patch0:		gcc-core-4.2.1-rtems4.8-20071111.diff
 %endif
 %{?_without_sources:NoSource:	0}
 
@@ -370,9 +354,11 @@ GNU cc compiler for bfin-rtems4.8.
 %dir %{gcclib}/bfin-rtems4.8/%{gcc_version}/include
 %if "%{gcc_version}" > "4.0.3"
 %if "bfin-rtems4.8" != "bfin-rtems4.8"
+%if "bfin-rtems4.8" != "avr-rtems4.8"
 %dir %{gcclib}/bfin-rtems4.8/%{gcc_version}/include/ssp
 %endif
 %endif
+%endif
 
 %dir %{gccexec}
 %dir %{gccexec}/bfin-rtems4.8
diff --git a/contrib/crossrpms/rtems4.8/h8300/rtems-4.8-h8300-rtems4.8-gcc.spec b/contrib/crossrpms/rtems4.8/h8300/rtems-4.8-h8300-rtems4.8-gcc.spec
index 21438d4f77..eda852165d 100644
--- a/contrib/crossrpms/rtems4.8/h8300/rtems-4.8-h8300-rtems4.8-gcc.spec
+++ b/contrib/crossrpms/rtems4.8/h8300/rtems-4.8-h8300-rtems4.8-gcc.spec
@@ -26,7 +26,7 @@ Summary:      	h8300-rtems4.8 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	23%{?dist}
+Release:      	25%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -53,28 +53,9 @@ Requires:	rtems-4.8-h8300-rtems4.8-newlib = %{newlib_version}-%{release}
 %define gccexec %{_libdir}/gcc-lib
 %endif
 
-%if "%{gcc_version}" == "3.4.6"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-3.4.6/gcc-core-%{gcc_pkgvers}.tar.bz2
-%endif
-%if "%{gcc_version}" == "4.0.3"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		gcc-core-4.0.3-rtems-20060822.diff
-%endif
-%if "%{gcc_version}" == "4.1.1"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		gcc-core-4.1.1-rtems4.8-20070201.diff
-%endif
-%if "%{gcc_version}" == "4.1.2"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		gcc-core-4.1.2-rtems4.8-20070613.diff
-%endif
-%if "%{gcc_version}" == "4.2.0"
-Source0:	ftp://gcc.gnu.org/pub/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		gcc-core-%{gcc_pkgvers}-rtems4.8-20070613.diff
-%endif
 %if "%{gcc_version}" == "4.2.1"
 Source0:	ftp://gcc.gnu.org/pub/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		gcc-core-4.2.1-rtems4.8-20070804.diff
+Patch0:		gcc-core-4.2.1-rtems4.8-20071111.diff
 %endif
 %{?_without_sources:NoSource:	0}
 
@@ -379,9 +360,11 @@ GNU cc compiler for h8300-rtems4.8.
 %dir %{gcclib}/h8300-rtems4.8/%{gcc_version}/include
 %if "%{gcc_version}" > "4.0.3"
 %if "h8300-rtems4.8" != "bfin-rtems4.8"
+%if "h8300-rtems4.8" != "avr-rtems4.8"
 %dir %{gcclib}/h8300-rtems4.8/%{gcc_version}/include/ssp
 %endif
 %endif
+%endif
 
 %dir %{gccexec}
 %dir %{gccexec}/h8300-rtems4.8
diff --git a/contrib/crossrpms/rtems4.8/i386/rtems-4.8-i386-rtems4.8-gcc.spec b/contrib/crossrpms/rtems4.8/i386/rtems-4.8-i386-rtems4.8-gcc.spec
index c7faebc783..dfd0acb0f3 100644
--- a/contrib/crossrpms/rtems4.8/i386/rtems-4.8-i386-rtems4.8-gcc.spec
+++ b/contrib/crossrpms/rtems4.8/i386/rtems-4.8-i386-rtems4.8-gcc.spec
@@ -26,7 +26,7 @@ Summary:      	i386-rtems4.8 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	23%{?dist}
+Release:      	25%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -53,28 +53,9 @@ Requires:	rtems-4.8-i386-rtems4.8-newlib = %{newlib_version}-%{release}
 %define gccexec %{_libdir}/gcc-lib
 %endif
 
-%if "%{gcc_version}" == "3.4.6"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-3.4.6/gcc-core-%{gcc_pkgvers}.tar.bz2
-%endif
-%if "%{gcc_version}" == "4.0.3"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		gcc-core-4.0.3-rtems-20060822.diff
-%endif
-%if "%{gcc_version}" == "4.1.1"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		gcc-core-4.1.1-rtems4.8-20070201.diff
-%endif
-%if "%{gcc_version}" == "4.1.2"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		gcc-core-4.1.2-rtems4.8-20070613.diff
-%endif
-%if "%{gcc_version}" == "4.2.0"
-Source0:	ftp://gcc.gnu.org/pub/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		gcc-core-%{gcc_pkgvers}-rtems4.8-20070613.diff
-%endif
 %if "%{gcc_version}" == "4.2.1"
 Source0:	ftp://gcc.gnu.org/pub/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		gcc-core-4.2.1-rtems4.8-20070804.diff
+Patch0:		gcc-core-4.2.1-rtems4.8-20071111.diff
 %endif
 %{?_without_sources:NoSource:	0}
 
@@ -379,9 +360,11 @@ GNU cc compiler for i386-rtems4.8.
 %dir %{gcclib}/i386-rtems4.8/%{gcc_version}/include
 %if "%{gcc_version}" > "4.0.3"
 %if "i386-rtems4.8" != "bfin-rtems4.8"
+%if "i386-rtems4.8" != "avr-rtems4.8"
 %dir %{gcclib}/i386-rtems4.8/%{gcc_version}/include/ssp
 %endif
 %endif
+%endif
 
 %dir %{gccexec}
 %dir %{gccexec}/i386-rtems4.8
diff --git a/contrib/crossrpms/rtems4.8/m68k/rtems-4.8-m68k-rtems4.8-gcc.spec b/contrib/crossrpms/rtems4.8/m68k/rtems-4.8-m68k-rtems4.8-gcc.spec
index 3fca591139..ad7b6fc97b 100644
--- a/contrib/crossrpms/rtems4.8/m68k/rtems-4.8-m68k-rtems4.8-gcc.spec
+++ b/contrib/crossrpms/rtems4.8/m68k/rtems-4.8-m68k-rtems4.8-gcc.spec
@@ -26,7 +26,7 @@ Summary:      	m68k-rtems4.8 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	23%{?dist}
+Release:      	25%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -53,25 +53,9 @@ Requires:	rtems-4.8-m68k-rtems4.8-newlib = %{newlib_version}-%{release}
 %define gccexec %{_libdir}/gcc-lib
 %endif
 
-%if "%{gcc_version}" == "4.0.3"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		gcc-core-4.0.3-rtems-20060822.diff
-%endif
-%if "%{gcc_version}" == "4.1.1"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		gcc-core-4.1.1-rtems4.8-20070201.diff
-%endif
-%if "%{gcc_version}" == "4.1.2"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		gcc-core-4.1.2-rtems4.8-20070613.diff
-%endif
-%if "%{gcc_version}" == "4.2.0"
-Source0:	ftp://gcc.gnu.org/pub/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		gcc-core-%{gcc_pkgvers}-rtems4.8-20070613.diff
-%endif
 %if "%{gcc_version}" == "4.2.1"
 Source0:	ftp://gcc.gnu.org/pub/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		gcc-core-4.2.1-rtems4.8-20070804.diff
+Patch0:		gcc-core-4.2.1-rtems4.8-20071111.diff
 %endif
 %{?_without_sources:NoSource:	0}
 
@@ -376,9 +360,11 @@ GNU cc compiler for m68k-rtems4.8.
 %dir %{gcclib}/m68k-rtems4.8/%{gcc_version}/include
 %if "%{gcc_version}" > "4.0.3"
 %if "m68k-rtems4.8" != "bfin-rtems4.8"
+%if "m68k-rtems4.8" != "avr-rtems4.8"
 %dir %{gcclib}/m68k-rtems4.8/%{gcc_version}/include/ssp
 %endif
 %endif
+%endif
 
 %dir %{gccexec}
 %dir %{gccexec}/m68k-rtems4.8
diff --git a/contrib/crossrpms/rtems4.8/mips/rtems-4.8-mips-rtems4.8-gcc.spec b/contrib/crossrpms/rtems4.8/mips/rtems-4.8-mips-rtems4.8-gcc.spec
index 049a33e4b2..cd9e061489 100644
--- a/contrib/crossrpms/rtems4.8/mips/rtems-4.8-mips-rtems4.8-gcc.spec
+++ b/contrib/crossrpms/rtems4.8/mips/rtems-4.8-mips-rtems4.8-gcc.spec
@@ -26,7 +26,7 @@ Summary:      	mips-rtems4.8 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	23%{?dist}
+Release:      	25%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -53,28 +53,9 @@ Requires:	rtems-4.8-mips-rtems4.8-newlib = %{newlib_version}-%{release}
 %define gccexec %{_libdir}/gcc-lib
 %endif
 
-%if "%{gcc_version}" == "3.4.6"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-3.4.6/gcc-core-%{gcc_pkgvers}.tar.bz2
-%endif
-%if "%{gcc_version}" == "4.0.3"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		gcc-core-4.0.3-rtems-20060822.diff
-%endif
-%if "%{gcc_version}" == "4.1.1"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		gcc-core-4.1.1-rtems4.8-20070201.diff
-%endif
-%if "%{gcc_version}" == "4.1.2"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		gcc-core-4.1.2-rtems4.8-20070613.diff
-%endif
-%if "%{gcc_version}" == "4.2.0"
-Source0:	ftp://gcc.gnu.org/pub/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		gcc-core-%{gcc_pkgvers}-rtems4.8-20070613.diff
-%endif
 %if "%{gcc_version}" == "4.2.1"
 Source0:	ftp://gcc.gnu.org/pub/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		gcc-core-4.2.1-rtems4.8-20070804.diff
+Patch0:		gcc-core-4.2.1-rtems4.8-20071111.diff
 %endif
 %{?_without_sources:NoSource:	0}
 
@@ -379,9 +360,11 @@ GNU cc compiler for mips-rtems4.8.
 %dir %{gcclib}/mips-rtems4.8/%{gcc_version}/include
 %if "%{gcc_version}" > "4.0.3"
 %if "mips-rtems4.8" != "bfin-rtems4.8"
+%if "mips-rtems4.8" != "avr-rtems4.8"
 %dir %{gcclib}/mips-rtems4.8/%{gcc_version}/include/ssp
 %endif
 %endif
+%endif
 
 %dir %{gccexec}
 %dir %{gccexec}/mips-rtems4.8
diff --git a/contrib/crossrpms/rtems4.8/powerpc/rtems-4.8-powerpc-rtems4.8-gcc.spec b/contrib/crossrpms/rtems4.8/powerpc/rtems-4.8-powerpc-rtems4.8-gcc.spec
index a2005b4a03..9d4c57a7f2 100644
--- a/contrib/crossrpms/rtems4.8/powerpc/rtems-4.8-powerpc-rtems4.8-gcc.spec
+++ b/contrib/crossrpms/rtems4.8/powerpc/rtems-4.8-powerpc-rtems4.8-gcc.spec
@@ -26,7 +26,7 @@ Summary:      	powerpc-rtems4.8 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	24%{?dist}
+Release:      	25%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -53,28 +53,9 @@ Requires:	rtems-4.8-powerpc-rtems4.8-newlib = %{newlib_version}-%{release}
 %define gccexec %{_libdir}/gcc-lib
 %endif
 
-%if "%{gcc_version}" == "3.4.6"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-3.4.6/gcc-core-%{gcc_pkgvers}.tar.bz2
-%endif
-%if "%{gcc_version}" == "4.0.3"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		gcc-core-4.0.3-rtems-20060822.diff
-%endif
-%if "%{gcc_version}" == "4.1.1"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		gcc-core-4.1.1-rtems4.8-20070201.diff
-%endif
-%if "%{gcc_version}" == "4.1.2"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		gcc-core-4.1.2-rtems4.8-20070613.diff
-%endif
-%if "%{gcc_version}" == "4.2.0"
-Source0:	ftp://gcc.gnu.org/pub/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		gcc-core-%{gcc_pkgvers}-rtems4.8-20070613.diff
-%endif
 %if "%{gcc_version}" == "4.2.1"
 Source0:	ftp://gcc.gnu.org/pub/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		gcc-core-4.2.1-rtems4.8-20070804.diff
+Patch0:		gcc-core-4.2.1-rtems4.8-20071111.diff
 %endif
 %{?_without_sources:NoSource:	0}
 
@@ -379,9 +360,11 @@ GNU cc compiler for powerpc-rtems4.8.
 %dir %{gcclib}/powerpc-rtems4.8/%{gcc_version}/include
 %if "%{gcc_version}" > "4.0.3"
 %if "powerpc-rtems4.8" != "bfin-rtems4.8"
+%if "powerpc-rtems4.8" != "avr-rtems4.8"
 %dir %{gcclib}/powerpc-rtems4.8/%{gcc_version}/include/ssp
 %endif
 %endif
+%endif
 
 %dir %{gccexec}
 %dir %{gccexec}/powerpc-rtems4.8
diff --git a/contrib/crossrpms/rtems4.8/sh/rtems-4.8-sh-rtems4.8-gcc.spec b/contrib/crossrpms/rtems4.8/sh/rtems-4.8-sh-rtems4.8-gcc.spec
index 16169feb79..dce90fde0a 100644
--- a/contrib/crossrpms/rtems4.8/sh/rtems-4.8-sh-rtems4.8-gcc.spec
+++ b/contrib/crossrpms/rtems4.8/sh/rtems-4.8-sh-rtems4.8-gcc.spec
@@ -26,7 +26,7 @@ Summary:      	sh-rtems4.8 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	23%{?dist}
+Release:      	25%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -53,28 +53,9 @@ Requires:	rtems-4.8-sh-rtems4.8-newlib = %{newlib_version}-%{release}
 %define gccexec %{_libdir}/gcc-lib
 %endif
 
-%if "%{gcc_version}" == "3.4.6"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-3.4.6/gcc-core-%{gcc_pkgvers}.tar.bz2
-%endif
-%if "%{gcc_version}" == "4.0.3"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		gcc-core-4.0.3-rtems-20060822.diff
-%endif
-%if "%{gcc_version}" == "4.1.1"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		gcc-core-4.1.1-rtems4.8-20070201.diff
-%endif
-%if "%{gcc_version}" == "4.1.2"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		gcc-core-4.1.2-rtems4.8-20070613.diff
-%endif
-%if "%{gcc_version}" == "4.2.0"
-Source0:	ftp://gcc.gnu.org/pub/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		gcc-core-%{gcc_pkgvers}-rtems4.8-20070613.diff
-%endif
 %if "%{gcc_version}" == "4.2.1"
 Source0:	ftp://gcc.gnu.org/pub/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		gcc-core-4.2.1-rtems4.8-20070804.diff
+Patch0:		gcc-core-4.2.1-rtems4.8-20071111.diff
 %endif
 %{?_without_sources:NoSource:	0}
 
@@ -379,9 +360,11 @@ GNU cc compiler for sh-rtems4.8.
 %dir %{gcclib}/sh-rtems4.8/%{gcc_version}/include
 %if "%{gcc_version}" > "4.0.3"
 %if "sh-rtems4.8" != "bfin-rtems4.8"
+%if "sh-rtems4.8" != "avr-rtems4.8"
 %dir %{gcclib}/sh-rtems4.8/%{gcc_version}/include/ssp
 %endif
 %endif
+%endif
 
 %dir %{gccexec}
 %dir %{gccexec}/sh-rtems4.8
diff --git a/contrib/crossrpms/rtems4.8/sparc/rtems-4.8-sparc-rtems4.8-gcc.spec b/contrib/crossrpms/rtems4.8/sparc/rtems-4.8-sparc-rtems4.8-gcc.spec
index cabd6b33d3..70d6c959d3 100644
--- a/contrib/crossrpms/rtems4.8/sparc/rtems-4.8-sparc-rtems4.8-gcc.spec
+++ b/contrib/crossrpms/rtems4.8/sparc/rtems-4.8-sparc-rtems4.8-gcc.spec
@@ -26,7 +26,7 @@ Summary:      	sparc-rtems4.8 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	23%{?dist}
+Release:      	25%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -53,28 +53,9 @@ Requires:	rtems-4.8-sparc-rtems4.8-newlib = %{newlib_version}-%{release}
 %define gccexec %{_libdir}/gcc-lib
 %endif
 
-%if "%{gcc_version}" == "3.4.6"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-3.4.6/gcc-core-%{gcc_pkgvers}.tar.bz2
-%endif
-%if "%{gcc_version}" == "4.0.3"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		gcc-core-4.0.3-rtems-20060822.diff
-%endif
-%if "%{gcc_version}" == "4.1.1"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		gcc-core-4.1.1-rtems4.8-20070201.diff
-%endif
-%if "%{gcc_version}" == "4.1.2"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		gcc-core-4.1.2-rtems4.8-20070613.diff
-%endif
-%if "%{gcc_version}" == "4.2.0"
-Source0:	ftp://gcc.gnu.org/pub/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		gcc-core-%{gcc_pkgvers}-rtems4.8-20070613.diff
-%endif
 %if "%{gcc_version}" == "4.2.1"
 Source0:	ftp://gcc.gnu.org/pub/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		gcc-core-4.2.1-rtems4.8-20070804.diff
+Patch0:		gcc-core-4.2.1-rtems4.8-20071111.diff
 %endif
 %{?_without_sources:NoSource:	0}
 
@@ -379,9 +360,11 @@ GNU cc compiler for sparc-rtems4.8.
 %dir %{gcclib}/sparc-rtems4.8/%{gcc_version}/include
 %if "%{gcc_version}" > "4.0.3"
 %if "sparc-rtems4.8" != "bfin-rtems4.8"
+%if "sparc-rtems4.8" != "avr-rtems4.8"
 %dir %{gcclib}/sparc-rtems4.8/%{gcc_version}/include/ssp
 %endif
 %endif
+%endif
 
 %dir %{gccexec}
 %dir %{gccexec}/sparc-rtems4.8
diff --git a/contrib/crossrpms/rtems4.8/tic4x/gcc-sources.add b/contrib/crossrpms/rtems4.8/tic4x/gcc-sources.add
index 5b51772be2..b2e6b49ee0 100644
--- a/contrib/crossrpms/rtems4.8/tic4x/gcc-sources.add
+++ b/contrib/crossrpms/rtems4.8/tic4x/gcc-sources.add
@@ -1,5 +1,6 @@
 %if "%{gcc_version}" == "3.4.6"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-3.4.6/gcc-core-%{gcc_pkgvers}.tar.bz2
+Patch0:		gcc-core-3.4.6-rtems4.8-20071111.diff
 %endif
 %if "%{gcc_version}" == "4.2.1"
 Source0:	ftp://gcc.gnu.org/pub/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
diff --git a/contrib/crossrpms/rtems4.8/tic4x/rtems-4.8-tic4x-rtems4.8-gcc.spec b/contrib/crossrpms/rtems4.8/tic4x/rtems-4.8-tic4x-rtems4.8-gcc.spec
index c642777796..dae3999d77 100644
--- a/contrib/crossrpms/rtems4.8/tic4x/rtems-4.8-tic4x-rtems4.8-gcc.spec
+++ b/contrib/crossrpms/rtems4.8/tic4x/rtems-4.8-tic4x-rtems4.8-gcc.spec
@@ -26,7 +26,7 @@ Summary:      	tic4x-rtems4.8 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	12%{?dist}
+Release:      	14%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -55,26 +55,11 @@ Requires:	rtems-4.8-tic4x-rtems4.8-newlib = %{newlib_version}-%{release}
 
 %if "%{gcc_version}" == "3.4.6"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-3.4.6/gcc-core-%{gcc_pkgvers}.tar.bz2
-%endif
-%if "%{gcc_version}" == "4.0.3"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		gcc-core-4.0.3-rtems-20060822.diff
-%endif
-%if "%{gcc_version}" == "4.1.1"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		gcc-core-4.1.1-rtems4.8-20070201.diff
-%endif
-%if "%{gcc_version}" == "4.1.2"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		gcc-core-4.1.2-rtems4.8-20070613.diff
-%endif
-%if "%{gcc_version}" == "4.2.0"
-Source0:	ftp://gcc.gnu.org/pub/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		gcc-core-%{gcc_pkgvers}-rtems4.8-20070613.diff
+Patch0:		gcc-core-3.4.6-rtems4.8-20071111.diff
 %endif
 %if "%{gcc_version}" == "4.2.1"
 Source0:	ftp://gcc.gnu.org/pub/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		gcc-core-4.2.1-rtems4.8-20070804.diff
+Patch0:		gcc-core-4.2.1-rtems4.8-20071111.diff
 %endif
 %{?_without_sources:NoSource:	0}
 
@@ -373,9 +358,11 @@ GNU cc compiler for tic4x-rtems4.8.
 %dir %{gcclib}/tic4x-rtems4.8/%{gcc_version}/include
 %if "%{gcc_version}" > "4.0.3"
 %if "tic4x-rtems4.8" != "bfin-rtems4.8"
+%if "tic4x-rtems4.8" != "avr-rtems4.8"
 %dir %{gcclib}/tic4x-rtems4.8/%{gcc_version}/include/ssp
 %endif
 %endif
+%endif
 
 %dir %{gccexec}
 %dir %{gccexec}/tic4x-rtems4.8