[rtems-crossrpms commit] Regenerate.

Ralf Corsepius ralf at rtems.org
Wed Nov 20 18:37:20 UTC 2013 

Module:    rtems-crossrpms
Branch:    rtems-4-10-branch
Commit:    fa9fa55e3b7b429f2c89ece2b49ee81af6ec42c8
Changeset: http://git.rtems.org/rtems-crossrpms/commit/?id=fa9fa55e3b7b429f2c89ece2b49ee81af6ec42c8

Author:    Ralf Corsépius <ralf.corsepius at rtems.org>
Date:      Wed Aug 28 05:18:56 2013 +0200

Regenerate.

---

 rtems4.10/arm/Makefile.in                          |    2 +-
 rtems4.10/arm/rtems-4.10-arm-rtems4.10-gcc.spec    |   40 ++++++++++----------
 rtems4.10/avr/Makefile.in                          |    2 +-
 rtems4.10/avr/rtems-4.10-avr-rtems4.10-gcc.spec    |   40 ++++++++++----------
 rtems4.10/bfin/Makefile.in                         |    2 +-
 rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-gcc.spec  |   40 ++++++++++----------
 rtems4.10/h8300/Makefile.in                        |    2 +-
 .../h8300/rtems-4.10-h8300-rtems4.10-gcc.spec      |   40 ++++++++++----------
 rtems4.10/i386/Makefile.in                         |    2 +-
 rtems4.10/i386/rtems-4.10-i386-rtems4.10-gcc.spec  |   40 ++++++++++----------
 rtems4.10/lm32/Makefile.in                         |    2 +-
 rtems4.10/lm32/rtems-4.10-lm32-rtems4.10-gcc.spec  |   40 ++++++++++----------
 rtems4.10/m32c/Makefile.in                         |    2 +-
 rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-gcc.spec  |   40 ++++++++++----------
 rtems4.10/m32r/Makefile.in                         |    2 +-
 rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-gcc.spec  |   40 ++++++++++----------
 rtems4.10/m68k/Makefile.in                         |    2 +-
 rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-gcc.spec  |   40 ++++++++++----------
 rtems4.10/mips/Makefile.in                         |    2 +-
 rtems4.10/mips/rtems-4.10-mips-rtems4.10-gcc.spec  |   40 ++++++++++----------
 rtems4.10/powerpc/Makefile.in                      |    2 +-
 .../powerpc/rtems-4.10-powerpc-rtems4.10-gcc.spec  |   40 ++++++++++----------
 rtems4.10/sh/Makefile.in                           |    2 +-
 rtems4.10/sh/rtems-4.10-sh-rtems4.10-gcc.spec      |   40 ++++++++++----------
 rtems4.10/sparc/Makefile.in                        |    2 +-
 .../sparc/rtems-4.10-sparc-rtems4.10-gcc.spec      |   40 ++++++++++----------
 26 files changed, 273 insertions(+), 273 deletions(-)

diff --git a/rtems4.10/arm/Makefile.in b/rtems4.10/arm/Makefile.in
index 2a09136..b4a5f69 100644
--- a/rtems4.10/arm/Makefile.in
+++ b/rtems4.10/arm/Makefile.in
@@ -238,7 +238,7 @@ BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/binutils/base-binutils.add
 GCC_VERS = 4.4.7
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 4
+GCC_RPMREL = 5
 NEWLIB_VERS = 1.18.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
 NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 28`
diff --git a/rtems4.10/arm/rtems-4.10-arm-rtems4.10-gcc.spec b/rtems4.10/arm/rtems-4.10-arm-rtems4.10-gcc.spec
index 8239435..cf2e19c 100644
--- a/rtems4.10/arm/rtems-4.10-arm-rtems4.10-gcc.spec
+++ b/rtems4.10/arm/rtems-4.10-arm-rtems4.10-gcc.spec
@@ -58,14 +58,17 @@ Summary:      	arm-rtems4.10 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	4%{?dist}
+Release:      	5%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%{?el5:BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)}
 
 %define _use_internal_dependency_generator 0
 
 BuildRequires:  %{_host_rpmprefix}gcc
+%if "%{gcc_version}" >= "4.8.0"
+BuildRequires:  %{_host_rpmprefix}gcc-c++
+%endif
 
 # FIXME: Disable lto for now, to avoid dependencies on libelf
 %bcond_with lto
@@ -100,6 +103,12 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global libelf_version  0.8.13
 
 # versions of libraries these distros are known to ship
+%if 0%{?fc20}
+%global mpc_provided 1.0.1
+%global mpfr_provided 3.1.2
+%global gmp_provided 5.1.2
+%endif
+
 %if 0%{?fc19}
 %global mpc_provided 1.0.1
 %global mpfr_provided 3.1.1
@@ -112,12 +121,6 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global gmp_provided 5.0.5
 %endif
 
-%if 0%{?fc17}
-%global mpc_provided 0.9
-%global mpfr_provided 3.1.0
-%global gmp_provided 5.0.2
-%endif
-
 %if 0%{?el6}
 %global mpc_provided 0.8
 %global mpfr_provided 2.4.1
@@ -142,12 +145,6 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global gmp_provided 5.0.5
 %endif
 
-%if 0%{?suse12_1}
-%global mpc_provided 0.8.2
-%global mpfr_provided 3.0.1
-%global gmp_provided 5.0.2
-%endif
-
 %if 0%{?cygwin}
 %global mpc_provided 0.8
 %global mpfr_provided 2.4.1
@@ -244,6 +241,9 @@ BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
 
 %if "%{_build}" != "%{_host}"
 BuildRequires:  rtems-4.10-arm-rtems4.10-gcc = %{gcc_rpmvers}
+%if "%{gcc_version}" >= "4.8.0"
+BuildRequires:  rtems-4.10-arm-rtems4.10-gcc-c++ = %{gcc_rpmvers}
+%endif
 %endif
 
 # Not strictly required, but patches may introduce a need to use them.
@@ -256,7 +256,7 @@ BuildRequires:	rtems-4.10-arm-rtems4.10-binutils
 Requires:	rtems-4.10-gcc-common
 Requires:	rtems-4.10-arm-rtems4.10-binutils
 Requires:	rtems-4.10-arm-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.10-arm-rtems4.10-newlib = %{newlib_version}-32%{?dist}
+Requires:	rtems-4.10-arm-rtems4.10-newlib = %{newlib_version}-33%{?dist}
 
 %if "%{gcc_version}" >= "4.5.0"
 BuildRequires:  zlib-devel
@@ -360,7 +360,7 @@ cd ..
   ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
 %endif
 
-echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-32%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-5%{?dist}/newlib-%{newlib_version}-33%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -642,7 +642,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.10-arm-rtems4.10-binutils
-# Requires:       rtems-4.10-arm-rtems4.10-newlib = %{newlib_version}-32%{?dist}
+# Requires:       rtems-4.10-arm-rtems4.10-newlib = %{newlib_version}-33%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -660,7 +660,7 @@ Summary:        libgcc for arm-rtems4.10-gcc
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 %{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.10-arm-rtems4.10-newlib = %{newlib_version}-32%{?dist}
+Requires:       rtems-4.10-arm-rtems4.10-newlib = %{newlib_version}-33%{?dist}
 License:	GPL
 
 %description -n rtems-4.10-arm-rtems4.10-gcc-libgcc
@@ -845,7 +845,7 @@ Summary:      	C Library (newlib) for arm-rtems4.10
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        32%{?dist}
+Release:        33%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.10-newlib-common
@@ -866,7 +866,7 @@ Newlib C Library for arm-rtems4.10.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        32%{?dist}
+Release:        33%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable
 
diff --git a/rtems4.10/avr/Makefile.in b/rtems4.10/avr/Makefile.in
index b74dca1..75909f2 100644
--- a/rtems4.10/avr/Makefile.in
+++ b/rtems4.10/avr/Makefile.in
@@ -238,7 +238,7 @@ BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/binutils/base-binutils.add
 GCC_VERS = 4.4.7
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 4
+GCC_RPMREL = 5
 NEWLIB_VERS = 1.18.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
 NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 28`
