GCC_RPMREL = 23. Rebuild against binutils-2.17.90.

6 files changed, 40 insertions, 52 deletions

diff --git a/contrib/crossrpms/rtems4.8/powerpc/Makefile.am b/contrib/crossrpms/rtems4.8/powerpc/Makefile.am
index 1d5f21df2a..75373e1449 100644
--- a/contrib/crossrpms/rtems4.8/powerpc/Makefile.am
+++ b/contrib/crossrpms/rtems4.8/powerpc/Makefile.am
@@ -10,9 +10,9 @@ BINUTILS_RPMREL = 2%{?dist}
 include ../binutils.am
 BINUTILS_OPTS +=
 
-GCC_VERS = 4.1.2
+GCC_VERS = 4.2.1
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 13%{?dist}
+GCC_RPMREL = 23%{?dist}
 NEWLIB_VERS = 1.15.0
 include ../gcc.am
 GCC_OPTS += --languages=cxx
diff --git a/contrib/crossrpms/rtems4.8/powerpc/gcc-sources.add b/contrib/crossrpms/rtems4.8/powerpc/gcc-sources.add
index cd6b58887a..d7309a9169 100644
--- a/contrib/crossrpms/rtems4.8/powerpc/gcc-sources.add
+++ b/contrib/crossrpms/rtems4.8/powerpc/gcc-sources.add
@@ -1,3 +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
+%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
@@ -16,7 +19,7 @@ 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-20070719.diff
+Patch0:		gcc-core-4.2.1-rtems4.8-20070804.diff
 %endif
 %{?_without_sources:NoSource:	0}
 
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 7898697acc..b23b25201c 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
@@ -14,9 +14,9 @@
 %endif
 
 
-%define gcc_pkgvers 4.1.2
-%define gcc_version 4.1.2
-%define gcc_rpmvers %{expand:%(echo "4.1.2" | tr - _ )}
+%define gcc_pkgvers 4.2.1
+%define gcc_version 4.2.1
+%define gcc_rpmvers %{expand:%(echo "4.2.1" | tr - _ )}
 
 %define newlib_version		1.15.0
 %define gccnewlib_version	gcc%{gcc_version}newlib%{newlib_version}
@@ -26,7 +26,7 @@ Summary:      	powerpc-rtems4.8 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	13%{?dist}
+Release:      	23%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -53,6 +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
@@ -69,6 +72,10 @@ Patch0:		gcc-core-4.1.2-rtems4.8-20070613.diff
 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
+%endif
 %{?_without_sources:NoSource:	0}
 
 Source1: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-g++-%{gcc_pkgvers}.tar.bz2
@@ -76,7 +83,7 @@ Source1: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-g++-%{gcc_pkgvers}.ta
 
 Source50:	ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_version}.tar.gz
 %if "%{newlib_version}" == "1.15.0"
-Patch50:	newlib-1.15.0-rtems4.8-20070413.diff
+Patch50:	newlib-1.15.0-rtems4.8-20070804.diff
 %endif
 %{?_without_sources:NoSource:	50}
 
@@ -371,7 +378,7 @@ 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.7"
+%if "powerpc-rtems4.8" != "bfin-rtems4.8"
 %dir %{gcclib}/powerpc-rtems4.8/%{gcc_version}/include/ssp
 %endif
 %endif
@@ -383,7 +390,7 @@ GNU cc compiler for powerpc-rtems4.8.
 %{gccexec}/powerpc-rtems4.8/%{gcc_version}/collect2%{_exeext}
 
 # ==============================================================
-# rtems-4.8-rtems4.7-base-gcc
+# rtems-4.8-gcc-common
 # ==============================================================
 %package -n rtems-4.8-gcc-common
 Summary:	Base package for rtems gcc and newlib C Library
@@ -394,11 +401,6 @@ License:	GPL
 Requires(post): 	/sbin/install-info
 Requires(preun):	/sbin/install-info
 
-Provides:	rtems-4.8-rtems4.7-base-gcc = %{gcc_version}-%{release}
-Obsoletes:	rtems-4.8-rtems4.7-base-gcc < %{gcc_rpmvers}-%{release}
-Provides:	rtems-4.8-rtems-base-gcc = %{gcc_version}-%{release}
-Obsoletes:	rtems-4.8-rtems-base-gcc < %{gcc_rpmvers}-%{release}
-
 %description -n rtems-4.8-gcc-common
 
 GCC files that are shared by all targets.
@@ -517,17 +519,6 @@ Group:          Development/Tools
 Version:        %{newlib_version}
 License:	Distributable
 
-Provides:	rtems-4.8-rtems4.7-base-newlib = %{newlib_version}-%{release}
-Obsoletes:	rtems-4.8-rtems4.7-base-newlib < %{newlib_version}-%{release}
-Provides:	rtems-4.8-rtems-base-newlib = %{newlib_version}-%{release}
-Obsoletes:	rtems-4.8-rtems-base-newlib < %{newlib_version}-%{release}
-
-Provides:	rtems-4.8-rtems4.7-base-libc = %{newlib_version}-%{release}
-Obsoletes:	rtems-4.8-rtems4.7-base-libc < %{newlib_version}-%{release}
-Provides:	rtems-4.8-rtems-base-libc = %{newlib_version}-%{release}
-Obsoletes:	rtems-4.8-rtems-base-libc < %{newlib_version}-%{release}
-
-
 Requires(post): 	/sbin/install-info
 Requires(preun):	/sbin/install-info
 
