[rtems-crossrpms commit] Regenerate.

Ralf Corsepius ralf at rtems.org
Thu Apr 4 03:28:34 UTC 2013


Module:    rtems-crossrpms
Branch:    master
Commit:    c085111dd8de6a14974aa526e32d8ead9bf8b219
Changeset: http://git.rtems.org/rtems-crossrpms/commit/?id=c085111dd8de6a14974aa526e32d8ead9bf8b219

Author:    Ralf Corsépius <ralf.corsepius at rtems.org>
Date:      Wed Apr  3 08:40:44 2013 +0200

Regenerate.

---

 .../arm/rtems-4.11-arm-rtemseabi4.11-gcc.spec      |   22 ++++++++++++-------
 rtems4.11/avr/rtems-4.11-avr-rtems4.11-gcc.spec    |   22 ++++++++++++-------
 rtems4.11/bfin/rtems-4.11-bfin-rtems4.11-gcc.spec  |   22 ++++++++++++-------
 .../h8300/rtems-4.11-h8300-rtems4.11-gcc.spec      |   22 ++++++++++++-------
 rtems4.11/i386/rtems-4.11-i386-rtems4.11-gcc.spec  |   22 ++++++++++++-------
 rtems4.11/lm32/rtems-4.11-lm32-rtems4.11-gcc.spec  |   22 ++++++++++++-------
 rtems4.11/m32c/rtems-4.11-m32c-rtems4.11-gcc.spec  |   22 ++++++++++++-------
 rtems4.11/m32r/rtems-4.11-m32r-rtems4.11-gcc.spec  |   22 ++++++++++++-------
 rtems4.11/m68k/rtems-4.11-m68k-rtems4.11-gcc.spec  |   22 ++++++++++++-------
 .../rtems-4.11-microblaze-rtems4.11-gcc.spec       |   22 ++++++++++++-------
 rtems4.11/mips/rtems-4.11-mips-rtems4.11-gcc.spec  |   22 ++++++++++++-------
 .../powerpc/rtems-4.11-powerpc-rtems4.11-gcc.spec  |   22 ++++++++++++-------
 rtems4.11/sh/rtems-4.11-sh-rtems4.11-gcc.spec      |   22 ++++++++++++-------
 .../sparc/rtems-4.11-sparc-rtems4.11-gcc.spec      |   22 ++++++++++++-------
 .../sparc64/rtems-4.11-sparc64-rtems4.11-gcc.spec  |   22 ++++++++++++-------
 rtems4.11/v850/rtems-4.11-v850-rtems4.11-gcc.spec  |   22 ++++++++++++-------
 16 files changed, 224 insertions(+), 128 deletions(-)