diff --git a/rtems4.10/avr/rtems-4.10-avr-rtems4.10-gcc.spec b/rtems4.10/avr/rtems-4.10-avr-rtems4.10-gcc.spec
index 4ab0d7e..612d0e1 100644
--- a/rtems4.10/avr/rtems-4.10-avr-rtems4.10-gcc.spec
+++ b/rtems4.10/avr/rtems-4.10-avr-rtems4.10-gcc.spec
@@ -58,14 +58,17 @@ Summary:      	avr-rtems4.10 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	4%{?dist}
+Release:      	5%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%{?el5:BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)}
 
 %define _use_internal_dependency_generator 0
 
 BuildRequires:  %{_host_rpmprefix}gcc
+%if "%{gcc_version}" >= "4.8.0"
+BuildRequires:  %{_host_rpmprefix}gcc-c++
+%endif
 
 # FIXME: Disable lto for now, to avoid dependencies on libelf
 %bcond_with lto
@@ -100,6 +103,12 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global libelf_version  0.8.13
 
 # versions of libraries these distros are known to ship
+%if 0%{?fc20}
+%global mpc_provided 1.0.1
+%global mpfr_provided 3.1.2
+%global gmp_provided 5.1.2
+%endif
+
 %if 0%{?fc19}
 %global mpc_provided 1.0.1
 %global mpfr_provided 3.1.1
@@ -112,12 +121,6 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global gmp_provided 5.0.5
 %endif
 
-%if 0%{?fc17}
-%global mpc_provided 0.9
-%global mpfr_provided 3.1.0
-%global gmp_provided 5.0.2
-%endif
-
 %if 0%{?el6}
 %global mpc_provided 0.8
 %global mpfr_provided 2.4.1
@@ -142,12 +145,6 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global gmp_provided 5.0.5
 %endif
 
-%if 0%{?suse12_1}
-%global mpc_provided 0.8.2
-%global mpfr_provided 3.0.1
-%global gmp_provided 5.0.2
-%endif
-
 %if 0%{?cygwin}
 %global mpc_provided 0.8
 %global mpfr_provided 2.4.1
@@ -244,6 +241,9 @@ BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
 
 %if "%{_build}" != "%{_host}"
 BuildRequires:  rtems-4.10-avr-rtems4.10-gcc = %{gcc_rpmvers}
+%if "%{gcc_version}" >= "4.8.0"
+BuildRequires:  rtems-4.10-avr-rtems4.10-gcc-c++ = %{gcc_rpmvers}
+%endif
 %endif
 
 # Not strictly required, but patches may introduce a need to use them.
@@ -256,7 +256,7 @@ BuildRequires:	rtems-4.10-avr-rtems4.10-binutils
 Requires:	rtems-4.10-gcc-common
 Requires:	rtems-4.10-avr-rtems4.10-binutils
 Requires:	rtems-4.10-avr-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.10-avr-rtems4.10-newlib = %{newlib_version}-32%{?dist}
+Requires:	rtems-4.10-avr-rtems4.10-newlib = %{newlib_version}-33%{?dist}
 
 %if "%{gcc_version}" >= "4.5.0"
 BuildRequires:  zlib-devel
@@ -356,7 +356,7 @@ cd ..
   ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
 %endif
 
-echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-32%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-5%{?dist}/newlib-%{newlib_version}-33%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -637,7 +637,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.10-avr-rtems4.10-binutils
-# Requires:       rtems-4.10-avr-rtems4.10-newlib = %{newlib_version}-32%{?dist}
+# Requires:       rtems-4.10-avr-rtems4.10-newlib = %{newlib_version}-33%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -655,7 +655,7 @@ Summary:        libgcc for avr-rtems4.10-gcc
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 %{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.10-avr-rtems4.10-newlib = %{newlib_version}-32%{?dist}
+Requires:       rtems-4.10-avr-rtems4.10-newlib = %{newlib_version}-33%{?dist}
 License:	GPL
 
 %description -n rtems-4.10-avr-rtems4.10-gcc-libgcc
@@ -779,7 +779,7 @@ Summary:      	C Library (newlib) for avr-rtems4.10
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        32%{?dist}
+Release:        33%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.10-newlib-common
@@ -800,7 +800,7 @@ Newlib C Library for avr-rtems4.10.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        32%{?dist}
+Release:        33%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable
 
diff --git a/rtems4.10/bfin/Makefile.in b/rtems4.10/bfin/Makefile.in
index d415c09..fabbeec 100644
--- a/rtems4.10/bfin/Makefile.in
+++ b/rtems4.10/bfin/Makefile.in
@@ -238,7 +238,7 @@ BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/binutils/base-binutils.add
 GCC_VERS = 4.4.7
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 4
+GCC_RPMREL = 5
 NEWLIB_VERS = 1.18.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
 NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 28`
diff --git a/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-gcc.spec b/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-gcc.spec
index 49103a4..c932a17 100644
--- a/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-gcc.spec
+++ b/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-gcc.spec
@@ -58,14 +58,17 @@ Summary:      	bfin-rtems4.10 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	4%{?dist}
+Release:      	5%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%{?el5:BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)}
 
 %define _use_internal_dependency_generator 0
 
 BuildRequires:  %{_host_rpmprefix}gcc
+%if "%{gcc_version}" >= "4.8.0"
+BuildRequires:  %{_host_rpmprefix}gcc-c++
+%endif
 
 # FIXME: Disable lto for now, to avoid dependencies on libelf
 %bcond_with lto
@@ -100,6 +103,12 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global libelf_version  0.8.13
 
 # versions of libraries these distros are known to ship
+%if 0%{?fc20}
+%global mpc_provided 1.0.1
+%global mpfr_provided 3.1.2
+%global gmp_provided 5.1.2
+%endif
+
 %if 0%{?fc19}
 %global mpc_provided 1.0.1
 %global mpfr_provided 3.1.1
@@ -112,12 +121,6 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global gmp_provided 5.0.5
 %endif
 
-%if 0%{?fc17}
-%global mpc_provided 0.9
-%global mpfr_provided 3.1.0
-%global gmp_provided 5.0.2
-%endif
-
 %if 0%{?el6}
 %global mpc_provided 0.8
 %global mpfr_provided 2.4.1
@@ -142,12 +145,6 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global gmp_provided 5.0.5
 %endif
 
-%if 0%{?suse12_1}
-%global mpc_provided 0.8.2
-%global mpfr_provided 3.0.1
-%global gmp_provided 5.0.2
-%endif
-
 %if 0%{?cygwin}
 %global mpc_provided 0.8
 %global mpfr_provided 2.4.1
@@ -244,6 +241,9 @@ BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
 
 %if "%{_build}" != "%{_host}"
 BuildRequires:  rtems-4.10-bfin-rtems4.10-gcc = %{gcc_rpmvers}
+%if "%{gcc_version}" >= "4.8.0"
+BuildRequires:  rtems-4.10-bfin-rtems4.10-gcc-c++ = %{gcc_rpmvers}
+%endif
 %endif
 
 # Not strictly required, but patches may introduce a need to use them.
@@ -256,7 +256,7 @@ BuildRequires:	rtems-4.10-bfin-rtems4.10-binutils
 Requires:	rtems-4.10-gcc-common
 Requires:	rtems-4.10-bfin-rtems4.10-binutils
 Requires:	rtems-4.10-bfin-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.10-bfin-rtems4.10-newlib = %{newlib_version}-32%{?dist}
+Requires:	rtems-4.10-bfin-rtems4.10-newlib = %{newlib_version}-33%{?dist}
 
 %if "%{gcc_version}" >= "4.5.0"
 BuildRequires:  zlib-devel
@@ -360,7 +360,7 @@ cd ..
   ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
 %endif
 
-echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-32%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-5%{?dist}/newlib-%{newlib_version}-33%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -642,7 +642,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.10-bfin-rtems4.10-binutils
-# Requires:       rtems-4.10-bfin-rtems4.10-newlib = %{newlib_version}-32%{?dist}
+# Requires:       rtems-4.10-bfin-rtems4.10-newlib = %{newlib_version}-33%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -660,7 +660,7 @@ Summary:        libgcc for bfin-rtems4.10-gcc
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 %{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.10-bfin-rtems4.10-newlib = %{newlib_version}-32%{?dist}
+Requires:       rtems-4.10-bfin-rtems4.10-newlib = %{newlib_version}-33%{?dist}
 License:	GPL
 
 %description -n rtems-4.10-bfin-rtems4.10-gcc-libgcc
@@ -845,7 +845,7 @@ Summary:      	C Library (newlib) for bfin-rtems4.10
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        32%{?dist}
+Release:        33%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.10-newlib-common
@@ -866,7 +866,7 @@ Newlib C Library for bfin-rtems4.10.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        32%{?dist}
+Release:        33%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable
 
diff --git a/rtems4.10/h8300/Makefile.in b/rtems4.10/h8300/Makefile.in
index 721bb68..a3a60fc 100644
--- a/rtems4.10/h8300/Makefile.in
+++ b/rtems4.10/h8300/Makefile.in
@@ -238,7 +238,7 @@ BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/binutils/base-binutils.add
 GCC_VERS = 4.4.7
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 4
+GCC_RPMREL = 5
 NEWLIB_VERS = 1.18.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
 NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 28`
diff --git a/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-gcc.spec b/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-gcc.spec
index 7a0a7fd..71d29af 100644
--- a/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-gcc.spec
+++ b/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-gcc.spec
@@ -58,14 +58,17 @@ Summary:      	h8300-rtems4.10 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	4%{?dist}
+Release:      	5%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%{?el5:BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)}
 
 %define _use_internal_dependency_generator 0
 
 BuildRequires:  %{_host_rpmprefix}gcc