diff --git a/contrib/crossrpms/rtems4.8/sh/Makefile.am b/contrib/crossrpms/rtems4.8/sh/Makefile.am
index 0a0bb7ca8d..1488b180fb 100644
--- a/contrib/crossrpms/rtems4.8/sh/Makefile.am
+++ b/contrib/crossrpms/rtems4.8/sh/Makefile.am
@@ -10,9 +10,9 @@ BINUTILS_RPMREL = 2%{?dist}
 include ../binutils.am
 BINUTILS_OPTS +=
 
-GCC_VERS = 4.1.2
+GCC_VERS = 4.2.1
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 13%{?dist}
+GCC_RPMREL = 23%{?dist}
 NEWLIB_VERS = 1.15.0
 include ../gcc.am
 GCC_OPTS += --languages=cxx
diff --git a/contrib/crossrpms/rtems4.8/sh/gcc-sources.add b/contrib/crossrpms/rtems4.8/sh/gcc-sources.add
index cd6b58887a..d7309a9169 100644
--- a/contrib/crossrpms/rtems4.8/sh/gcc-sources.add
+++ b/contrib/crossrpms/rtems4.8/sh/gcc-sources.add
@@ -1,3 +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
+%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
@@ -16,7 +19,7 @@ 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-20070719.diff
+Patch0:		gcc-core-4.2.1-rtems4.8-20070804.diff
 %endif
 %{?_without_sources:NoSource:	0}
 
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 2a0ea0d295..16169feb79 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
@@ -14,9 +14,9 @@
 %endif
 
 
-%define gcc_pkgvers 4.1.2
-%define gcc_version 4.1.2
-%define gcc_rpmvers %{expand:%(echo "4.1.2" | tr - _ )}
+%define gcc_pkgvers 4.2.1
+%define gcc_version 4.2.1
+%define gcc_rpmvers %{expand:%(echo "4.2.1" | tr - _ )}
 
 %define newlib_version		1.15.0
 %define gccnewlib_version	gcc%{gcc_version}newlib%{newlib_version}
@@ -26,7 +26,7 @@ Summary:      	sh-rtems4.8 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	13%{?dist}
+Release:      	23%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -53,6 +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
@@ -69,6 +72,10 @@ Patch0:		gcc-core-4.1.2-rtems4.8-20070613.diff
 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
+%endif
 %{?_without_sources:NoSource:	0}
 
 Source1: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-g++-%{gcc_pkgvers}.tar.bz2
@@ -76,7 +83,7 @@ Source1: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-g++-%{gcc_pkgvers}.ta
 
 Source50:	ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_version}.tar.gz
 %if "%{newlib_version}" == "1.15.0"
-Patch50:	newlib-1.15.0-rtems4.8-20070413.diff
+Patch50:	newlib-1.15.0-rtems4.8-20070804.diff
 %endif
 %{?_without_sources:NoSource:	50}
 
@@ -371,7 +378,7 @@ 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.7"
+%if "sh-rtems4.8" != "bfin-rtems4.8"
 %dir %{gcclib}/sh-rtems4.8/%{gcc_version}/include/ssp
 %endif
 %endif
@@ -383,7 +390,7 @@ GNU cc compiler for sh-rtems4.8.
 %{gccexec}/sh-rtems4.8/%{gcc_version}/collect2%{_exeext}
 
 # ==============================================================
-# rtems-4.8-rtems4.7-base-gcc
+# rtems-4.8-gcc-common
 # ==============================================================
 %package -n rtems-4.8-gcc-common
 Summary:	Base package for rtems gcc and newlib C Library
@@ -394,11 +401,6 @@ License:	GPL
 Requires(post): 	/sbin/install-info
 Requires(preun):	/sbin/install-info
 
-Provides:	rtems-4.8-rtems4.7-base-gcc = %{gcc_version}-%{release}
-Obsoletes:	rtems-4.8-rtems4.7-base-gcc < %{gcc_rpmvers}-%{release}
-Provides:	rtems-4.8-rtems-base-gcc = %{gcc_version}-%{release}
-Obsoletes:	rtems-4.8-rtems-base-gcc < %{gcc_rpmvers}-%{release}
-
 %description -n rtems-4.8-gcc-common
 
 GCC files that are shared by all targets.
@@ -517,17 +519,6 @@ Group:          Development/Tools
 Version:        %{newlib_version}
 License:	Distributable
 
-Provides:	rtems-4.8-rtems4.7-base-newlib = %{newlib_version}-%{release}
-Obsoletes:	rtems-4.8-rtems4.7-base-newlib < %{newlib_version}-%{release}
-Provides:	rtems-4.8-rtems-base-newlib = %{newlib_version}-%{release}
-Obsoletes:	rtems-4.8-rtems-base-newlib < %{newlib_version}-%{release}
-
-Provides:	rtems-4.8-rtems4.7-base-libc = %{newlib_version}-%{release}
-Obsoletes:	rtems-4.8-rtems4.7-base-libc < %{newlib_version}-%{release}
-Provides:	rtems-4.8-rtems-base-libc = %{newlib_version}-%{release}
-Obsoletes:	rtems-4.8-rtems-base-libc < %{newlib_version}-%{release}
-
-
 Requires(post): 	/sbin/install-info
 Requires(preun):	/sbin/install-info