diff --git a/rtems4.11/arm/rtems-4.11-arm-rtemseabi4.11-gcc.spec b/rtems4.11/arm/rtems-4.11-arm-rtemseabi4.11-gcc.spec
index 1f0a99b..8e2c7d4 100644
--- a/rtems4.11/arm/rtems-4.11-arm-rtemseabi4.11-gcc.spec
+++ b/rtems4.11/arm/rtems-4.11-arm-rtemseabi4.11-gcc.spec
@@ -59,14 +59,17 @@ Summary:      	arm-rtemseabi4.11 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	5%{?dist}
+Release:      	6%{?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
@@ -241,6 +244,9 @@ BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
 
 %if "%{_build}" != "%{_host}"
 BuildRequires:  rtems-4.11-arm-rtemseabi4.11-gcc = %{gcc_rpmvers}
+%if "%{gcc_version}" >= "4.8.0"
+BuildRequires:  rtems-4.11-arm-rtemseabi4.11-gcc-c++ = %{gcc_rpmvers}
+%endif
 %endif
 
 # Not strictly required, but patches may introduce a need to use them.
@@ -253,7 +259,7 @@ BuildRequires:	rtems-4.11-arm-rtemseabi4.11-binutils
 Requires:	rtems-4.11-gcc-common
 Requires:	rtems-4.11-arm-rtemseabi4.11-binutils
 Requires:	rtems-4.11-arm-rtemseabi4.11-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.11-arm-rtemseabi4.11-newlib = %{newlib_version}-21%{?dist}
+Requires:	rtems-4.11-arm-rtemseabi4.11-newlib = %{newlib_version}-22%{?dist}
 
 %if "%{gcc_version}" >= "4.5.0"
 BuildRequires:  zlib-devel
@@ -383,7 +389,7 @@ cd ..
   ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
 %endif
 
-echo "RTEMS gcc-%{gcc_version}-5%{?dist}/newlib-%{newlib_version}-21%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-6%{?dist}/newlib-%{newlib_version}-22%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -668,7 +674,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.11-arm-rtemseabi4.11-binutils
-# Requires:       rtems-4.11-arm-rtemseabi4.11-newlib = %{newlib_version}-21%{?dist}
+# Requires:       rtems-4.11-arm-rtemseabi4.11-newlib = %{newlib_version}-22%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -686,7 +692,7 @@ Summary:        libgcc for arm-rtemseabi4.11-gcc
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 %{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.11-arm-rtemseabi4.11-newlib = %{newlib_version}-21%{?dist}
+Requires:       rtems-4.11-arm-rtemseabi4.11-newlib = %{newlib_version}-22%{?dist}
 License:	GPL
 
 %description -n rtems-4.11-arm-rtemseabi4.11-gcc-libgcc
@@ -871,7 +877,7 @@ Summary:      	C Library (newlib) for arm-rtemseabi4.11
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        21%{?dist}
+Release:        22%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.11-newlib-common
@@ -892,7 +898,7 @@ Newlib C Library for arm-rtemseabi4.11.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        21%{?dist}
+Release:        22%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable
 
diff --git a/rtems4.11/avr/rtems-4.11-avr-rtems4.11-gcc.spec b/rtems4.11/avr/rtems-4.11-avr-rtems4.11-gcc.spec
index 8a7f2e7..b0ca3d6 100644
--- a/rtems4.11/avr/rtems-4.11-avr-rtems4.11-gcc.spec
+++ b/rtems4.11/avr/rtems-4.11-avr-rtems4.11-gcc.spec
@@ -59,14 +59,17 @@ Summary:      	avr-rtems4.11 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	5%{?dist}
+Release:      	6%{?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
@@ -241,6 +244,9 @@ BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
 
 %if "%{_build}" != "%{_host}"
 BuildRequires:  rtems-4.11-avr-rtems4.11-gcc = %{gcc_rpmvers}
+%if "%{gcc_version}" >= "4.8.0"
+BuildRequires:  rtems-4.11-avr-rtems4.11-gcc-c++ = %{gcc_rpmvers}
+%endif
 %endif
 
 # Not strictly required, but patches may introduce a need to use them.
@@ -253,7 +259,7 @@ BuildRequires:	rtems-4.11-avr-rtems4.11-binutils
 Requires:	rtems-4.11-gcc-common
 Requires:	rtems-4.11-avr-rtems4.11-binutils
 Requires:	rtems-4.11-avr-rtems4.11-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.11-avr-rtems4.11-newlib = %{newlib_version}-21%{?dist}
+Requires:	rtems-4.11-avr-rtems4.11-newlib = %{newlib_version}-22%{?dist}
 
 %if "%{gcc_version}" >= "4.5.0"
 BuildRequires:  zlib-devel
@@ -379,7 +385,7 @@ cd ..
   ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
 %endif
 
-echo "RTEMS gcc-%{gcc_version}-5%{?dist}/newlib-%{newlib_version}-21%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-6%{?dist}/newlib-%{newlib_version}-22%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -663,7 +669,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.11-avr-rtems4.11-binutils
-# Requires:       rtems-4.11-avr-rtems4.11-newlib = %{newlib_version}-21%{?dist}
+# Requires:       rtems-4.11-avr-rtems4.11-newlib = %{newlib_version}-22%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -681,7 +687,7 @@ Summary:        libgcc for avr-rtems4.11-gcc
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 %{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.11-avr-rtems4.11-newlib = %{newlib_version}-21%{?dist}
+Requires:       rtems-4.11-avr-rtems4.11-newlib = %{newlib_version}-22%{?dist}
 License:	GPL
 
 %description -n rtems-4.11-avr-rtems4.11-gcc-libgcc
@@ -805,7 +811,7 @@ Summary:      	C Library (newlib) for avr-rtems4.11
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        21%{?dist}
+Release:        22%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.11-newlib-common
@@ -826,7 +832,7 @@ Newlib C Library for avr-rtems4.11.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        21%{?dist}
+Release:        22%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable
 
diff --git a/rtems4.11/bfin/rtems-4.11-bfin-rtems4.11-gcc.spec b/rtems4.11/bfin/rtems-4.11-bfin-rtems4.11-gcc.spec
index c1ba933..081f676 100644
--- a/rtems4.11/bfin/rtems-4.11-bfin-rtems4.11-gcc.spec
+++ b/rtems4.11/bfin/rtems-4.11-bfin-rtems4.11-gcc.spec
@@ -59,14 +59,17 @@ Summary:      	bfin-rtems4.11 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	5%{?dist}
+Release:      	6%{?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
@@ -241,6 +244,9 @@ BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
 
 %if "%{_build}" != "%{_host}"
 BuildRequires:  rtems-4.11-bfin-rtems4.11-gcc = %{gcc_rpmvers}
+%if "%{gcc_version}" >= "4.8.0"
+BuildRequires:  rtems-4.11-bfin-rtems4.11-gcc-c++ = %{gcc_rpmvers}
+%endif
 %endif
 
 # Not strictly required, but patches may introduce a need to use them.
@@ -253,7 +259,7 @@ BuildRequires:	rtems-4.11-bfin-rtems4.11-binutils
 Requires:	rtems-4.11-gcc-common
 Requires:	rtems-4.11-bfin-rtems4.11-binutils
 Requires:	rtems-4.11-bfin-rtems4.11-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.11-bfin-rtems4.11-newlib = %{newlib_version}-21%{?dist}
+Requires:	rtems-4.11-bfin-rtems4.11-newlib = %{newlib_version}-22%{?dist}
 
 %if "%{gcc_version}" >= "4.5.0"
 BuildRequires:  zlib-devel
@@ -383,7 +389,7 @@ cd ..
   ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
 %endif
 
-echo "RTEMS gcc-%{gcc_version}-5%{?dist}/newlib-%{newlib_version}-21%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-6%{?dist}/newlib-%{newlib_version}-22%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -668,7 +674,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.11-bfin-rtems4.11-binutils
-# Requires:       rtems-4.11-bfin-rtems4.11-newlib = %{newlib_version}-21%{?dist}
+# Requires:       rtems-4.11-bfin-rtems4.11-newlib = %{newlib_version}-22%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -686,7 +692,7 @@ Summary:        libgcc for bfin-rtems4.11-gcc
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 %{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.11-bfin-rtems4.11-newlib = %{newlib_version}-21%{?dist}
+Requires:       rtems-4.11-bfin-rtems4.11-newlib = %{newlib_version}-22%{?dist}
 License:	GPL
 
 %description -n rtems-4.11-bfin-rtems4.11-gcc-libgcc
@@ -870,7 +876,7 @@ Summary:      	C Library (newlib) for bfin-rtems4.11
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        21%{?dist}
+Release:        22%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.11-newlib-common
@@ -891,7 +897,7 @@ Newlib C Library for bfin-rtems4.11.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        21%{?dist}
+Release:        22%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable
 
diff --git a/rtems4.11/h8300/rtems-4.11-h8300-rtems4.11-gcc.spec b/rtems4.11/h8300/rtems-4.11-h8300-rtems4.11-gcc.spec
index 95a73a6..fd8b609 100644
--- a/rtems4.11/h8300/rtems-4.11-h8300-rtems4.11-gcc.spec
+++ b/rtems4.11/h8300/rtems-4.11-h8300-rtems4.11-gcc.spec
@@ -59,14 +59,17 @@ Summary:      	h8300-rtems4.11 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	5%{?dist}
+Release:      	6%{?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
@@ -241,6 +244,9 @@ BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
 
 %if "%{_build}" != "%{_host}"
 BuildRequires:  rtems-4.11-h8300-rtems4.11-gcc = %{gcc_rpmvers}
+%if "%{gcc_version}" >= "4.8.0"
+BuildRequires:  rtems-4.11-h8300-rtems4.11-gcc-c++ = %{gcc_rpmvers}
+%endif
 %endif
 
 # Not strictly required, but patches may introduce a need to use them.
@@ -253,7 +259,7 @@ BuildRequires:	rtems-4.11-h8300-rtems4.11-binutils
 Requires:	rtems-4.11-gcc-common
 Requires:	rtems-4.11-h8300-rtems4.11-binutils
 Requires:	rtems-4.11-h8300-rtems4.11-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.11-h8300-rtems4.11-newlib = %{newlib_version}-21%{?dist}
+Requires:	rtems-4.11-h8300-rtems4.11-newlib = %{newlib_version}-22%{?dist}
 
 %if "%{gcc_version}" >= "4.5.0"
 BuildRequires:  zlib-devel
@@ -383,7 +389,7 @@ cd ..
   ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
 %endif
 
-echo "RTEMS gcc-%{gcc_version}-5%{?dist}/newlib-%{newlib_version}-21%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-6%{?dist}/newlib-%{newlib_version}-22%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -668,7 +674,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.11-h8300-rtems4.11-binutils
-# Requires:       rtems-4.11-h8300-rtems4.11-newlib = %{newlib_version}-21%{?dist}
+# Requires:       rtems-4.11-h8300-rtems4.11-newlib = %{newlib_version}-22%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -686,7 +692,7 @@ Summary:        libgcc for h8300-rtems4.11-gcc
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 %{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.11-h8300-rtems4.11-newlib = %{newlib_version}-21%{?dist}
+Requires:       rtems-4.11-h8300-rtems4.11-newlib = %{newlib_version}-22%{?dist}
 License:	GPL
 
 %description -n rtems-4.11-h8300-rtems4.11-gcc-libgcc
@@ -871,7 +877,7 @@ Summary:      	C Library (newlib) for h8300-rtems4.11
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        21%{?dist}
+Release:        22%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.11-newlib-common
@@ -892,7 +898,7 @@ Newlib C Library for h8300-rtems4.11.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        21%{?dist}
+Release:        22%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable
 
diff --git a/rtems4.11/i386/rtems-4.11-i386-rtems4.11-gcc.spec b/rtems4.11/i386/rtems-4.11-i386-rtems4.11-gcc.spec
index 598e30f..f1eb583 100644
--- a/rtems4.11/i386/rtems-4.11-i386-rtems4.11-gcc.spec
+++ b/rtems4.11/i386/rtems-4.11-i386-rtems4.11-gcc.spec
@@ -59,14 +59,17 @@ Summary:      	i386-rtems4.11 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	5%{?dist}
+Release:      	6%{?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
@@ -241,6 +244,9 @@ BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
 
 %if "%{_build}" != "%{_host}"
 BuildRequires:  rtems-4.11-i386-rtems4.11-gcc = %{gcc_rpmvers}
+%if "%{gcc_version}" >= "4.8.0"
+BuildRequires:  rtems-4.11-i386-rtems4.11-gcc-c++ = %{gcc_rpmvers}
+%endif
 %endif
 
 # Not strictly required, but patches may introduce a need to use them.
@@ -253,7 +259,7 @@ BuildRequires:	rtems-4.11-i386-rtems4.11-binutils
 Requires:	rtems-4.11-gcc-common
 Requires:	rtems-4.11-i386-rtems4.11-binutils
 Requires:	rtems-4.11-i386-rtems4.11-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.11-i386-rtems4.11-newlib = %{newlib_version}-21%{?dist}
+Requires:	rtems-4.11-i386-rtems4.11-newlib = %{newlib_version}-22%{?dist}
 
 %if "%{gcc_version}" >= "4.5.0"
 BuildRequires:  zlib-devel
@@ -383,7 +389,7 @@ cd ..
   ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
 %endif
 
-echo "RTEMS gcc-%{gcc_version}-5%{?dist}/newlib-%{newlib_version}-21%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-6%{?dist}/newlib-%{newlib_version}-22%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -668,7 +674,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.11-i386-rtems4.11-binutils
-# Requires:       rtems-4.11-i386-rtems4.11-newlib = %{newlib_version}-21%{?dist}
+# Requires:       rtems-4.11-i386-rtems4.11-newlib = %{newlib_version}-22%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -686,7 +692,7 @@ Summary:        libgcc for i386-rtems4.11-gcc
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 %{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.11-i386-rtems4.11-newlib = %{newlib_version}-21%{?dist}
+Requires:       rtems-4.11-i386-rtems4.11-newlib = %{newlib_version}-22%{?dist}
 License:	GPL
 
 %description -n rtems-4.11-i386-rtems4.11-gcc-libgcc
@@ -871,7 +877,7 @@ Summary:      	C Library (newlib) for i386-rtems4.11
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        21%{?dist}
+Release:        22%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.11-newlib-common
@@ -892,7 +898,7 @@ Newlib C Library for i386-rtems4.11.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        21%{?dist}
+Release:        22%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable
 
diff --git a/rtems4.11/lm32/rtems-4.11-lm32-rtems4.11-gcc.spec b/rtems4.11/lm32/rtems-4.11-lm32-rtems4.11-gcc.spec
index e11d430..b81a53b 100644
--- a/rtems4.11/lm32/rtems-4.11-lm32-rtems4.11-gcc.spec
+++ b/rtems4.11/lm32/rtems-4.11-lm32-rtems4.11-gcc.spec
@@ -59,14 +59,17 @@ Summary:      	lm32-rtems4.11 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	7%{?dist}
+Release:      	8%{?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
@@ -241,6 +244,9 @@ BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
 
 %if "%{_build}" != "%{_host}"
 BuildRequires:  rtems-4.11-lm32-rtems4.11-gcc = %{gcc_rpmvers}
+%if "%{gcc_version}" >= "4.8.0"
+BuildRequires:  rtems-4.11-lm32-rtems4.11-gcc-c++ = %{gcc_rpmvers}
+%endif
 %endif
 
 # Not strictly required, but patches may introduce a need to use them.
@@ -253,7 +259,7 @@ BuildRequires:	rtems-4.11-lm32-rtems4.11-binutils
 Requires:	rtems-4.11-gcc-common
 Requires:	rtems-4.11-lm32-rtems4.11-binutils
 Requires:	rtems-4.11-lm32-rtems4.11-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.11-lm32-rtems4.11-newlib = %{newlib_version}-13%{?dist}
+Requires:	rtems-4.11-lm32-rtems4.11-newlib = %{newlib_version}-14%{?dist}
 
 %if "%{gcc_version}" >= "4.5.0"
 BuildRequires:  zlib-devel
@@ -383,7 +389,7 @@ cd ..
   ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
 %endif
 
-echo "RTEMS gcc-%{gcc_version}-7%{?dist}/newlib-%{newlib_version}-13%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-8%{?dist}/newlib-%{newlib_version}-14%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -668,7 +674,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.11-lm32-rtems4.11-binutils
-# Requires:       rtems-4.11-lm32-rtems4.11-newlib = %{newlib_version}-13%{?dist}
+# Requires:       rtems-4.11-lm32-rtems4.11-newlib = %{newlib_version}-14%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -686,7 +692,7 @@ Summary:        libgcc for lm32-rtems4.11-gcc
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 %{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.11-lm32-rtems4.11-newlib = %{newlib_version}-13%{?dist}
+Requires:       rtems-4.11-lm32-rtems4.11-newlib = %{newlib_version}-14%{?dist}
 License:	GPL
 
 %description -n rtems-4.11-lm32-rtems4.11-gcc-libgcc
@@ -871,7 +877,7 @@ Summary:      	C Library (newlib) for lm32-rtems4.11
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        13%{?dist}
+Release:        14%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.11-newlib-common
@@ -892,7 +898,7 @@ Newlib C Library for lm32-rtems4.11.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        13%{?dist}
+Release:        14%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable
 
diff --git a/rtems4.11/m32c/rtems-4.11-m32c-rtems4.11-gcc.spec b/rtems4.11/m32c/rtems-4.11-m32c-rtems4.11-gcc.spec
index d4742ca..9c6f1bc 100644
--- a/rtems4.11/m32c/rtems-4.11-m32c-rtems4.11-gcc.spec
+++ b/rtems4.11/m32c/rtems-4.11-m32c-rtems4.11-gcc.spec
@@ -59,14 +59,17 @@ Summary:      	m32c-rtems4.11 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	5%{?dist}
+Release:      	6%{?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
@@ -241,6 +244,9 @@ BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
 
 %if "%{_build}" != "%{_host}"
 BuildRequires:  rtems-4.11-m32c-rtems4.11-gcc = %{gcc_rpmvers}
+%if "%{gcc_version}" >= "4.8.0"
+BuildRequires:  rtems-4.11-m32c-rtems4.11-gcc-c++ = %{gcc_rpmvers}
+%endif
 %endif
 
 # Not strictly required, but patches may introduce a need to use them.
@@ -253,7 +259,7 @@ BuildRequires:	rtems-4.11-m32c-rtems4.11-binutils
 Requires:	rtems-4.11-gcc-common
 Requires:	rtems-4.11-m32c-rtems4.11-binutils
 Requires:	rtems-4.11-m32c-rtems4.11-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.11-m32c-rtems4.11-newlib = %{newlib_version}-21%{?dist}
+Requires:	rtems-4.11-m32c-rtems4.11-newlib = %{newlib_version}-22%{?dist}
 
 %if "%{gcc_version}" >= "4.5.0"
 BuildRequires:  zlib-devel
@@ -379,7 +385,7 @@ cd ..
   ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
 %endif
 
-echo "RTEMS gcc-%{gcc_version}-5%{?dist}/newlib-%{newlib_version}-21%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-6%{?dist}/newlib-%{newlib_version}-22%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -663,7 +669,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.11-m32c-rtems4.11-binutils
-# Requires:       rtems-4.11-m32c-rtems4.11-newlib = %{newlib_version}-21%{?dist}
+# Requires:       rtems-4.11-m32c-rtems4.11-newlib = %{newlib_version}-22%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -681,7 +687,7 @@ Summary:        libgcc for m32c-rtems4.11-gcc
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 %{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.11-m32c-rtems4.11-newlib = %{newlib_version}-21%{?dist}
+Requires:       rtems-4.11-m32c-rtems4.11-newlib = %{newlib_version}-22%{?dist}
 License:	GPL
 
 %description -n rtems-4.11-m32c-rtems4.11-gcc-libgcc
@@ -806,7 +812,7 @@ Summary:      	C Library (newlib) for m32c-rtems4.11
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        21%{?dist}
+Release:        22%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.11-newlib-common
@@ -827,7 +833,7 @@ Newlib C Library for m32c-rtems4.11.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        21%{?dist}
+Release:        22%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable
 
diff --git a/rtems4.11/m32r/rtems-4.11-m32r-rtems4.11-gcc.spec b/rtems4.11/m32r/rtems-4.11-m32r-rtems4.11-gcc.spec
index 2eacb14..cc9d98c 100644
--- a/rtems4.11/m32r/rtems-4.11-m32r-rtems4.11-gcc.spec
+++ b/rtems4.11/m32r/rtems-4.11-m32r-rtems4.11-gcc.spec
@@ -59,14 +59,17 @@ Summary:      	m32r-rtems4.11 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	5%{?dist}
+Release:      	6%{?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
@@ -241,6 +244,9 @@ BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
 
 %if "%{_build}" != "%{_host}"
 BuildRequires:  rtems-4.11-m32r-rtems4.11-gcc = %{gcc_rpmvers}
+%if "%{gcc_version}" >= "4.8.0"
+BuildRequires:  rtems-4.11-m32r-rtems4.11-gcc-c++ = %{gcc_rpmvers}
+%endif
 %endif
 
 # Not strictly required, but patches may introduce a need to use them.
@@ -253,7 +259,7 @@ BuildRequires:	rtems-4.11-m32r-rtems4.11-binutils
 Requires:	rtems-4.11-gcc-common
 Requires:	rtems-4.11-m32r-rtems4.11-binutils
 Requires:	rtems-4.11-m32r-rtems4.11-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.11-m32r-rtems4.11-newlib = %{newlib_version}-21%{?dist}
+Requires:	rtems-4.11-m32r-rtems4.11-newlib = %{newlib_version}-22%{?dist}
 
 %if "%{gcc_version}" >= "4.5.0"
 BuildRequires:  zlib-devel
@@ -383,7 +389,7 @@ cd ..
   ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
 %endif
 
-echo "RTEMS gcc-%{gcc_version}-5%{?dist}/newlib-%{newlib_version}-21%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-6%{?dist}/newlib-%{newlib_version}-22%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -668,7 +674,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.11-m32r-rtems4.11-binutils
-# Requires:       rtems-4.11-m32r-rtems4.11-newlib = %{newlib_version}-21%{?dist}
+# Requires:       rtems-4.11-m32r-rtems4.11-newlib = %{newlib_version}-22%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -686,7 +692,7 @@ Summary:        libgcc for m32r-rtems4.11-gcc
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 %{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.11-m32r-rtems4.11-newlib = %{newlib_version}-21%{?dist}
+Requires:       rtems-4.11-m32r-rtems4.11-newlib = %{newlib_version}-22%{?dist}
 License:	GPL
 
 %description -n rtems-4.11-m32r-rtems4.11-gcc-libgcc
@@ -871,7 +877,7 @@ Summary:      	C Library (newlib) for m32r-rtems4.11
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        21%{?dist}
+Release:        22%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.11-newlib-common
@@ -892,7 +898,7 @@ Newlib C Library for m32r-rtems4.11.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        21%{?dist}
+Release:        22%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable
 
diff --git a/rtems4.11/m68k/rtems-4.11-m68k-rtems4.11-gcc.spec b/rtems4.11/m68k/rtems-4.11-m68k-rtems4.11-gcc.spec
index ecaff13..f958d6f 100644
--- a/rtems4.11/m68k/rtems-4.11-m68k-rtems4.11-gcc.spec
+++ b/rtems4.11/m68k/rtems-4.11-m68k-rtems4.11-gcc.spec
@@ -59,14 +59,17 @@ Summary:      	m68k-rtems4.11 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	5%{?dist}
+Release:      	6%{?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
@@ -241,6 +244,9 @@ BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
 
 %if "%{_build}" != "%{_host}"
 BuildRequires:  rtems-4.11-m68k-rtems4.11-gcc = %{gcc_rpmvers}
+%if "%{gcc_version}" >= "4.8.0"
+BuildRequires:  rtems-4.11-m68k-rtems4.11-gcc-c++ = %{gcc_rpmvers}
+%endif
 %endif
 
 # Not strictly required, but patches may introduce a need to use them.
@@ -253,7 +259,7 @@ BuildRequires:	rtems-4.11-m68k-rtems4.11-binutils
 Requires:	rtems-4.11-gcc-common
 Requires:	rtems-4.11-m68k-rtems4.11-binutils
 Requires:	rtems-4.11-m68k-rtems4.11-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.11-m68k-rtems4.11-newlib = %{newlib_version}-21%{?dist}
+Requires:	rtems-4.11-m68k-rtems4.11-newlib = %{newlib_version}-22%{?dist}
 
 %if "%{gcc_version}" >= "4.5.0"
 BuildRequires:  zlib-devel
@@ -383,7 +389,7 @@ cd ..
   ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
 %endif
 
-echo "RTEMS gcc-%{gcc_version}-5%{?dist}/newlib-%{newlib_version}-21%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-6%{?dist}/newlib-%{newlib_version}-22%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -668,7 +674,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.11-m68k-rtems4.11-binutils
-# Requires:       rtems-4.11-m68k-rtems4.11-newlib = %{newlib_version}-21%{?dist}
+# Requires:       rtems-4.11-m68k-rtems4.11-newlib = %{newlib_version}-22%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -686,7 +692,7 @@ Summary:        libgcc for m68k-rtems4.11-gcc
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 %{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.11-m68k-rtems4.11-newlib = %{newlib_version}-21%{?dist}
+Requires:       rtems-4.11-m68k-rtems4.11-newlib = %{newlib_version}-22%{?dist}
 License:	GPL
 
 %description -n rtems-4.11-m68k-rtems4.11-gcc-libgcc
@@ -871,7 +877,7 @@ Summary:      	C Library (newlib) for m68k-rtems4.11
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        21%{?dist}
+Release:        22%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.11-newlib-common
@@ -892,7 +898,7 @@ Newlib C Library for m68k-rtems4.11.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        21%{?dist}
+Release:        22%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable
 
diff --git a/rtems4.11/microblaze/rtems-4.11-microblaze-rtems4.11-gcc.spec b/rtems4.11/microblaze/rtems-4.11-microblaze-rtems4.11-gcc.spec
index 01b4bd6..942fd8e 100644
--- a/rtems4.11/microblaze/rtems-4.11-microblaze-rtems4.11-gcc.spec
+++ b/rtems4.11/microblaze/rtems-4.11-microblaze-rtems4.11-gcc.spec
@@ -59,14 +59,17 @@ Summary:      	microblaze-rtems4.11 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	5%{?dist}
+Release:      	6%{?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
@@ -241,6 +244,9 @@ BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
 
 %if "%{_build}" != "%{_host}"
 BuildRequires:  rtems-4.11-microblaze-rtems4.11-gcc = %{gcc_rpmvers}
+%if "%{gcc_version}" >= "4.8.0"
+BuildRequires:  rtems-4.11-microblaze-rtems4.11-gcc-c++ = %{gcc_rpmvers}
+%endif
 %endif
 
 # Not strictly required, but patches may introduce a need to use them.
@@ -253,7 +259,7 @@ BuildRequires:	rtems-4.11-microblaze-rtems4.11-binutils
 Requires:	rtems-4.11-gcc-common
 Requires:	rtems-4.11-microblaze-rtems4.11-binutils
 Requires:	rtems-4.11-microblaze-rtems4.11-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.11-microblaze-rtems4.11-newlib = %{newlib_version}-21%{?dist}
+Requires:	rtems-4.11-microblaze-rtems4.11-newlib = %{newlib_version}-22%{?dist}
 
 %if "%{gcc_version}" >= "4.5.0"
 BuildRequires:  zlib-devel
@@ -383,7 +389,7 @@ cd ..
   ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
 %endif
 
-echo "RTEMS gcc-%{gcc_version}-5%{?dist}/newlib-%{newlib_version}-21%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-6%{?dist}/newlib-%{newlib_version}-22%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -668,7 +674,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.11-microblaze-rtems4.11-binutils
-# Requires:       rtems-4.11-microblaze-rtems4.11-newlib = %{newlib_version}-21%{?dist}
+# Requires:       rtems-4.11-microblaze-rtems4.11-newlib = %{newlib_version}-22%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -686,7 +692,7 @@ Summary:        libgcc for microblaze-rtems4.11-gcc
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 %{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.11-microblaze-rtems4.11-newlib = %{newlib_version}-21%{?dist}
+Requires:       rtems-4.11-microblaze-rtems4.11-newlib = %{newlib_version}-22%{?dist}
 License:	GPL
 
 %description -n rtems-4.11-microblaze-rtems4.11-gcc-libgcc
@@ -871,7 +877,7 @@ Summary:      	C Library (newlib) for microblaze-rtems4.11
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        21%{?dist}
+Release:        22%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.11-newlib-common
@@ -892,7 +898,7 @@ Newlib C Library for microblaze-rtems4.11.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        21%{?dist}
+Release:        22%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable
 
diff --git a/rtems4.11/mips/rtems-4.11-mips-rtems4.11-gcc.spec b/rtems4.11/mips/rtems-4.11-mips-rtems4.11-gcc.spec
index ff230d8..c55169c 100644
--- a/rtems4.11/mips/rtems-4.11-mips-rtems4.11-gcc.spec
+++ b/rtems4.11/mips/rtems-4.11-mips-rtems4.11-gcc.spec
@@ -59,14 +59,17 @@ Summary:      	mips-rtems4.11 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	5%{?dist}
+Release:      	6%{?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
@@ -241,6 +244,9 @@ BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
 
 %if "%{_build}" != "%{_host}"
 BuildRequires:  rtems-4.11-mips-rtems4.11-gcc = %{gcc_rpmvers}
+%if "%{gcc_version}" >= "4.8.0"
+BuildRequires:  rtems-4.11-mips-rtems4.11-gcc-c++ = %{gcc_rpmvers}
+%endif
 %endif
 
 # Not strictly required, but patches may introduce a need to use them.
@@ -253,7 +259,7 @@ BuildRequires:	rtems-4.11-mips-rtems4.11-binutils
 Requires:	rtems-4.11-gcc-common
 Requires:	rtems-4.11-mips-rtems4.11-binutils
 Requires:	rtems-4.11-mips-rtems4.11-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.11-mips-rtems4.11-newlib = %{newlib_version}-21%{?dist}
+Requires:	rtems-4.11-mips-rtems4.11-newlib = %{newlib_version}-22%{?dist}
 
 %if "%{gcc_version}" >= "4.5.0"
 BuildRequires:  zlib-devel
@@ -383,7 +389,7 @@ cd ..
   ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
 %endif
 
-echo "RTEMS gcc-%{gcc_version}-5%{?dist}/newlib-%{newlib_version}-21%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-6%{?dist}/newlib-%{newlib_version}-22%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -668,7 +674,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.11-mips-rtems4.11-binutils
-# Requires:       rtems-4.11-mips-rtems4.11-newlib = %{newlib_version}-21%{?dist}
+# Requires:       rtems-4.11-mips-rtems4.11-newlib = %{newlib_version}-22%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -686,7 +692,7 @@ Summary:        libgcc for mips-rtems4.11-gcc
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 %{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.11-mips-rtems4.11-newlib = %{newlib_version}-21%{?dist}
+Requires:       rtems-4.11-mips-rtems4.11-newlib = %{newlib_version}-22%{?dist}
 License:	GPL
 
 %description -n rtems-4.11-mips-rtems4.11-gcc-libgcc
@@ -871,7 +877,7 @@ Summary:      	C Library (newlib) for mips-rtems4.11
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        21%{?dist}
+Release:        22%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.11-newlib-common
@@ -892,7 +898,7 @@ Newlib C Library for mips-rtems4.11.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        21%{?dist}
+Release:        22%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable
 
diff --git a/rtems4.11/powerpc/rtems-4.11-powerpc-rtems4.11-gcc.spec b/rtems4.11/powerpc/rtems-4.11-powerpc-rtems4.11-gcc.spec
index 502dcab..33dd021 100644
--- a/rtems4.11/powerpc/rtems-4.11-powerpc-rtems4.11-gcc.spec
+++ b/rtems4.11/powerpc/rtems-4.11-powerpc-rtems4.11-gcc.spec
@@ -59,14 +59,17 @@ Summary:      	powerpc-rtems4.11 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	5%{?dist}
+Release:      	6%{?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
@@ -241,6 +244,9 @@ BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
 
 %if "%{_build}" != "%{_host}"
 BuildRequires:  rtems-4.11-powerpc-rtems4.11-gcc = %{gcc_rpmvers}
+%if "%{gcc_version}" >= "4.8.0"
+BuildRequires:  rtems-4.11-powerpc-rtems4.11-gcc-c++ = %{gcc_rpmvers}
+%endif
 %endif
 
 # Not strictly required, but patches may introduce a need to use them.
@@ -253,7 +259,7 @@ BuildRequires:	rtems-4.11-powerpc-rtems4.11-binutils
 Requires:	rtems-4.11-gcc-common
 Requires:	rtems-4.11-powerpc-rtems4.11-binutils
 Requires:	rtems-4.11-powerpc-rtems4.11-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.11-powerpc-rtems4.11-newlib = %{newlib_version}-21%{?dist}
+Requires:	rtems-4.11-powerpc-rtems4.11-newlib = %{newlib_version}-22%{?dist}
 
 %if "%{gcc_version}" >= "4.5.0"
 BuildRequires:  zlib-devel
@@ -383,7 +389,7 @@ cd ..
   ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
 %endif
 
-echo "RTEMS gcc-%{gcc_version}-5%{?dist}/newlib-%{newlib_version}-21%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-6%{?dist}/newlib-%{newlib_version}-22%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -668,7 +674,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.11-powerpc-rtems4.11-binutils
-# Requires:       rtems-4.11-powerpc-rtems4.11-newlib = %{newlib_version}-21%{?dist}
+# Requires:       rtems-4.11-powerpc-rtems4.11-newlib = %{newlib_version}-22%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -686,7 +692,7 @@ Summary:        libgcc for powerpc-rtems4.11-gcc
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 %{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.11-powerpc-rtems4.11-newlib = %{newlib_version}-21%{?dist}
+Requires:       rtems-4.11-powerpc-rtems4.11-newlib = %{newlib_version}-22%{?dist}
 License:	GPL
 
 %description -n rtems-4.11-powerpc-rtems4.11-gcc-libgcc
@@ -871,7 +877,7 @@ Summary:      	C Library (newlib) for powerpc-rtems4.11
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        21%{?dist}
+Release:        22%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.11-newlib-common
@@ -892,7 +898,7 @@ Newlib C Library for powerpc-rtems4.11.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        21%{?dist}
+Release:        22%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable
 
diff --git a/rtems4.11/sh/rtems-4.11-sh-rtems4.11-gcc.spec b/rtems4.11/sh/rtems-4.11-sh-rtems4.11-gcc.spec
index e2f80e0..ac31251 100644
--- a/rtems4.11/sh/rtems-4.11-sh-rtems4.11-gcc.spec
+++ b/rtems4.11/sh/rtems-4.11-sh-rtems4.11-gcc.spec
@@ -59,14 +59,17 @@ Summary:      	sh-rtems4.11 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	5%{?dist}
+Release:      	6%{?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
@@ -241,6 +244,9 @@ BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
 
 %if "%{_build}" != "%{_host}"
 BuildRequires:  rtems-4.11-sh-rtems4.11-gcc = %{gcc_rpmvers}
+%if "%{gcc_version}" >= "4.8.0"
+BuildRequires:  rtems-4.11-sh-rtems4.11-gcc-c++ = %{gcc_rpmvers}
+%endif
 %endif
 
 # Not strictly required, but patches may introduce a need to use them.
@@ -253,7 +259,7 @@ BuildRequires:	rtems-4.11-sh-rtems4.11-binutils
 Requires:	rtems-4.11-gcc-common
 Requires:	rtems-4.11-sh-rtems4.11-binutils
 Requires:	rtems-4.11-sh-rtems4.11-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.11-sh-rtems4.11-newlib = %{newlib_version}-21%{?dist}
+Requires:	rtems-4.11-sh-rtems4.11-newlib = %{newlib_version}-22%{?dist}
 
 %if "%{gcc_version}" >= "4.5.0"
 BuildRequires:  zlib-devel
@@ -383,7 +389,7 @@ cd ..
   ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
 %endif
 
-echo "RTEMS gcc-%{gcc_version}-5%{?dist}/newlib-%{newlib_version}-21%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-6%{?dist}/newlib-%{newlib_version}-22%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -668,7 +674,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.11-sh-rtems4.11-binutils
-# Requires:       rtems-4.11-sh-rtems4.11-newlib = %{newlib_version}-21%{?dist}
+# Requires:       rtems-4.11-sh-rtems4.11-newlib = %{newlib_version}-22%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -686,7 +692,7 @@ Summary:        libgcc for sh-rtems4.11-gcc
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 %{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.11-sh-rtems4.11-newlib = %{newlib_version}-21%{?dist}
+Requires:       rtems-4.11-sh-rtems4.11-newlib = %{newlib_version}-22%{?dist}
 License:	GPL
 
 %description -n rtems-4.11-sh-rtems4.11-gcc-libgcc
@@ -871,7 +877,7 @@ Summary:      	C Library (newlib) for sh-rtems4.11
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        21%{?dist}
+Release:        22%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.11-newlib-common
@@ -892,7 +898,7 @@ Newlib C Library for sh-rtems4.11.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        21%{?dist}
+Release:        22%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable
 
diff --git a/rtems4.11/sparc/rtems-4.11-sparc-rtems4.11-gcc.spec b/rtems4.11/sparc/rtems-4.11-sparc-rtems4.11-gcc.spec
index d11213f..9b92daa 100644
--- a/rtems4.11/sparc/rtems-4.11-sparc-rtems4.11-gcc.spec
+++ b/rtems4.11/sparc/rtems-4.11-sparc-rtems4.11-gcc.spec
@@ -59,14 +59,17 @@ Summary:      	sparc-rtems4.11 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	1%{?dist}
+Release:      	2%{?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
@@ -241,6 +244,9 @@ BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
 
 %if "%{_build}" != "%{_host}"
 BuildRequires:  rtems-4.11-sparc-rtems4.11-gcc = %{gcc_rpmvers}
+%if "%{gcc_version}" >= "4.8.0"
+BuildRequires:  rtems-4.11-sparc-rtems4.11-gcc-c++ = %{gcc_rpmvers}
+%endif
 %endif
 
 # Not strictly required, but patches may introduce a need to use them.
@@ -253,7 +259,7 @@ BuildRequires:	rtems-4.11-sparc-rtems4.11-binutils
 Requires:	rtems-4.11-gcc-common
 Requires:	rtems-4.11-sparc-rtems4.11-binutils
 Requires:	rtems-4.11-sparc-rtems4.11-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.11-sparc-rtems4.11-newlib = %{newlib_version}-22%{?dist}
+Requires:	rtems-4.11-sparc-rtems4.11-newlib = %{newlib_version}-23%{?dist}
 
 %if "%{gcc_version}" >= "4.5.0"
 BuildRequires:  zlib-devel
@@ -383,7 +389,7 @@ cd ..
   ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
 %endif
 
-echo "RTEMS gcc-%{gcc_version}-1%{?dist}/newlib-%{newlib_version}-22%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-23%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -668,7 +674,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.11-sparc-rtems4.11-binutils
-# Requires:       rtems-4.11-sparc-rtems4.11-newlib = %{newlib_version}-22%{?dist}
+# Requires:       rtems-4.11-sparc-rtems4.11-newlib = %{newlib_version}-23%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -686,7 +692,7 @@ Summary:        libgcc for sparc-rtems4.11-gcc
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 %{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.11-sparc-rtems4.11-newlib = %{newlib_version}-22%{?dist}
+Requires:       rtems-4.11-sparc-rtems4.11-newlib = %{newlib_version}-23%{?dist}
 License:	GPL
 
 %description -n rtems-4.11-sparc-rtems4.11-gcc-libgcc
@@ -871,7 +877,7 @@ Summary:      	C Library (newlib) for sparc-rtems4.11
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        22%{?dist}
+Release:        23%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.11-newlib-common
@@ -892,7 +898,7 @@ Newlib C Library for sparc-rtems4.11.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        22%{?dist}
+Release:        23%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable
 
diff --git a/rtems4.11/sparc64/rtems-4.11-sparc64-rtems4.11-gcc.spec b/rtems4.11/sparc64/rtems-4.11-sparc64-rtems4.11-gcc.spec
index 5640a31..e28ee39 100644
--- a/rtems4.11/sparc64/rtems-4.11-sparc64-rtems4.11-gcc.spec
+++ b/rtems4.11/sparc64/rtems-4.11-sparc64-rtems4.11-gcc.spec
@@ -59,14 +59,17 @@ Summary:      	sparc64-rtems4.11 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	5%{?dist}
+Release:      	6%{?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
@@ -241,6 +244,9 @@ BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
 
 %if "%{_build}" != "%{_host}"
 BuildRequires:  rtems-4.11-sparc64-rtems4.11-gcc = %{gcc_rpmvers}
+%if "%{gcc_version}" >= "4.8.0"
+BuildRequires:  rtems-4.11-sparc64-rtems4.11-gcc-c++ = %{gcc_rpmvers}
+%endif
 %endif
 
 # Not strictly required, but patches may introduce a need to use them.
@@ -253,7 +259,7 @@ BuildRequires:	rtems-4.11-sparc64-rtems4.11-binutils
 Requires:	rtems-4.11-gcc-common
 Requires:	rtems-4.11-sparc64-rtems4.11-binutils
 Requires:	rtems-4.11-sparc64-rtems4.11-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.11-sparc64-rtems4.11-newlib = %{newlib_version}-21%{?dist}
+Requires:	rtems-4.11-sparc64-rtems4.11-newlib = %{newlib_version}-22%{?dist}
 
 %if "%{gcc_version}" >= "4.5.0"
 BuildRequires:  zlib-devel
@@ -383,7 +389,7 @@ cd ..
   ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
 %endif
 
-echo "RTEMS gcc-%{gcc_version}-5%{?dist}/newlib-%{newlib_version}-21%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-6%{?dist}/newlib-%{newlib_version}-22%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -668,7 +674,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.11-sparc64-rtems4.11-binutils
-# Requires:       rtems-4.11-sparc64-rtems4.11-newlib = %{newlib_version}-21%{?dist}
+# Requires:       rtems-4.11-sparc64-rtems4.11-newlib = %{newlib_version}-22%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -686,7 +692,7 @@ Summary:        libgcc for sparc64-rtems4.11-gcc
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 %{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.11-sparc64-rtems4.11-newlib = %{newlib_version}-21%{?dist}
+Requires:       rtems-4.11-sparc64-rtems4.11-newlib = %{newlib_version}-22%{?dist}
 License:	GPL
 
 %description -n rtems-4.11-sparc64-rtems4.11-gcc-libgcc
@@ -871,7 +877,7 @@ Summary:      	C Library (newlib) for sparc64-rtems4.11
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        21%{?dist}
+Release:        22%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.11-newlib-common
@@ -892,7 +898,7 @@ Newlib C Library for sparc64-rtems4.11.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        21%{?dist}
+Release:        22%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable
 
diff --git a/rtems4.11/v850/rtems-4.11-v850-rtems4.11-gcc.spec b/rtems4.11/v850/rtems-4.11-v850-rtems4.11-gcc.spec
index 09bc121..7a7123c 100644
--- a/rtems4.11/v850/rtems-4.11-v850-rtems4.11-gcc.spec
+++ b/rtems4.11/v850/rtems-4.11-v850-rtems4.11-gcc.spec
@@ -59,14 +59,17 @@ Summary:      	v850-rtems4.11 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	1%{?dist}
+Release:      	2%{?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
@@ -241,6 +244,9 @@ BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
 
 %if "%{_build}" != "%{_host}"
 BuildRequires:  rtems-4.11-v850-rtems4.11-gcc = %{gcc_rpmvers}
+%if "%{gcc_version}" >= "4.8.0"
+BuildRequires:  rtems-4.11-v850-rtems4.11-gcc-c++ = %{gcc_rpmvers}
+%endif
 %endif
 
 # Not strictly required, but patches may introduce a need to use them.
@@ -253,7 +259,7 @@ BuildRequires:	rtems-4.11-v850-rtems4.11-binutils
 Requires:	rtems-4.11-gcc-common
 Requires:	rtems-4.11-v850-rtems4.11-binutils
 Requires:	rtems-4.11-v850-rtems4.11-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.11-v850-rtems4.11-newlib = %{newlib_version}-22%{?dist}
+Requires:	rtems-4.11-v850-rtems4.11-newlib = %{newlib_version}-23%{?dist}
 
 %if "%{gcc_version}" >= "4.5.0"
 BuildRequires:  zlib-devel
@@ -383,7 +389,7 @@ cd ..
   ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
 %endif
 
-echo "RTEMS gcc-%{gcc_version}-1%{?dist}/newlib-%{newlib_version}-22%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-23%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -668,7 +674,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.11-v850-rtems4.11-binutils
-# Requires:       rtems-4.11-v850-rtems4.11-newlib = %{newlib_version}-22%{?dist}
+# Requires:       rtems-4.11-v850-rtems4.11-newlib = %{newlib_version}-23%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -686,7 +692,7 @@ Summary:        libgcc for v850-rtems4.11-gcc
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 %{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.11-v850-rtems4.11-newlib = %{newlib_version}-22%{?dist}
+Requires:       rtems-4.11-v850-rtems4.11-newlib = %{newlib_version}-23%{?dist}
 License:	GPL
 
 %description -n rtems-4.11-v850-rtems4.11-gcc-libgcc
@@ -871,7 +877,7 @@ Summary:      	C Library (newlib) for v850-rtems4.11
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        22%{?dist}
+Release:        23%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.11-newlib-common
@@ -892,7 +898,7 @@ Newlib C Library for v850-rtems4.11.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        22%{?dist}
+Release:        23%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable
 




More information about the vc mailing list