+%if "%{gcc_version}" >= "4.8.0"
+BuildRequires:  %{_host_rpmprefix}gcc-c++
+%endif
 
 # FIXME: Disable lto for now, to avoid dependencies on libelf
 %bcond_with lto
@@ -100,6 +103,12 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global libelf_version  0.8.13
 
 # versions of libraries these distros are known to ship
+%if 0%{?fc20}
+%global mpc_provided 1.0.1
+%global mpfr_provided 3.1.2
+%global gmp_provided 5.1.2
+%endif
+
 %if 0%{?fc19}
 %global mpc_provided 1.0.1
 %global mpfr_provided 3.1.1
@@ -112,12 +121,6 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global gmp_provided 5.0.5
 %endif
 
-%if 0%{?fc17}
-%global mpc_provided 0.9
-%global mpfr_provided 3.1.0
-%global gmp_provided 5.0.2
-%endif
-
 %if 0%{?el6}
 %global mpc_provided 0.8
 %global mpfr_provided 2.4.1
@@ -142,12 +145,6 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global gmp_provided 5.0.5
 %endif
 
-%if 0%{?suse12_1}
-%global mpc_provided 0.8.2
-%global mpfr_provided 3.0.1
-%global gmp_provided 5.0.2
-%endif
-
 %if 0%{?cygwin}
 %global mpc_provided 0.8
 %global mpfr_provided 2.4.1
@@ -244,6 +241,9 @@ BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
 
 %if "%{_build}" != "%{_host}"
 BuildRequires:  rtems-4.10-h8300-rtems4.10-gcc = %{gcc_rpmvers}
+%if "%{gcc_version}" >= "4.8.0"
+BuildRequires:  rtems-4.10-h8300-rtems4.10-gcc-c++ = %{gcc_rpmvers}
+%endif
 %endif
 
 # Not strictly required, but patches may introduce a need to use them.
@@ -256,7 +256,7 @@ BuildRequires:	rtems-4.10-h8300-rtems4.10-binutils
 Requires:	rtems-4.10-gcc-common
 Requires:	rtems-4.10-h8300-rtems4.10-binutils
 Requires:	rtems-4.10-h8300-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.10-h8300-rtems4.10-newlib = %{newlib_version}-32%{?dist}
+Requires:	rtems-4.10-h8300-rtems4.10-newlib = %{newlib_version}-33%{?dist}
 
 %if "%{gcc_version}" >= "4.5.0"
 BuildRequires:  zlib-devel
@@ -360,7 +360,7 @@ cd ..
   ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
 %endif
 
-echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-32%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-5%{?dist}/newlib-%{newlib_version}-33%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -642,7 +642,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.10-h8300-rtems4.10-binutils
-# Requires:       rtems-4.10-h8300-rtems4.10-newlib = %{newlib_version}-32%{?dist}
+# Requires:       rtems-4.10-h8300-rtems4.10-newlib = %{newlib_version}-33%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -660,7 +660,7 @@ Summary:        libgcc for h8300-rtems4.10-gcc
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 %{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.10-h8300-rtems4.10-newlib = %{newlib_version}-32%{?dist}
+Requires:       rtems-4.10-h8300-rtems4.10-newlib = %{newlib_version}-33%{?dist}
 License:	GPL
 
 %description -n rtems-4.10-h8300-rtems4.10-gcc-libgcc
@@ -845,7 +845,7 @@ Summary:      	C Library (newlib) for h8300-rtems4.10
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        32%{?dist}
+Release:        33%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.10-newlib-common
@@ -866,7 +866,7 @@ Newlib C Library for h8300-rtems4.10.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        32%{?dist}
+Release:        33%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable
 
diff --git a/rtems4.10/i386/Makefile.in b/rtems4.10/i386/Makefile.in
index c848939..8a0932e 100644
--- a/rtems4.10/i386/Makefile.in
+++ b/rtems4.10/i386/Makefile.in
@@ -238,7 +238,7 @@ BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/binutils/base-binutils.add
 GCC_VERS = 4.4.7
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 4
+GCC_RPMREL = 5
 NEWLIB_VERS = 1.18.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
 NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 28`
diff --git a/rtems4.10/i386/rtems-4.10-i386-rtems4.10-gcc.spec b/rtems4.10/i386/rtems-4.10-i386-rtems4.10-gcc.spec
index 9cffce8..b731d48 100644
--- a/rtems4.10/i386/rtems-4.10-i386-rtems4.10-gcc.spec
+++ b/rtems4.10/i386/rtems-4.10-i386-rtems4.10-gcc.spec
@@ -58,14 +58,17 @@ Summary:      	i386-rtems4.10 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	4%{?dist}
+Release:      	5%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%{?el5:BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)}
 
 %define _use_internal_dependency_generator 0
 
 BuildRequires:  %{_host_rpmprefix}gcc
+%if "%{gcc_version}" >= "4.8.0"
+BuildRequires:  %{_host_rpmprefix}gcc-c++
+%endif
 
 # FIXME: Disable lto for now, to avoid dependencies on libelf
 %bcond_with lto
@@ -100,6 +103,12 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global libelf_version  0.8.13
 
 # versions of libraries these distros are known to ship
+%if 0%{?fc20}
+%global mpc_provided 1.0.1
+%global mpfr_provided 3.1.2
+%global gmp_provided 5.1.2
+%endif
+
 %if 0%{?fc19}
 %global mpc_provided 1.0.1
 %global mpfr_provided 3.1.1
@@ -112,12 +121,6 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global gmp_provided 5.0.5
 %endif
 
-%if 0%{?fc17}
-%global mpc_provided 0.9
-%global mpfr_provided 3.1.0
-%global gmp_provided 5.0.2
-%endif
-
 %if 0%{?el6}
 %global mpc_provided 0.8
 %global mpfr_provided 2.4.1
@@ -142,12 +145,6 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global gmp_provided 5.0.5
 %endif
 
-%if 0%{?suse12_1}
-%global mpc_provided 0.8.2
-%global mpfr_provided 3.0.1
-%global gmp_provided 5.0.2
-%endif
-
 %if 0%{?cygwin}
 %global mpc_provided 0.8
 %global mpfr_provided 2.4.1
@@ -244,6 +241,9 @@ BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
 
 %if "%{_build}" != "%{_host}"
 BuildRequires:  rtems-4.10-i386-rtems4.10-gcc = %{gcc_rpmvers}
+%if "%{gcc_version}" >= "4.8.0"
+BuildRequires:  rtems-4.10-i386-rtems4.10-gcc-c++ = %{gcc_rpmvers}
+%endif
 %endif
 
 # Not strictly required, but patches may introduce a need to use them.
@@ -256,7 +256,7 @@ BuildRequires:	rtems-4.10-i386-rtems4.10-binutils
 Requires:	rtems-4.10-gcc-common
 Requires:	rtems-4.10-i386-rtems4.10-binutils
 Requires:	rtems-4.10-i386-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.10-i386-rtems4.10-newlib = %{newlib_version}-32%{?dist}
+Requires:	rtems-4.10-i386-rtems4.10-newlib = %{newlib_version}-33%{?dist}
 
 %if "%{gcc_version}" >= "4.5.0"
 BuildRequires:  zlib-devel
@@ -360,7 +360,7 @@ cd ..
   ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
 %endif
 
-echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-32%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-5%{?dist}/newlib-%{newlib_version}-33%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -642,7 +642,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.10-i386-rtems4.10-binutils
-# Requires:       rtems-4.10-i386-rtems4.10-newlib = %{newlib_version}-32%{?dist}
+# Requires:       rtems-4.10-i386-rtems4.10-newlib = %{newlib_version}-33%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -660,7 +660,7 @@ Summary:        libgcc for i386-rtems4.10-gcc
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 %{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.10-i386-rtems4.10-newlib = %{newlib_version}-32%{?dist}
+Requires:       rtems-4.10-i386-rtems4.10-newlib = %{newlib_version}-33%{?dist}
 License:	GPL
 
 %description -n rtems-4.10-i386-rtems4.10-gcc-libgcc
@@ -845,7 +845,7 @@ Summary:      	C Library (newlib) for i386-rtems4.10
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        32%{?dist}
+Release:        33%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.10-newlib-common
@@ -866,7 +866,7 @@ Newlib C Library for i386-rtems4.10.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        32%{?dist}
+Release:        33%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable
 
diff --git a/rtems4.10/lm32/Makefile.in b/rtems4.10/lm32/Makefile.in
index 7c1a429..10644d7 100644
--- a/rtems4.10/lm32/Makefile.in
+++ b/rtems4.10/lm32/Makefile.in
@@ -238,7 +238,7 @@ BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/binutils/base-binutils.add
 GCC_VERS = 4.4.7
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 4
+GCC_RPMREL = 5
 NEWLIB_VERS = 1.18.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
 NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 28`
diff --git a/rtems4.10/lm32/rtems-4.10-lm32-rtems4.10-gcc.spec b/rtems4.10/lm32/rtems-4.10-lm32-rtems4.10-gcc.spec
index 5d82053..5b5b9b0 100644
--- a/rtems4.10/lm32/rtems-4.10-lm32-rtems4.10-gcc.spec
+++ b/rtems4.10/lm32/rtems-4.10-lm32-rtems4.10-gcc.spec
@@ -58,14 +58,17 @@ Summary:      	lm32-rtems4.10 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	4%{?dist}
+Release:      	5%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%{?el5:BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)}
 
 %define _use_internal_dependency_generator 0
 
 BuildRequires:  %{_host_rpmprefix}gcc
+%if "%{gcc_version}" >= "4.8.0"
+BuildRequires:  %{_host_rpmprefix}gcc-c++
+%endif
 
 # FIXME: Disable lto for now, to avoid dependencies on libelf
 %bcond_with lto
@@ -100,6 +103,12 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global libelf_version  0.8.13
 
 # versions of libraries these distros are known to ship
+%if 0%{?fc20}
+%global mpc_provided 1.0.1
+%global mpfr_provided 3.1.2
+%global gmp_provided 5.1.2
+%endif
+
 %if 0%{?fc19}
 %global mpc_provided 1.0.1
 %global mpfr_provided 3.1.1
@@ -112,12 +121,6 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global gmp_provided 5.0.5
 %endif
 
-%if 0%{?fc17}
-%global mpc_provided 0.9
-%global mpfr_provided 3.1.0
-%global gmp_provided 5.0.2
-%endif
-
 %if 0%{?el6}
 %global mpc_provided 0.8
 %global mpfr_provided 2.4.1
@@ -142,12 +145,6 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global gmp_provided 5.0.5
 %endif
 
-%if 0%{?suse12_1}
-%global mpc_provided 0.8.2
-%global mpfr_provided 3.0.1
-%global gmp_provided 5.0.2
-%endif
-
 %if 0%{?cygwin}
 %global mpc_provided 0.8
 %global mpfr_provided 2.4.1
@@ -244,6 +241,9 @@ BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
 
 %if "%{_build}" != "%{_host}"
 BuildRequires:  rtems-4.10-lm32-rtems4.10-gcc = %{gcc_rpmvers}
+%if "%{gcc_version}" >= "4.8.0"
+BuildRequires:  rtems-4.10-lm32-rtems4.10-gcc-c++ = %{gcc_rpmvers}
+%endif
 %endif
 
 # Not strictly required, but patches may introduce a need to use them.
@@ -256,7 +256,7 @@ BuildRequires:	rtems-4.10-lm32-rtems4.10-binutils
 Requires:	rtems-4.10-gcc-common
 Requires:	rtems-4.10-lm32-rtems4.10-binutils
 Requires:	rtems-4.10-lm32-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.10-lm32-rtems4.10-newlib = %{newlib_version}-32%{?dist}
+Requires:	rtems-4.10-lm32-rtems4.10-newlib = %{newlib_version}-33%{?dist}
 
 %if "%{gcc_version}" >= "4.5.0"
 BuildRequires:  zlib-devel
@@ -360,7 +360,7 @@ cd ..
   ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
 %endif
 
-echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-32%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-5%{?dist}/newlib-%{newlib_version}-33%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -642,7 +642,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.10-lm32-rtems4.10-binutils
-# Requires:       rtems-4.10-lm32-rtems4.10-newlib = %{newlib_version}-32%{?dist}
+# Requires:       rtems-4.10-lm32-rtems4.10-newlib = %{newlib_version}-33%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -660,7 +660,7 @@ Summary:        libgcc for lm32-rtems4.10-gcc
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 %{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.10-lm32-rtems4.10-newlib = %{newlib_version}-32%{?dist}
+Requires:       rtems-4.10-lm32-rtems4.10-newlib = %{newlib_version}-33%{?dist}
 License:	GPL
 
 %description -n rtems-4.10-lm32-rtems4.10-gcc-libgcc
@@ -845,7 +845,7 @@ Summary:      	C Library (newlib) for lm32-rtems4.10
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        32%{?dist}
+Release:        33%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.10-newlib-common
@@ -866,7 +866,7 @@ Newlib C Library for lm32-rtems4.10.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        32%{?dist}
+Release:        33%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable
 
diff --git a/rtems4.10/m32c/Makefile.in b/rtems4.10/m32c/Makefile.in
index 00b835a..2a77bda 100644
--- a/rtems4.10/m32c/Makefile.in
+++ b/rtems4.10/m32c/Makefile.in
@@ -238,7 +238,7 @@ BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/binutils/base-binutils.add
 GCC_VERS = 4.4.7
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 4
+GCC_RPMREL = 5
 NEWLIB_VERS = 1.18.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
 NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 28`
diff --git a/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-gcc.spec b/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-gcc.spec
index 4fb43ac..2ecfd68 100644
--- a/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-gcc.spec
+++ b/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-gcc.spec
@@ -58,14 +58,17 @@ Summary:      	m32c-rtems4.10 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	4%{?dist}
+Release:      	5%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%{?el5:BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)}
 
 %define _use_internal_dependency_generator 0
 
 BuildRequires:  %{_host_rpmprefix}gcc
+%if "%{gcc_version}" >= "4.8.0"
+BuildRequires:  %{_host_rpmprefix}gcc-c++
+%endif
 
 # FIXME: Disable lto for now, to avoid dependencies on libelf
 %bcond_with lto
@@ -100,6 +103,12 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global libelf_version  0.8.13
 
 # versions of libraries these distros are known to ship
+%if 0%{?fc20}
+%global mpc_provided 1.0.1
+%global mpfr_provided 3.1.2
+%global gmp_provided 5.1.2
+%endif
+
 %if 0%{?fc19}
 %global mpc_provided 1.0.1
 %global mpfr_provided 3.1.1
@@ -112,12 +121,6 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global gmp_provided 5.0.5
 %endif
 
-%if 0%{?fc17}
-%global mpc_provided 0.9
-%global mpfr_provided 3.1.0
-%global gmp_provided 5.0.2
-%endif
-
 %if 0%{?el6}
 %global mpc_provided 0.8
 %global mpfr_provided 2.4.1
@@ -142,12 +145,6 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global gmp_provided 5.0.5
 %endif
 
-%if 0%{?suse12_1}
-%global mpc_provided 0.8.2
-%global mpfr_provided 3.0.1
-%global gmp_provided 5.0.2
-%endif
-
 %if 0%{?cygwin}
 %global mpc_provided 0.8
 %global mpfr_provided 2.4.1
@@ -244,6 +241,9 @@ BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
 
 %if "%{_build}" != "%{_host}"
 BuildRequires:  rtems-4.10-m32c-rtems4.10-gcc = %{gcc_rpmvers}
+%if "%{gcc_version}" >= "4.8.0"
+BuildRequires:  rtems-4.10-m32c-rtems4.10-gcc-c++ = %{gcc_rpmvers}
+%endif
 %endif
 
 # Not strictly required, but patches may introduce a need to use them.
@@ -256,7 +256,7 @@ BuildRequires:	rtems-4.10-m32c-rtems4.10-binutils
 Requires:	rtems-4.10-gcc-common
 Requires:	rtems-4.10-m32c-rtems4.10-binutils
 Requires:	rtems-4.10-m32c-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.10-m32c-rtems4.10-newlib = %{newlib_version}-32%{?dist}
+Requires:	rtems-4.10-m32c-rtems4.10-newlib = %{newlib_version}-33%{?dist}
 
 %if "%{gcc_version}" >= "4.5.0"
 BuildRequires:  zlib-devel
@@ -356,7 +356,7 @@ cd ..
   ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
 %endif
 
-echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-32%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-5%{?dist}/newlib-%{newlib_version}-33%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -637,7 +637,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.10-m32c-rtems4.10-binutils
-# Requires:       rtems-4.10-m32c-rtems4.10-newlib = %{newlib_version}-32%{?dist}
+# Requires:       rtems-4.10-m32c-rtems4.10-newlib = %{newlib_version}-33%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -655,7 +655,7 @@ Summary:        libgcc for m32c-rtems4.10-gcc
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 %{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.10-m32c-rtems4.10-newlib = %{newlib_version}-32%{?dist}
+Requires:       rtems-4.10-m32c-rtems4.10-newlib = %{newlib_version}-33%{?dist}
 License:	GPL
 
 %description -n rtems-4.10-m32c-rtems4.10-gcc-libgcc
@@ -780,7 +780,7 @@ Summary:      	C Library (newlib) for m32c-rtems4.10
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        32%{?dist}
+Release:        33%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.10-newlib-common
@@ -801,7 +801,7 @@ Newlib C Library for m32c-rtems4.10.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        32%{?dist}
+Release:        33%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable
 
diff --git a/rtems4.10/m32r/Makefile.in b/rtems4.10/m32r/Makefile.in
index 6fa3063..e85369c 100644
--- a/rtems4.10/m32r/Makefile.in
+++ b/rtems4.10/m32r/Makefile.in
@@ -238,7 +238,7 @@ BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/binutils/base-binutils.add
 GCC_VERS = 4.4.7
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 4
+GCC_RPMREL = 5
 NEWLIB_VERS = 1.18.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
 NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 28`
diff --git a/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-gcc.spec b/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-gcc.spec
index a40580f..67173ca 100644
--- a/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-gcc.spec
+++ b/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-gcc.spec
@@ -58,14 +58,17 @@ Summary:      	m32r-rtems4.10 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	4%{?dist}
+Release:      	5%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%{?el5:BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)}
 
 %define _use_internal_dependency_generator 0
 
 BuildRequires:  %{_host_rpmprefix}gcc
+%if "%{gcc_version}" >= "4.8.0"
+BuildRequires:  %{_host_rpmprefix}gcc-c++
+%endif
 
 # FIXME: Disable lto for now, to avoid dependencies on libelf
 %bcond_with lto
@@ -100,6 +103,12 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global libelf_version  0.8.13
 
 # versions of libraries these distros are known to ship
+%if 0%{?fc20}
+%global mpc_provided 1.0.1
+%global mpfr_provided 3.1.2
+%global gmp_provided 5.1.2
+%endif
+
 %if 0%{?fc19}
 %global mpc_provided 1.0.1
 %global mpfr_provided 3.1.1
@@ -112,12 +121,6 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global gmp_provided 5.0.5
 %endif
 
-%if 0%{?fc17}
-%global mpc_provided 0.9
-%global mpfr_provided 3.1.0
-%global gmp_provided 5.0.2
-%endif
-
 %if 0%{?el6}
 %global mpc_provided 0.8
 %global mpfr_provided 2.4.1
@@ -142,12 +145,6 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global gmp_provided 5.0.5
 %endif
 
-%if 0%{?suse12_1}
-%global mpc_provided 0.8.2
-%global mpfr_provided 3.0.1
-%global gmp_provided 5.0.2
-%endif
-
 %if 0%{?cygwin}
 %global mpc_provided 0.8
 %global mpfr_provided 2.4.1
@@ -244,6 +241,9 @@ BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
 
 %if "%{_build}" != "%{_host}"
 BuildRequires:  rtems-4.10-m32r-rtems4.10-gcc = %{gcc_rpmvers}
+%if "%{gcc_version}" >= "4.8.0"
+BuildRequires:  rtems-4.10-m32r-rtems4.10-gcc-c++ = %{gcc_rpmvers}
+%endif
 %endif
 
 # Not strictly required, but patches may introduce a need to use them.
@@ -256,7 +256,7 @@ BuildRequires:	rtems-4.10-m32r-rtems4.10-binutils
 Requires:	rtems-4.10-gcc-common
 Requires:	rtems-4.10-m32r-rtems4.10-binutils
 Requires:	rtems-4.10-m32r-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.10-m32r-rtems4.10-newlib = %{newlib_version}-32%{?dist}
+Requires:	rtems-4.10-m32r-rtems4.10-newlib = %{newlib_version}-33%{?dist}
 
 %if "%{gcc_version}" >= "4.5.0"
 BuildRequires:  zlib-devel
@@ -356,7 +356,7 @@ cd ..
   ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
 %endif
 
-echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-32%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-5%{?dist}/newlib-%{newlib_version}-33%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -637,7 +637,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.10-m32r-rtems4.10-binutils
-# Requires:       rtems-4.10-m32r-rtems4.10-newlib = %{newlib_version}-32%{?dist}
+# Requires:       rtems-4.10-m32r-rtems4.10-newlib = %{newlib_version}-33%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -655,7 +655,7 @@ Summary:        libgcc for m32r-rtems4.10-gcc
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 %{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.10-m32r-rtems4.10-newlib = %{newlib_version}-32%{?dist}
+Requires:       rtems-4.10-m32r-rtems4.10-newlib = %{newlib_version}-33%{?dist}
 License:	GPL
 
 %description -n rtems-4.10-m32r-rtems4.10-gcc-libgcc
@@ -780,7 +780,7 @@ Summary:      	C Library (newlib) for m32r-rtems4.10
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        32%{?dist}
+Release:        33%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.10-newlib-common
@@ -801,7 +801,7 @@ Newlib C Library for m32r-rtems4.10.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        32%{?dist}
+Release:        33%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable
 
diff --git a/rtems4.10/m68k/Makefile.in b/rtems4.10/m68k/Makefile.in
index ebab285..364a192 100644
--- a/rtems4.10/m68k/Makefile.in
+++ b/rtems4.10/m68k/Makefile.in
@@ -238,7 +238,7 @@ BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/binutils/base-binutils.add
 GCC_VERS = 4.4.7
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 4
+GCC_RPMREL = 5
 NEWLIB_VERS = 1.18.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
 NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 28`
diff --git a/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-gcc.spec b/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-gcc.spec
index 9d7fbcc..7a9cd56 100644
--- a/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-gcc.spec
+++ b/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-gcc.spec
@@ -58,14 +58,17 @@ Summary:      	m68k-rtems4.10 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	4%{?dist}
+Release:      	5%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%{?el5:BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)}
 
 %define _use_internal_dependency_generator 0
 
 BuildRequires:  %{_host_rpmprefix}gcc
+%if "%{gcc_version}" >= "4.8.0"
+BuildRequires:  %{_host_rpmprefix}gcc-c++
+%endif
 
 # FIXME: Disable lto for now, to avoid dependencies on libelf
 %bcond_with lto
@@ -100,6 +103,12 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global libelf_version  0.8.13
 
 # versions of libraries these distros are known to ship
+%if 0%{?fc20}
+%global mpc_provided 1.0.1
+%global mpfr_provided 3.1.2
+%global gmp_provided 5.1.2
+%endif
+
 %if 0%{?fc19}
 %global mpc_provided 1.0.1
 %global mpfr_provided 3.1.1
@@ -112,12 +121,6 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global gmp_provided 5.0.5
 %endif
 
-%if 0%{?fc17}
-%global mpc_provided 0.9
-%global mpfr_provided 3.1.0
-%global gmp_provided 5.0.2
-%endif
-
 %if 0%{?el6}
 %global mpc_provided 0.8
 %global mpfr_provided 2.4.1
@@ -142,12 +145,6 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global gmp_provided 5.0.5
 %endif
 
-%if 0%{?suse12_1}
-%global mpc_provided 0.8.2
-%global mpfr_provided 3.0.1
-%global gmp_provided 5.0.2
-%endif
-
 %if 0%{?cygwin}
 %global mpc_provided 0.8
 %global mpfr_provided 2.4.1
@@ -244,6 +241,9 @@ BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
 
 %if "%{_build}" != "%{_host}"
 BuildRequires:  rtems-4.10-m68k-rtems4.10-gcc = %{gcc_rpmvers}
+%if "%{gcc_version}" >= "4.8.0"
+BuildRequires:  rtems-4.10-m68k-rtems4.10-gcc-c++ = %{gcc_rpmvers}
+%endif
 %endif
 
 # Not strictly required, but patches may introduce a need to use them.
@@ -256,7 +256,7 @@ BuildRequires:	rtems-4.10-m68k-rtems4.10-binutils
 Requires:	rtems-4.10-gcc-common
 Requires:	rtems-4.10-m68k-rtems4.10-binutils
 Requires:	rtems-4.10-m68k-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.10-m68k-rtems4.10-newlib = %{newlib_version}-32%{?dist}
+Requires:	rtems-4.10-m68k-rtems4.10-newlib = %{newlib_version}-33%{?dist}
 
 %if "%{gcc_version}" >= "4.5.0"
 BuildRequires:  zlib-devel
@@ -360,7 +360,7 @@ cd ..
   ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
 %endif
 
-echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-32%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-5%{?dist}/newlib-%{newlib_version}-33%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -642,7 +642,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.10-m68k-rtems4.10-binutils
-# Requires:       rtems-4.10-m68k-rtems4.10-newlib = %{newlib_version}-32%{?dist}
+# Requires:       rtems-4.10-m68k-rtems4.10-newlib = %{newlib_version}-33%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -660,7 +660,7 @@ Summary:        libgcc for m68k-rtems4.10-gcc
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 %{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.10-m68k-rtems4.10-newlib = %{newlib_version}-32%{?dist}
+Requires:       rtems-4.10-m68k-rtems4.10-newlib = %{newlib_version}-33%{?dist}
 License:	GPL
 
 %description -n rtems-4.10-m68k-rtems4.10-gcc-libgcc
@@ -845,7 +845,7 @@ Summary:      	C Library (newlib) for m68k-rtems4.10
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        32%{?dist}
+Release:        33%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.10-newlib-common
@@ -866,7 +866,7 @@ Newlib C Library for m68k-rtems4.10.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        32%{?dist}
+Release:        33%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable
 
diff --git a/rtems4.10/mips/Makefile.in b/rtems4.10/mips/Makefile.in
index 24245d6..48b200a 100644
--- a/rtems4.10/mips/Makefile.in
+++ b/rtems4.10/mips/Makefile.in
@@ -238,7 +238,7 @@ BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/binutils/base-binutils.add
 GCC_VERS = 4.4.7
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 4
+GCC_RPMREL = 5
 NEWLIB_VERS = 1.18.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
 NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 28`
diff --git a/rtems4.10/mips/rtems-4.10-mips-rtems4.10-gcc.spec b/rtems4.10/mips/rtems-4.10-mips-rtems4.10-gcc.spec
index f57592a..97d518c 100644
--- a/rtems4.10/mips/rtems-4.10-mips-rtems4.10-gcc.spec
+++ b/rtems4.10/mips/rtems-4.10-mips-rtems4.10-gcc.spec
@@ -58,14 +58,17 @@ Summary:      	mips-rtems4.10 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	4%{?dist}
+Release:      	5%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%{?el5:BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)}
 
 %define _use_internal_dependency_generator 0
 
 BuildRequires:  %{_host_rpmprefix}gcc
+%if "%{gcc_version}" >= "4.8.0"
+BuildRequires:  %{_host_rpmprefix}gcc-c++
+%endif
 
 # FIXME: Disable lto for now, to avoid dependencies on libelf
 %bcond_with lto
@@ -100,6 +103,12 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global libelf_version  0.8.13
 
 # versions of libraries these distros are known to ship
+%if 0%{?fc20}
+%global mpc_provided 1.0.1
+%global mpfr_provided 3.1.2
+%global gmp_provided 5.1.2
+%endif
+
 %if 0%{?fc19}
 %global mpc_provided 1.0.1
 %global mpfr_provided 3.1.1
@@ -112,12 +121,6 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global gmp_provided 5.0.5
 %endif
 
-%if 0%{?fc17}
-%global mpc_provided 0.9
-%global mpfr_provided 3.1.0
-%global gmp_provided 5.0.2
-%endif
-
 %if 0%{?el6}
 %global mpc_provided 0.8
 %global mpfr_provided 2.4.1
@@ -142,12 +145,6 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global gmp_provided 5.0.5
 %endif
 
-%if 0%{?suse12_1}
-%global mpc_provided 0.8.2
-%global mpfr_provided 3.0.1
-%global gmp_provided 5.0.2
-%endif
-
 %if 0%{?cygwin}
 %global mpc_provided 0.8
 %global mpfr_provided 2.4.1
@@ -244,6 +241,9 @@ BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
 
 %if "%{_build}" != "%{_host}"
 BuildRequires:  rtems-4.10-mips-rtems4.10-gcc = %{gcc_rpmvers}
+%if "%{gcc_version}" >= "4.8.0"
+BuildRequires:  rtems-4.10-mips-rtems4.10-gcc-c++ = %{gcc_rpmvers}
+%endif
 %endif
 
 # Not strictly required, but patches may introduce a need to use them.
@@ -256,7 +256,7 @@ BuildRequires:	rtems-4.10-mips-rtems4.10-binutils
 Requires:	rtems-4.10-gcc-common
 Requires:	rtems-4.10-mips-rtems4.10-binutils
 Requires:	rtems-4.10-mips-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.10-mips-rtems4.10-newlib = %{newlib_version}-32%{?dist}
+Requires:	rtems-4.10-mips-rtems4.10-newlib = %{newlib_version}-33%{?dist}
 
 %if "%{gcc_version}" >= "4.5.0"
 BuildRequires:  zlib-devel
@@ -360,7 +360,7 @@ cd ..
   ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
 %endif
 
-echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-32%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-5%{?dist}/newlib-%{newlib_version}-33%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -642,7 +642,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.10-mips-rtems4.10-binutils
-# Requires:       rtems-4.10-mips-rtems4.10-newlib = %{newlib_version}-32%{?dist}
+# Requires:       rtems-4.10-mips-rtems4.10-newlib = %{newlib_version}-33%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -660,7 +660,7 @@ Summary:        libgcc for mips-rtems4.10-gcc
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 %{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.10-mips-rtems4.10-newlib = %{newlib_version}-32%{?dist}
+Requires:       rtems-4.10-mips-rtems4.10-newlib = %{newlib_version}-33%{?dist}
 License:	GPL
 
 %description -n rtems-4.10-mips-rtems4.10-gcc-libgcc
@@ -845,7 +845,7 @@ Summary:      	C Library (newlib) for mips-rtems4.10
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        32%{?dist}
+Release:        33%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.10-newlib-common
@@ -866,7 +866,7 @@ Newlib C Library for mips-rtems4.10.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        32%{?dist}
+Release:        33%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable
 
diff --git a/rtems4.10/powerpc/Makefile.in b/rtems4.10/powerpc/Makefile.in
index 0254001..69619c9 100644
--- a/rtems4.10/powerpc/Makefile.in
+++ b/rtems4.10/powerpc/Makefile.in
@@ -238,7 +238,7 @@ BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/binutils/base-binutils.add
 GCC_VERS = 4.4.7
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 4
+GCC_RPMREL = 5
 NEWLIB_VERS = 1.18.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
 NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 28`
diff --git a/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-gcc.spec b/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-gcc.spec
index eef4aef..e327a6c 100644
--- a/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-gcc.spec
+++ b/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-gcc.spec
@@ -58,14 +58,17 @@ Summary:      	powerpc-rtems4.10 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	4%{?dist}
+Release:      	5%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%{?el5:BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)}
 
 %define _use_internal_dependency_generator 0
 
 BuildRequires:  %{_host_rpmprefix}gcc
+%if "%{gcc_version}" >= "4.8.0"
+BuildRequires:  %{_host_rpmprefix}gcc-c++
+%endif
 
 # FIXME: Disable lto for now, to avoid dependencies on libelf
 %bcond_with lto
@@ -100,6 +103,12 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global libelf_version  0.8.13
 
 # versions of libraries these distros are known to ship
+%if 0%{?fc20}
+%global mpc_provided 1.0.1
+%global mpfr_provided 3.1.2
+%global gmp_provided 5.1.2
+%endif
+
 %if 0%{?fc19}
 %global mpc_provided 1.0.1
 %global mpfr_provided 3.1.1
@@ -112,12 +121,6 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global gmp_provided 5.0.5
 %endif
 
-%if 0%{?fc17}
-%global mpc_provided 0.9
-%global mpfr_provided 3.1.0
-%global gmp_provided 5.0.2
-%endif
-
 %if 0%{?el6}
 %global mpc_provided 0.8
 %global mpfr_provided 2.4.1
@@ -142,12 +145,6 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global gmp_provided 5.0.5
 %endif
 
-%if 0%{?suse12_1}
-%global mpc_provided 0.8.2
-%global mpfr_provided 3.0.1
-%global gmp_provided 5.0.2
-%endif
-
 %if 0%{?cygwin}
 %global mpc_provided 0.8
 %global mpfr_provided 2.4.1
@@ -244,6 +241,9 @@ BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
 
 %if "%{_build}" != "%{_host}"
 BuildRequires:  rtems-4.10-powerpc-rtems4.10-gcc = %{gcc_rpmvers}
+%if "%{gcc_version}" >= "4.8.0"
+BuildRequires:  rtems-4.10-powerpc-rtems4.10-gcc-c++ = %{gcc_rpmvers}
+%endif
 %endif
 
 # Not strictly required, but patches may introduce a need to use them.
@@ -256,7 +256,7 @@ BuildRequires:	rtems-4.10-powerpc-rtems4.10-binutils
 Requires:	rtems-4.10-gcc-common
 Requires:	rtems-4.10-powerpc-rtems4.10-binutils
 Requires:	rtems-4.10-powerpc-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.10-powerpc-rtems4.10-newlib = %{newlib_version}-32%{?dist}
+Requires:	rtems-4.10-powerpc-rtems4.10-newlib = %{newlib_version}-33%{?dist}
 
 %if "%{gcc_version}" >= "4.5.0"
 BuildRequires:  zlib-devel
@@ -360,7 +360,7 @@ cd ..
   ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
 %endif
 
-echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-32%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-5%{?dist}/newlib-%{newlib_version}-33%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -642,7 +642,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.10-powerpc-rtems4.10-binutils
-# Requires:       rtems-4.10-powerpc-rtems4.10-newlib = %{newlib_version}-32%{?dist}
+# Requires:       rtems-4.10-powerpc-rtems4.10-newlib = %{newlib_version}-33%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -660,7 +660,7 @@ Summary:        libgcc for powerpc-rtems4.10-gcc
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 %{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.10-powerpc-rtems4.10-newlib = %{newlib_version}-32%{?dist}
+Requires:       rtems-4.10-powerpc-rtems4.10-newlib = %{newlib_version}-33%{?dist}
 License:	GPL
 
 %description -n rtems-4.10-powerpc-rtems4.10-gcc-libgcc
@@ -845,7 +845,7 @@ Summary:      	C Library (newlib) for powerpc-rtems4.10
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        32%{?dist}
+Release:        33%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.10-newlib-common
@@ -866,7 +866,7 @@ Newlib C Library for powerpc-rtems4.10.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        32%{?dist}
+Release:        33%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable
 
diff --git a/rtems4.10/sh/Makefile.in b/rtems4.10/sh/Makefile.in
index 3aea499..97e4891 100644
--- a/rtems4.10/sh/Makefile.in
+++ b/rtems4.10/sh/Makefile.in
@@ -238,7 +238,7 @@ BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/binutils/base-binutils.add
 GCC_VERS = 4.4.7
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 4
+GCC_RPMREL = 5
 NEWLIB_VERS = 1.18.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
 NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 28`
diff --git a/rtems4.10/sh/rtems-4.10-sh-rtems4.10-gcc.spec b/rtems4.10/sh/rtems-4.10-sh-rtems4.10-gcc.spec
index b0dfba2..d9a8771 100644
--- a/rtems4.10/sh/rtems-4.10-sh-rtems4.10-gcc.spec
+++ b/rtems4.10/sh/rtems-4.10-sh-rtems4.10-gcc.spec
@@ -58,14 +58,17 @@ Summary:      	sh-rtems4.10 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	4%{?dist}
+Release:      	5%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%{?el5:BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)}
 
 %define _use_internal_dependency_generator 0
 
 BuildRequires:  %{_host_rpmprefix}gcc
+%if "%{gcc_version}" >= "4.8.0"
+BuildRequires:  %{_host_rpmprefix}gcc-c++
+%endif
 
 # FIXME: Disable lto for now, to avoid dependencies on libelf
 %bcond_with lto
@@ -100,6 +103,12 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global libelf_version  0.8.13
 
 # versions of libraries these distros are known to ship
+%if 0%{?fc20}
+%global mpc_provided 1.0.1
+%global mpfr_provided 3.1.2
+%global gmp_provided 5.1.2
+%endif
+
 %if 0%{?fc19}
 %global mpc_provided 1.0.1
 %global mpfr_provided 3.1.1
@@ -112,12 +121,6 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global gmp_provided 5.0.5
 %endif
 
-%if 0%{?fc17}
-%global mpc_provided 0.9
-%global mpfr_provided 3.1.0
-%global gmp_provided 5.0.2
-%endif
-
 %if 0%{?el6}
 %global mpc_provided 0.8
 %global mpfr_provided 2.4.1
@@ -142,12 +145,6 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global gmp_provided 5.0.5
 %endif
 
-%if 0%{?suse12_1}
-%global mpc_provided 0.8.2
-%global mpfr_provided 3.0.1
-%global gmp_provided 5.0.2
-%endif
-
 %if 0%{?cygwin}
 %global mpc_provided 0.8
 %global mpfr_provided 2.4.1
@@ -244,6 +241,9 @@ BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
 
 %if "%{_build}" != "%{_host}"
 BuildRequires:  rtems-4.10-sh-rtems4.10-gcc = %{gcc_rpmvers}
+%if "%{gcc_version}" >= "4.8.0"
+BuildRequires:  rtems-4.10-sh-rtems4.10-gcc-c++ = %{gcc_rpmvers}
+%endif
 %endif
 
 # Not strictly required, but patches may introduce a need to use them.
@@ -256,7 +256,7 @@ BuildRequires:	rtems-4.10-sh-rtems4.10-binutils
 Requires:	rtems-4.10-gcc-common
 Requires:	rtems-4.10-sh-rtems4.10-binutils
 Requires:	rtems-4.10-sh-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.10-sh-rtems4.10-newlib = %{newlib_version}-32%{?dist}
+Requires:	rtems-4.10-sh-rtems4.10-newlib = %{newlib_version}-33%{?dist}
 
 %if "%{gcc_version}" >= "4.5.0"
 BuildRequires:  zlib-devel
@@ -360,7 +360,7 @@ cd ..
   ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
 %endif
 
-echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-32%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-5%{?dist}/newlib-%{newlib_version}-33%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -642,7 +642,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.10-sh-rtems4.10-binutils
-# Requires:       rtems-4.10-sh-rtems4.10-newlib = %{newlib_version}-32%{?dist}
+# Requires:       rtems-4.10-sh-rtems4.10-newlib = %{newlib_version}-33%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -660,7 +660,7 @@ Summary:        libgcc for sh-rtems4.10-gcc
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 %{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.10-sh-rtems4.10-newlib = %{newlib_version}-32%{?dist}
+Requires:       rtems-4.10-sh-rtems4.10-newlib = %{newlib_version}-33%{?dist}
 License:	GPL
 
 %description -n rtems-4.10-sh-rtems4.10-gcc-libgcc
@@ -845,7 +845,7 @@ Summary:      	C Library (newlib) for sh-rtems4.10
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        32%{?dist}
+Release:        33%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.10-newlib-common
@@ -866,7 +866,7 @@ Newlib C Library for sh-rtems4.10.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        32%{?dist}
+Release:        33%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable
 
diff --git a/rtems4.10/sparc/Makefile.in b/rtems4.10/sparc/Makefile.in
index cbde67a..5bfbeb9 100644
--- a/rtems4.10/sparc/Makefile.in
+++ b/rtems4.10/sparc/Makefile.in
@@ -238,7 +238,7 @@ BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/binutils/base-binutils.add
 GCC_VERS = 4.4.7
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 4
+GCC_RPMREL = 5
 NEWLIB_VERS = 1.18.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
 NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 28`
diff --git a/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-gcc.spec b/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-gcc.spec
index 0138ebe..eac3b33 100644
--- a/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-gcc.spec
+++ b/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-gcc.spec
@@ -58,14 +58,17 @@ Summary:      	sparc-rtems4.10 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	4%{?dist}
+Release:      	5%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%{?el5:BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)}
 
 %define _use_internal_dependency_generator 0
 
 BuildRequires:  %{_host_rpmprefix}gcc
+%if "%{gcc_version}" >= "4.8.0"
+BuildRequires:  %{_host_rpmprefix}gcc-c++
+%endif
 
 # FIXME: Disable lto for now, to avoid dependencies on libelf
 %bcond_with lto
@@ -100,6 +103,12 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global libelf_version  0.8.13
 
 # versions of libraries these distros are known to ship
+%if 0%{?fc20}
+%global mpc_provided 1.0.1
+%global mpfr_provided 3.1.2
+%global gmp_provided 5.1.2
+%endif
+
 %if 0%{?fc19}
 %global mpc_provided 1.0.1
 %global mpfr_provided 3.1.1
@@ -112,12 +121,6 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global gmp_provided 5.0.5
 %endif
 
-%if 0%{?fc17}
-%global mpc_provided 0.9
-%global mpfr_provided 3.1.0
-%global gmp_provided 5.0.2
-%endif
-
 %if 0%{?el6}
 %global mpc_provided 0.8
 %global mpfr_provided 2.4.1
@@ -142,12 +145,6 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global gmp_provided 5.0.5
 %endif
 
-%if 0%{?suse12_1}
-%global mpc_provided 0.8.2
-%global mpfr_provided 3.0.1
-%global gmp_provided 5.0.2
-%endif
-
 %if 0%{?cygwin}
 %global mpc_provided 0.8
 %global mpfr_provided 2.4.1
@@ -244,6 +241,9 @@ BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
 
 %if "%{_build}" != "%{_host}"
 BuildRequires:  rtems-4.10-sparc-rtems4.10-gcc = %{gcc_rpmvers}
+%if "%{gcc_version}" >= "4.8.0"
+BuildRequires:  rtems-4.10-sparc-rtems4.10-gcc-c++ = %{gcc_rpmvers}
+%endif
 %endif
 
 # Not strictly required, but patches may introduce a need to use them.
@@ -256,7 +256,7 @@ BuildRequires:	rtems-4.10-sparc-rtems4.10-binutils
 Requires:	rtems-4.10-gcc-common
 Requires:	rtems-4.10-sparc-rtems4.10-binutils
 Requires:	rtems-4.10-sparc-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.10-sparc-rtems4.10-newlib = %{newlib_version}-32%{?dist}
+Requires:	rtems-4.10-sparc-rtems4.10-newlib = %{newlib_version}-33%{?dist}
 
 %if "%{gcc_version}" >= "4.5.0"
 BuildRequires:  zlib-devel
@@ -360,7 +360,7 @@ cd ..
   ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
 %endif
 
-echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-32%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-5%{?dist}/newlib-%{newlib_version}-33%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -642,7 +642,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.10-sparc-rtems4.10-binutils
-# Requires:       rtems-4.10-sparc-rtems4.10-newlib = %{newlib_version}-32%{?dist}
+# Requires:       rtems-4.10-sparc-rtems4.10-newlib = %{newlib_version}-33%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -660,7 +660,7 @@ Summary:        libgcc for sparc-rtems4.10-gcc
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 %{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.10-sparc-rtems4.10-newlib = %{newlib_version}-32%{?dist}
+Requires:       rtems-4.10-sparc-rtems4.10-newlib = %{newlib_version}-33%{?dist}
 License:	GPL
 
 %description -n rtems-4.10-sparc-rtems4.10-gcc-libgcc
@@ -845,7 +845,7 @@ Summary:      	C Library (newlib) for sparc-rtems4.10
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        32%{?dist}
+Release:        33%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.10-newlib-common
@@ -866,7 +866,7 @@ Newlib C Library for sparc-rtems4.10.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        32%{?dist}
+Release:        33%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable

More information about the vc mailing list