diff --git a/contrib/crossrpms/rtems4.10/arm/rtems-4.10-arm-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/arm/rtems-4.10-arm-rtems4.10-gcc.spec
index fff2c7f8ca..a32b02adf6 100644
--- a/contrib/crossrpms/rtems4.10/arm/rtems-4.10-arm-rtems4.10-gcc.spec
+++ b/contrib/crossrpms/rtems4.10/arm/rtems-4.10-arm-rtems4.10-gcc.spec
@@ -58,7 +58,7 @@ Summary:      	arm-rtems4.10 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)
@@ -135,7 +135,8 @@ 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-newlib = %{newlib_version}-47%{?dist}
+Requires:	rtems-4.10-arm-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release}
+Requires:	rtems-4.10-arm-rtems4.10-newlib = %{newlib_version}-48%{?dist}
 
 
 %define _gcclibdir %{_prefix}/lib
@@ -307,11 +308,11 @@ cd ..
   fi
 
   # Collect multilib subdirectories
-  f=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'`
+  multilibs=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'`
 
   echo "%defattr(-,root,root,-)" > build/files.newlib
   TGTDIR="%{_exec_prefix}/arm-rtems4.10/lib"
-  for i in $f; do
+  for i in $multilibs; do
     case $i in
     \.) echo "%dir ${TGTDIR}" >> build/files.newlib
       ;;
@@ -323,13 +324,8 @@ cd ..
   rm -f dirs ;
   echo "%defattr(-,root,root,-)" >> dirs
   echo "%dir %{_prefix}" >> dirs
-  echo "%dir %{_gcclibdir}" >> dirs
-  echo "%dir %{_libexecdir}" >> dirs
-  echo "%dir %{_gcclibdir}/gcc" >> dirs
-  echo "%dir %{_gcclibdir}/gcc/arm-rtems4.10" >> dirs
-
   TGTDIR="%{_gcclibdir}/gcc/arm-rtems4.10/%{gcc_version}"
-  for i in $f; do
+  for i in $multilibs; do
     case $i in
     \.) echo "%dir ${TGTDIR}" >> dirs
       ;;
@@ -360,6 +356,7 @@ cd ..
     *include/objc*) ;;
     *include/g++*);;
     *include/c++*);;
+    *include-fixed/*);;
     *finclude/*);;
     *adainclude*);;
     *adalib*);;
@@ -463,7 +460,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}-47%{?dist}
+# Requires:       rtems-4.10-arm-rtems4.10-newlib = %{newlib_version}-48%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -473,8 +470,25 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 %description -n rtems-4.10-arm-rtems4.10-gcc
 GNU cc compiler for arm-rtems4.10.
 
-%files -n rtems-4.10-arm-rtems4.10-gcc -f build/files.gcc
+# ==============================================================
+# rtems-4.10-arm-rtems4.10-gcc-libgcc
+# ==============================================================
+%package -n rtems-4.10-arm-rtems4.10-gcc-libgcc
+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}-48%{?dist}
+License:	GPL
+
+%description -n rtems-4.10-arm-rtems4.10-gcc-libgcc
+libgcc arm-rtems4.10-gcc.
+
+
+%files -n rtems-4.10-arm-rtems4.10-gcc
 %defattr(-,root,root)
+%dir %{_prefix}
+
 %dir %{_mandir}
 %dir %{_mandir}/man1
 %{_mandir}/man1/arm-rtems4.10-gcc.1*
@@ -488,7 +502,23 @@ GNU cc compiler for arm-rtems4.10.
 %{_bindir}/arm-rtems4.10-gcov%{_exeext}
 %{_bindir}/arm-rtems4.10-gccbug
 
+%dir %{_libexecdir}
+%dir %{_libexecdir}/gcc
+%dir %{_libexecdir}/gcc/arm-rtems4.10
+%dir %{_libexecdir}/gcc/arm-rtems4.10/%{gcc_version}
+%{_libexecdir}/gcc/arm-rtems4.10/%{gcc_version}/cc1%{_exeext}
+%{_libexecdir}/gcc/arm-rtems4.10/%{gcc_version}/collect2%{_exeext}
+
+
+%files -n rtems-4.10-arm-rtems4.10-gcc-libgcc -f build/files.gcc
+%defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_gcclibdir}
+%dir %{_gcclibdir}/gcc
+%dir %{_gcclibdir}/gcc/arm-rtems4.10
+%dir %{_gcclibdir}/gcc/arm-rtems4.10/%{gcc_version}
 %dir %{_gcclibdir}/gcc/arm-rtems4.10/%{gcc_version}/include
+
 %if "%{gcc_version}" > "4.0.3"
 %if "arm-rtems4.10" != "bfin-rtems4.10"
 %if "arm-rtems4.10" != "avr-rtems4.10"
@@ -498,15 +528,9 @@ GNU cc compiler for arm-rtems4.10.
 %endif
 
 %if "%{gcc_version}" >= "4.3.0"
-%dir %{_gcclibdir}/gcc/arm-rtems4.10/%{gcc_version}/include-fixed
+%{_gcclibdir}/gcc/arm-rtems4.10/%{gcc_version}/include-fixed
 %endif
 
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/arm-rtems4.10
-%dir %{_libexecdir}/gcc/arm-rtems4.10/%{gcc_version}
-%{_libexecdir}/gcc/arm-rtems4.10/%{gcc_version}/cc1%{_exeext}
-%{_libexecdir}/gcc/arm-rtems4.10/%{gcc_version}/collect2%{_exeext}
-
 # ==============================================================
 # rtems-4.10-gcc-common
 # ==============================================================
@@ -514,6 +538,7 @@ GNU cc compiler for arm-rtems4.10.
 Summary:	Base package for rtems gcc and newlib C Library
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
+%{?_with_noarch_subpackages:BuildArch: noarch}
 License:	GPL
 
 Requires(post): 	/sbin/install-info
@@ -562,12 +587,11 @@ Summary:	GCC c++ compiler for arm-rtems4.10
 Group:		Development/Tools
 Version:        %{gcc_rpmvers}
 License:	GPL
+Requires:       rtems-4.10-arm-rtems4.10-gcc-libstdc++ = %{gcc_rpmvers}-%{release}
 
 %if "%{_build}" != "%{_host}"
 BuildRequires:  rtems-4.10-arm-rtems4.10-gcc-c++ = %{gcc_rpmvers}
 %endif
-Provides:	rtems-4.10-arm-rtems4.10-c++ = %{gcc_rpmvers}-%{release}
-Obsoletes:	rtems-4.10-arm-rtems4.10-c++ < %{gcc_rpmvers}-%{release}
 
 Requires:       rtems-4.10-gcc-common
 Requires:       rtems-4.10-arm-rtems4.10-gcc = %{gcc_rpmvers}-%{release}
@@ -575,18 +599,44 @@ Requires:       rtems-4.10-arm-rtems4.10-gcc = %{gcc_rpmvers}-%{release}
 %description -n rtems-4.10-arm-rtems4.10-gcc-c++
 GCC c++ compiler for arm-rtems4.10.
 
-%files -n rtems-4.10-arm-rtems4.10-gcc-c++ -f build/files.g++
+
+%package -n rtems-4.10-arm-rtems4.10-gcc-libstdc++
+Summary:	libstdc++ for arm-rtems4.10
+Group:		Development/Tools
+Version:        %{gcc_rpmvers}
+%{?_with_noarch_subpackages:BuildArch: noarch}
+License:	GPL
+
+%description -n rtems-4.10-arm-rtems4.10-gcc-libstdc++
+%{_summary}
+
+
+%files -n rtems-4.10-arm-rtems4.10-gcc-c++
 %defattr(-,root,root)
+%dir %{_prefix}
+
+%dir %{_mandir}
+%dir %{_mandir}/man1
 %{_mandir}/man1/arm-rtems4.10-g++.1*
 
+%dir %{_bindir}
 %{_bindir}/arm-rtems4.10-c++%{_exeext}
 %{_bindir}/arm-rtems4.10-g++%{_exeext}
 
+%dir %{_libexecdir}
 %dir %{_libexecdir}/gcc
 %dir %{_libexecdir}/gcc/arm-rtems4.10
 %dir %{_libexecdir}/gcc/arm-rtems4.10/%{gcc_version}
 %{_libexecdir}/gcc/arm-rtems4.10/%{gcc_version}/cc1plus%{_exeext}
 
+
+%files -n rtems-4.10-arm-rtems4.10-gcc-libstdc++ -f build/files.g++
+%defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_gcclibdir}
+%dir %{_gcclibdir}/gcc
+%dir %{_gcclibdir}/gcc/arm-rtems4.10
+%dir %{_gcclibdir}/gcc/arm-rtems4.10/%{gcc_version}
 %dir %{_gcclibdir}/gcc/arm-rtems4.10/%{gcc_version}/include
 %{_gcclibdir}/gcc/arm-rtems4.10/%{gcc_version}/include/c++
 
@@ -600,7 +650,8 @@ Summary:      	C Library (newlib) for arm-rtems4.10
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        47%{?dist}
+Release:        48%{?dist}
+%{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.10-newlib-common
 
@@ -610,6 +661,7 @@ Newlib C Library for arm-rtems4.10.
 %files -n rtems-4.10-arm-rtems4.10-newlib -f build/files.newlib
 %defattr(-,root,root)
 %dir %{_prefix}
+%dir %{_exec_prefix}
 %dir %{_exec_prefix}/arm-rtems4.10
 %{_exec_prefix}/arm-rtems4.10/include
 
@@ -620,7 +672,8 @@ Newlib C Library for arm-rtems4.10.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        47%{?dist}
+Release:        48%{?dist}
+%{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable
 
 Requires(post): 	/sbin/install-info
diff --git a/contrib/crossrpms/rtems4.10/avr/rtems-4.10-avr-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/avr/rtems-4.10-avr-rtems4.10-gcc.spec
index 5200699df3..eaf5e9416c 100644
--- a/contrib/crossrpms/rtems4.10/avr/rtems-4.10-avr-rtems4.10-gcc.spec
+++ b/contrib/crossrpms/rtems4.10/avr/rtems-4.10-avr-rtems4.10-gcc.spec
@@ -135,6 +135,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}-47%{?dist}
 
 
@@ -299,11 +300,11 @@ cd ..
   fi
 
   # Collect multilib subdirectories
-  f=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'`
+  multilibs=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'`
 
   echo "%defattr(-,root,root,-)" > build/files.newlib
   TGTDIR="%{_exec_prefix}/avr-rtems4.10/lib"
-  for i in $f; do
+  for i in $multilibs; do
     case $i in
     \.) echo "%dir ${TGTDIR}" >> build/files.newlib
       ;;
@@ -315,13 +316,8 @@ cd ..
   rm -f dirs ;
   echo "%defattr(-,root,root,-)" >> dirs
   echo "%dir %{_prefix}" >> dirs
-  echo "%dir %{_gcclibdir}" >> dirs
-  echo "%dir %{_libexecdir}" >> dirs
-  echo "%dir %{_gcclibdir}/gcc" >> dirs
-  echo "%dir %{_gcclibdir}/gcc/avr-rtems4.10" >> dirs
-
   TGTDIR="%{_gcclibdir}/gcc/avr-rtems4.10/%{gcc_version}"
-  for i in $f; do
+  for i in $multilibs; do
     case $i in
     \.) echo "%dir ${TGTDIR}" >> dirs
       ;;
@@ -352,6 +348,7 @@ cd ..
     *include/objc*) ;;
     *include/g++*);;
     *include/c++*);;
+    *include-fixed/*);;
     *finclude/*);;
     *adainclude*);;
     *adalib*);;
@@ -465,8 +462,25 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 %description -n rtems-4.10-avr-rtems4.10-gcc
 GNU cc compiler for avr-rtems4.10.
 
-%files -n rtems-4.10-avr-rtems4.10-gcc -f build/files.gcc
+# ==============================================================
+# rtems-4.10-avr-rtems4.10-gcc-libgcc
+# ==============================================================
+%package -n rtems-4.10-avr-rtems4.10-gcc-libgcc
+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}-47%{?dist}
+License:	GPL
+
+%description -n rtems-4.10-avr-rtems4.10-gcc-libgcc
+libgcc avr-rtems4.10-gcc.
+
+
+%files -n rtems-4.10-avr-rtems4.10-gcc
 %defattr(-,root,root)
+%dir %{_prefix}
+
 %dir %{_mandir}
 %dir %{_mandir}/man1
 %{_mandir}/man1/avr-rtems4.10-gcc.1*
@@ -480,7 +494,23 @@ GNU cc compiler for avr-rtems4.10.
 %{_bindir}/avr-rtems4.10-gcov%{_exeext}
 %{_bindir}/avr-rtems4.10-gccbug
 
+%dir %{_libexecdir}
+%dir %{_libexecdir}/gcc
+%dir %{_libexecdir}/gcc/avr-rtems4.10
+%dir %{_libexecdir}/gcc/avr-rtems4.10/%{gcc_version}
+%{_libexecdir}/gcc/avr-rtems4.10/%{gcc_version}/cc1%{_exeext}
+%{_libexecdir}/gcc/avr-rtems4.10/%{gcc_version}/collect2%{_exeext}
+
+
+%files -n rtems-4.10-avr-rtems4.10-gcc-libgcc -f build/files.gcc
+%defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_gcclibdir}
+%dir %{_gcclibdir}/gcc
+%dir %{_gcclibdir}/gcc/avr-rtems4.10
+%dir %{_gcclibdir}/gcc/avr-rtems4.10/%{gcc_version}
 %dir %{_gcclibdir}/gcc/avr-rtems4.10/%{gcc_version}/include
+
 %if "%{gcc_version}" > "4.0.3"
 %if "avr-rtems4.10" != "bfin-rtems4.10"
 %if "avr-rtems4.10" != "avr-rtems4.10"
@@ -490,15 +520,9 @@ GNU cc compiler for avr-rtems4.10.
 %endif
 
 %if "%{gcc_version}" >= "4.3.0"
-%dir %{_gcclibdir}/gcc/avr-rtems4.10/%{gcc_version}/include-fixed
+%{_gcclibdir}/gcc/avr-rtems4.10/%{gcc_version}/include-fixed
 %endif
 
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/avr-rtems4.10
-%dir %{_libexecdir}/gcc/avr-rtems4.10/%{gcc_version}
-%{_libexecdir}/gcc/avr-rtems4.10/%{gcc_version}/cc1%{_exeext}
-%{_libexecdir}/gcc/avr-rtems4.10/%{gcc_version}/collect2%{_exeext}
-
 # ==============================================================
 # rtems-4.10-gcc-common
 # ==============================================================
@@ -506,6 +530,7 @@ GNU cc compiler for avr-rtems4.10.
 Summary:	Base package for rtems gcc and newlib C Library
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
+%{?_with_noarch_subpackages:BuildArch: noarch}
 License:	GPL
 
 Requires(post): 	/sbin/install-info
@@ -558,6 +583,7 @@ Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
 Release:        47%{?dist}
+%{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.10-newlib-common
 
@@ -567,6 +593,7 @@ Newlib C Library for avr-rtems4.10.
 %files -n rtems-4.10-avr-rtems4.10-newlib -f build/files.newlib
 %defattr(-,root,root)
 %dir %{_prefix}
+%dir %{_exec_prefix}
 %dir %{_exec_prefix}/avr-rtems4.10
 %{_exec_prefix}/avr-rtems4.10/include
 
@@ -578,6 +605,7 @@ Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
 Release:        47%{?dist}
+%{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable
 
 Requires(post): 	/sbin/install-info
diff --git a/contrib/crossrpms/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-gcc.spec
index 0dd6f299c7..7832b2da29 100644
--- a/contrib/crossrpms/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-gcc.spec
+++ b/contrib/crossrpms/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-gcc.spec
@@ -58,7 +58,7 @@ Summary:      	bfin-rtems4.10 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)
@@ -135,7 +135,8 @@ 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-newlib = %{newlib_version}-47%{?dist}
+Requires:	rtems-4.10-bfin-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release}
+Requires:	rtems-4.10-bfin-rtems4.10-newlib = %{newlib_version}-48%{?dist}
 
 
 %define _gcclibdir %{_prefix}/lib
@@ -307,11 +308,11 @@ cd ..
   fi
 
   # Collect multilib subdirectories
-  f=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'`
+  multilibs=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'`
 
   echo "%defattr(-,root,root,-)" > build/files.newlib
   TGTDIR="%{_exec_prefix}/bfin-rtems4.10/lib"
-  for i in $f; do
+  for i in $multilibs; do
     case $i in
     \.) echo "%dir ${TGTDIR}" >> build/files.newlib
       ;;
@@ -323,13 +324,8 @@ cd ..
   rm -f dirs ;
   echo "%defattr(-,root,root,-)" >> dirs
   echo "%dir %{_prefix}" >> dirs
-  echo "%dir %{_gcclibdir}" >> dirs
-  echo "%dir %{_libexecdir}" >> dirs
-  echo "%dir %{_gcclibdir}/gcc" >> dirs
-  echo "%dir %{_gcclibdir}/gcc/bfin-rtems4.10" >> dirs
-
   TGTDIR="%{_gcclibdir}/gcc/bfin-rtems4.10/%{gcc_version}"
-  for i in $f; do
+  for i in $multilibs; do
     case $i in
     \.) echo "%dir ${TGTDIR}" >> dirs
       ;;
@@ -360,6 +356,7 @@ cd ..
     *include/objc*) ;;
     *include/g++*);;
     *include/c++*);;
+    *include-fixed/*);;
     *finclude/*);;
     *adainclude*);;
     *adalib*);;
@@ -463,7 +460,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}-47%{?dist}
+# Requires:       rtems-4.10-bfin-rtems4.10-newlib = %{newlib_version}-48%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -473,8 +470,25 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 %description -n rtems-4.10-bfin-rtems4.10-gcc
 GNU cc compiler for bfin-rtems4.10.
 
-%files -n rtems-4.10-bfin-rtems4.10-gcc -f build/files.gcc
+# ==============================================================
+# rtems-4.10-bfin-rtems4.10-gcc-libgcc
+# ==============================================================
+%package -n rtems-4.10-bfin-rtems4.10-gcc-libgcc
+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}-48%{?dist}
+License:	GPL
+
+%description -n rtems-4.10-bfin-rtems4.10-gcc-libgcc
+libgcc bfin-rtems4.10-gcc.
+
+
+%files -n rtems-4.10-bfin-rtems4.10-gcc
 %defattr(-,root,root)
+%dir %{_prefix}
+
 %dir %{_mandir}
 %dir %{_mandir}/man1
 %{_mandir}/man1/bfin-rtems4.10-gcc.1*
@@ -488,7 +502,23 @@ GNU cc compiler for bfin-rtems4.10.
 %{_bindir}/bfin-rtems4.10-gcov%{_exeext}
 %{_bindir}/bfin-rtems4.10-gccbug
 
+%dir %{_libexecdir}
+%dir %{_libexecdir}/gcc
+%dir %{_libexecdir}/gcc/bfin-rtems4.10
+%dir %{_libexecdir}/gcc/bfin-rtems4.10/%{gcc_version}
+%{_libexecdir}/gcc/bfin-rtems4.10/%{gcc_version}/cc1%{_exeext}
+%{_libexecdir}/gcc/bfin-rtems4.10/%{gcc_version}/collect2%{_exeext}
+
+
+%files -n rtems-4.10-bfin-rtems4.10-gcc-libgcc -f build/files.gcc
+%defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_gcclibdir}
+%dir %{_gcclibdir}/gcc
+%dir %{_gcclibdir}/gcc/bfin-rtems4.10
+%dir %{_gcclibdir}/gcc/bfin-rtems4.10/%{gcc_version}
 %dir %{_gcclibdir}/gcc/bfin-rtems4.10/%{gcc_version}/include
+
 %if "%{gcc_version}" > "4.0.3"
 %if "bfin-rtems4.10" != "bfin-rtems4.10"
 %if "bfin-rtems4.10" != "avr-rtems4.10"
@@ -498,15 +528,9 @@ GNU cc compiler for bfin-rtems4.10.
 %endif
 
 %if "%{gcc_version}" >= "4.3.0"
-%dir %{_gcclibdir}/gcc/bfin-rtems4.10/%{gcc_version}/include-fixed
+%{_gcclibdir}/gcc/bfin-rtems4.10/%{gcc_version}/include-fixed
 %endif
 
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/bfin-rtems4.10
-%dir %{_libexecdir}/gcc/bfin-rtems4.10/%{gcc_version}
-%{_libexecdir}/gcc/bfin-rtems4.10/%{gcc_version}/cc1%{_exeext}
-%{_libexecdir}/gcc/bfin-rtems4.10/%{gcc_version}/collect2%{_exeext}
-
 # ==============================================================
 # rtems-4.10-gcc-common
 # ==============================================================
@@ -514,6 +538,7 @@ GNU cc compiler for bfin-rtems4.10.
 Summary:	Base package for rtems gcc and newlib C Library
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
+%{?_with_noarch_subpackages:BuildArch: noarch}
 License:	GPL
 
 Requires(post): 	/sbin/install-info
@@ -562,12 +587,11 @@ Summary:	GCC c++ compiler for bfin-rtems4.10
 Group:		Development/Tools
 Version:        %{gcc_rpmvers}
 License:	GPL
+Requires:       rtems-4.10-bfin-rtems4.10-gcc-libstdc++ = %{gcc_rpmvers}-%{release}
 
 %if "%{_build}" != "%{_host}"
 BuildRequires:  rtems-4.10-bfin-rtems4.10-gcc-c++ = %{gcc_rpmvers}
 %endif
-Provides:	rtems-4.10-bfin-rtems4.10-c++ = %{gcc_rpmvers}-%{release}
-Obsoletes:	rtems-4.10-bfin-rtems4.10-c++ < %{gcc_rpmvers}-%{release}
 
 Requires:       rtems-4.10-gcc-common
 Requires:       rtems-4.10-bfin-rtems4.10-gcc = %{gcc_rpmvers}-%{release}
@@ -575,18 +599,44 @@ Requires:       rtems-4.10-bfin-rtems4.10-gcc = %{gcc_rpmvers}-%{release}
 %description -n rtems-4.10-bfin-rtems4.10-gcc-c++
 GCC c++ compiler for bfin-rtems4.10.
 
-%files -n rtems-4.10-bfin-rtems4.10-gcc-c++ -f build/files.g++
+
+%package -n rtems-4.10-bfin-rtems4.10-gcc-libstdc++
+Summary:	libstdc++ for bfin-rtems4.10
+Group:		Development/Tools
+Version:        %{gcc_rpmvers}
+%{?_with_noarch_subpackages:BuildArch: noarch}
+License:	GPL
+
+%description -n rtems-4.10-bfin-rtems4.10-gcc-libstdc++
+%{_summary}
+
+
+%files -n rtems-4.10-bfin-rtems4.10-gcc-c++
 %defattr(-,root,root)
+%dir %{_prefix}
+
+%dir %{_mandir}
+%dir %{_mandir}/man1
 %{_mandir}/man1/bfin-rtems4.10-g++.1*
 
+%dir %{_bindir}
 %{_bindir}/bfin-rtems4.10-c++%{_exeext}
 %{_bindir}/bfin-rtems4.10-g++%{_exeext}
 
+%dir %{_libexecdir}
 %dir %{_libexecdir}/gcc
 %dir %{_libexecdir}/gcc/bfin-rtems4.10
 %dir %{_libexecdir}/gcc/bfin-rtems4.10/%{gcc_version}
 %{_libexecdir}/gcc/bfin-rtems4.10/%{gcc_version}/cc1plus%{_exeext}
 
+
+%files -n rtems-4.10-bfin-rtems4.10-gcc-libstdc++ -f build/files.g++
+%defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_gcclibdir}
+%dir %{_gcclibdir}/gcc
+%dir %{_gcclibdir}/gcc/bfin-rtems4.10
+%dir %{_gcclibdir}/gcc/bfin-rtems4.10/%{gcc_version}
 %dir %{_gcclibdir}/gcc/bfin-rtems4.10/%{gcc_version}/include
 %{_gcclibdir}/gcc/bfin-rtems4.10/%{gcc_version}/include/c++
 
@@ -600,7 +650,8 @@ Summary:      	C Library (newlib) for bfin-rtems4.10
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        47%{?dist}
+Release:        48%{?dist}
+%{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.10-newlib-common
 
@@ -610,6 +661,7 @@ Newlib C Library for bfin-rtems4.10.
 %files -n rtems-4.10-bfin-rtems4.10-newlib -f build/files.newlib
 %defattr(-,root,root)
 %dir %{_prefix}
+%dir %{_exec_prefix}
 %dir %{_exec_prefix}/bfin-rtems4.10
 %{_exec_prefix}/bfin-rtems4.10/include
 
@@ -620,7 +672,8 @@ Newlib C Library for bfin-rtems4.10.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        47%{?dist}
+Release:        48%{?dist}
+%{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable
 
 Requires(post): 	/sbin/install-info
diff --git a/contrib/crossrpms/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-gcc.spec
index 4005298a1c..5a094ad0ba 100644
--- a/contrib/crossrpms/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-gcc.spec
+++ b/contrib/crossrpms/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-gcc.spec
@@ -135,6 +135,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}-47%{?dist}
 
 
@@ -307,11 +308,11 @@ cd ..
   fi
 
   # Collect multilib subdirectories
-  f=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'`
+  multilibs=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'`
 
   echo "%defattr(-,root,root,-)" > build/files.newlib
   TGTDIR="%{_exec_prefix}/h8300-rtems4.10/lib"
-  for i in $f; do
+  for i in $multilibs; do
     case $i in
     \.) echo "%dir ${TGTDIR}" >> build/files.newlib
       ;;
@@ -323,13 +324,8 @@ cd ..
   rm -f dirs ;
   echo "%defattr(-,root,root,-)" >> dirs
   echo "%dir %{_prefix}" >> dirs
-  echo "%dir %{_gcclibdir}" >> dirs
-  echo "%dir %{_libexecdir}" >> dirs
-  echo "%dir %{_gcclibdir}/gcc" >> dirs
-  echo "%dir %{_gcclibdir}/gcc/h8300-rtems4.10" >> dirs
-
   TGTDIR="%{_gcclibdir}/gcc/h8300-rtems4.10/%{gcc_version}"
-  for i in $f; do
+  for i in $multilibs; do
     case $i in
     \.) echo "%dir ${TGTDIR}" >> dirs
       ;;
@@ -360,6 +356,7 @@ cd ..
     *include/objc*) ;;
     *include/g++*);;
     *include/c++*);;
+    *include-fixed/*);;
     *finclude/*);;
     *adainclude*);;
     *adalib*);;
@@ -473,8 +470,25 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 %description -n rtems-4.10-h8300-rtems4.10-gcc
 GNU cc compiler for h8300-rtems4.10.
 
-%files -n rtems-4.10-h8300-rtems4.10-gcc -f build/files.gcc
+# ==============================================================
+# rtems-4.10-h8300-rtems4.10-gcc-libgcc
+# ==============================================================
+%package -n rtems-4.10-h8300-rtems4.10-gcc-libgcc
+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}-47%{?dist}
+License:	GPL
+
+%description -n rtems-4.10-h8300-rtems4.10-gcc-libgcc
+libgcc h8300-rtems4.10-gcc.
+
+
+%files -n rtems-4.10-h8300-rtems4.10-gcc
 %defattr(-,root,root)
+%dir %{_prefix}
+
 %dir %{_mandir}
 %dir %{_mandir}/man1
 %{_mandir}/man1/h8300-rtems4.10-gcc.1*
@@ -488,7 +502,23 @@ GNU cc compiler for h8300-rtems4.10.
 %{_bindir}/h8300-rtems4.10-gcov%{_exeext}
 %{_bindir}/h8300-rtems4.10-gccbug
 
+%dir %{_libexecdir}
+%dir %{_libexecdir}/gcc
+%dir %{_libexecdir}/gcc/h8300-rtems4.10
+%dir %{_libexecdir}/gcc/h8300-rtems4.10/%{gcc_version}
+%{_libexecdir}/gcc/h8300-rtems4.10/%{gcc_version}/cc1%{_exeext}
+%{_libexecdir}/gcc/h8300-rtems4.10/%{gcc_version}/collect2%{_exeext}
+
+
+%files -n rtems-4.10-h8300-rtems4.10-gcc-libgcc -f build/files.gcc
+%defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_gcclibdir}
+%dir %{_gcclibdir}/gcc
+%dir %{_gcclibdir}/gcc/h8300-rtems4.10
+%dir %{_gcclibdir}/gcc/h8300-rtems4.10/%{gcc_version}
 %dir %{_gcclibdir}/gcc/h8300-rtems4.10/%{gcc_version}/include
+
 %if "%{gcc_version}" > "4.0.3"
 %if "h8300-rtems4.10" != "bfin-rtems4.10"
 %if "h8300-rtems4.10" != "avr-rtems4.10"
@@ -498,15 +528,9 @@ GNU cc compiler for h8300-rtems4.10.
 %endif
 
 %if "%{gcc_version}" >= "4.3.0"
-%dir %{_gcclibdir}/gcc/h8300-rtems4.10/%{gcc_version}/include-fixed
+%{_gcclibdir}/gcc/h8300-rtems4.10/%{gcc_version}/include-fixed
 %endif
 
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/h8300-rtems4.10
-%dir %{_libexecdir}/gcc/h8300-rtems4.10/%{gcc_version}
-%{_libexecdir}/gcc/h8300-rtems4.10/%{gcc_version}/cc1%{_exeext}
-%{_libexecdir}/gcc/h8300-rtems4.10/%{gcc_version}/collect2%{_exeext}
-
 # ==============================================================
 # rtems-4.10-gcc-common
 # ==============================================================
@@ -514,6 +538,7 @@ GNU cc compiler for h8300-rtems4.10.
 Summary:	Base package for rtems gcc and newlib C Library
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
+%{?_with_noarch_subpackages:BuildArch: noarch}
 License:	GPL
 
 Requires(post): 	/sbin/install-info
@@ -562,12 +587,11 @@ Summary:	GCC c++ compiler for h8300-rtems4.10
 Group:		Development/Tools
 Version:        %{gcc_rpmvers}
 License:	GPL
+Requires:       rtems-4.10-h8300-rtems4.10-gcc-libstdc++ = %{gcc_rpmvers}-%{release}
 
 %if "%{_build}" != "%{_host}"
 BuildRequires:  rtems-4.10-h8300-rtems4.10-gcc-c++ = %{gcc_rpmvers}
 %endif
-Provides:	rtems-4.10-h8300-rtems4.10-c++ = %{gcc_rpmvers}-%{release}
-Obsoletes:	rtems-4.10-h8300-rtems4.10-c++ < %{gcc_rpmvers}-%{release}
 
 Requires:       rtems-4.10-gcc-common
 Requires:       rtems-4.10-h8300-rtems4.10-gcc = %{gcc_rpmvers}-%{release}
@@ -575,18 +599,44 @@ Requires:       rtems-4.10-h8300-rtems4.10-gcc = %{gcc_rpmvers}-%{release}
 %description -n rtems-4.10-h8300-rtems4.10-gcc-c++
 GCC c++ compiler for h8300-rtems4.10.
 
-%files -n rtems-4.10-h8300-rtems4.10-gcc-c++ -f build/files.g++
+
+%package -n rtems-4.10-h8300-rtems4.10-gcc-libstdc++
+Summary:	libstdc++ for h8300-rtems4.10
+Group:		Development/Tools
+Version:        %{gcc_rpmvers}
+%{?_with_noarch_subpackages:BuildArch: noarch}
+License:	GPL
+
+%description -n rtems-4.10-h8300-rtems4.10-gcc-libstdc++
+%{_summary}
+
+
+%files -n rtems-4.10-h8300-rtems4.10-gcc-c++
 %defattr(-,root,root)
+%dir %{_prefix}
+
+%dir %{_mandir}
+%dir %{_mandir}/man1
 %{_mandir}/man1/h8300-rtems4.10-g++.1*
 
+%dir %{_bindir}
 %{_bindir}/h8300-rtems4.10-c++%{_exeext}
 %{_bindir}/h8300-rtems4.10-g++%{_exeext}
 
+%dir %{_libexecdir}
 %dir %{_libexecdir}/gcc
 %dir %{_libexecdir}/gcc/h8300-rtems4.10
 %dir %{_libexecdir}/gcc/h8300-rtems4.10/%{gcc_version}
 %{_libexecdir}/gcc/h8300-rtems4.10/%{gcc_version}/cc1plus%{_exeext}
 
+
+%files -n rtems-4.10-h8300-rtems4.10-gcc-libstdc++ -f build/files.g++
+%defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_gcclibdir}
+%dir %{_gcclibdir}/gcc
+%dir %{_gcclibdir}/gcc/h8300-rtems4.10
+%dir %{_gcclibdir}/gcc/h8300-rtems4.10/%{gcc_version}
 %dir %{_gcclibdir}/gcc/h8300-rtems4.10/%{gcc_version}/include
 %{_gcclibdir}/gcc/h8300-rtems4.10/%{gcc_version}/include/c++
 
@@ -601,6 +651,7 @@ Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
 Release:        47%{?dist}
+%{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.10-newlib-common
 
@@ -610,6 +661,7 @@ Newlib C Library for h8300-rtems4.10.
 %files -n rtems-4.10-h8300-rtems4.10-newlib -f build/files.newlib
 %defattr(-,root,root)
 %dir %{_prefix}
+%dir %{_exec_prefix}
 %dir %{_exec_prefix}/h8300-rtems4.10
 %{_exec_prefix}/h8300-rtems4.10/include
 
@@ -621,6 +673,7 @@ Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
 Release:        47%{?dist}
+%{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable
 
 Requires(post): 	/sbin/install-info
diff --git a/contrib/crossrpms/rtems4.10/i386/rtems-4.10-i386-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/i386/rtems-4.10-i386-rtems4.10-gcc.spec
index 98a27f2993..9b6ce9f588 100644
--- a/contrib/crossrpms/rtems4.10/i386/rtems-4.10-i386-rtems4.10-gcc.spec
+++ b/contrib/crossrpms/rtems4.10/i386/rtems-4.10-i386-rtems4.10-gcc.spec
@@ -135,6 +135,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}-47%{?dist}
 
 
@@ -307,11 +308,11 @@ cd ..
   fi
 
   # Collect multilib subdirectories
-  f=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'`
+  multilibs=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'`
 
   echo "%defattr(-,root,root,-)" > build/files.newlib
   TGTDIR="%{_exec_prefix}/i386-rtems4.10/lib"
-  for i in $f; do
+  for i in $multilibs; do
     case $i in
     \.) echo "%dir ${TGTDIR}" >> build/files.newlib
       ;;
@@ -323,13 +324,8 @@ cd ..
   rm -f dirs ;
   echo "%defattr(-,root,root,-)" >> dirs
   echo "%dir %{_prefix}" >> dirs
-  echo "%dir %{_gcclibdir}" >> dirs
-  echo "%dir %{_libexecdir}" >> dirs
-  echo "%dir %{_gcclibdir}/gcc" >> dirs
-  echo "%dir %{_gcclibdir}/gcc/i386-rtems4.10" >> dirs
-
   TGTDIR="%{_gcclibdir}/gcc/i386-rtems4.10/%{gcc_version}"
-  for i in $f; do
+  for i in $multilibs; do
     case $i in
     \.) echo "%dir ${TGTDIR}" >> dirs
       ;;
@@ -360,6 +356,7 @@ cd ..
     *include/objc*) ;;
     *include/g++*);;
     *include/c++*);;
+    *include-fixed/*);;
     *finclude/*);;
     *adainclude*);;
     *adalib*);;
@@ -473,8 +470,25 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 %description -n rtems-4.10-i386-rtems4.10-gcc
 GNU cc compiler for i386-rtems4.10.
 
-%files -n rtems-4.10-i386-rtems4.10-gcc -f build/files.gcc
+# ==============================================================
+# rtems-4.10-i386-rtems4.10-gcc-libgcc
+# ==============================================================
+%package -n rtems-4.10-i386-rtems4.10-gcc-libgcc
+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}-47%{?dist}
+License:	GPL
+
+%description -n rtems-4.10-i386-rtems4.10-gcc-libgcc
+libgcc i386-rtems4.10-gcc.
+
+
+%files -n rtems-4.10-i386-rtems4.10-gcc
 %defattr(-,root,root)
+%dir %{_prefix}
+
 %dir %{_mandir}
 %dir %{_mandir}/man1
 %{_mandir}/man1/i386-rtems4.10-gcc.1*
@@ -488,7 +502,23 @@ GNU cc compiler for i386-rtems4.10.
 %{_bindir}/i386-rtems4.10-gcov%{_exeext}
 %{_bindir}/i386-rtems4.10-gccbug
 
+%dir %{_libexecdir}
+%dir %{_libexecdir}/gcc
+%dir %{_libexecdir}/gcc/i386-rtems4.10
+%dir %{_libexecdir}/gcc/i386-rtems4.10/%{gcc_version}
+%{_libexecdir}/gcc/i386-rtems4.10/%{gcc_version}/cc1%{_exeext}
+%{_libexecdir}/gcc/i386-rtems4.10/%{gcc_version}/collect2%{_exeext}
+
+
+%files -n rtems-4.10-i386-rtems4.10-gcc-libgcc -f build/files.gcc
+%defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_gcclibdir}
+%dir %{_gcclibdir}/gcc
+%dir %{_gcclibdir}/gcc/i386-rtems4.10
+%dir %{_gcclibdir}/gcc/i386-rtems4.10/%{gcc_version}
 %dir %{_gcclibdir}/gcc/i386-rtems4.10/%{gcc_version}/include
+
 %if "%{gcc_version}" > "4.0.3"
 %if "i386-rtems4.10" != "bfin-rtems4.10"
 %if "i386-rtems4.10" != "avr-rtems4.10"
@@ -498,15 +528,9 @@ GNU cc compiler for i386-rtems4.10.
 %endif
 
 %if "%{gcc_version}" >= "4.3.0"
-%dir %{_gcclibdir}/gcc/i386-rtems4.10/%{gcc_version}/include-fixed
+%{_gcclibdir}/gcc/i386-rtems4.10/%{gcc_version}/include-fixed
 %endif
 
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/i386-rtems4.10
-%dir %{_libexecdir}/gcc/i386-rtems4.10/%{gcc_version}
-%{_libexecdir}/gcc/i386-rtems4.10/%{gcc_version}/cc1%{_exeext}
-%{_libexecdir}/gcc/i386-rtems4.10/%{gcc_version}/collect2%{_exeext}
-
 # ==============================================================
 # rtems-4.10-gcc-common
 # ==============================================================
@@ -514,6 +538,7 @@ GNU cc compiler for i386-rtems4.10.
 Summary:	Base package for rtems gcc and newlib C Library
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
+%{?_with_noarch_subpackages:BuildArch: noarch}
 License:	GPL
 
 Requires(post): 	/sbin/install-info
@@ -562,12 +587,11 @@ Summary:	GCC c++ compiler for i386-rtems4.10
 Group:		Development/Tools
 Version:        %{gcc_rpmvers}
 License:	GPL
+Requires:       rtems-4.10-i386-rtems4.10-gcc-libstdc++ = %{gcc_rpmvers}-%{release}
 
 %if "%{_build}" != "%{_host}"
 BuildRequires:  rtems-4.10-i386-rtems4.10-gcc-c++ = %{gcc_rpmvers}
 %endif
-Provides:	rtems-4.10-i386-rtems4.10-c++ = %{gcc_rpmvers}-%{release}
-Obsoletes:	rtems-4.10-i386-rtems4.10-c++ < %{gcc_rpmvers}-%{release}
 
 Requires:       rtems-4.10-gcc-common
 Requires:       rtems-4.10-i386-rtems4.10-gcc = %{gcc_rpmvers}-%{release}
@@ -575,18 +599,44 @@ Requires:       rtems-4.10-i386-rtems4.10-gcc = %{gcc_rpmvers}-%{release}
 %description -n rtems-4.10-i386-rtems4.10-gcc-c++
 GCC c++ compiler for i386-rtems4.10.
 
-%files -n rtems-4.10-i386-rtems4.10-gcc-c++ -f build/files.g++
+
+%package -n rtems-4.10-i386-rtems4.10-gcc-libstdc++
+Summary:	libstdc++ for i386-rtems4.10
+Group:		Development/Tools
+Version:        %{gcc_rpmvers}
+%{?_with_noarch_subpackages:BuildArch: noarch}
+License:	GPL
+
+%description -n rtems-4.10-i386-rtems4.10-gcc-libstdc++
+%{_summary}
+
+
+%files -n rtems-4.10-i386-rtems4.10-gcc-c++
 %defattr(-,root,root)
+%dir %{_prefix}
+
+%dir %{_mandir}
+%dir %{_mandir}/man1
 %{_mandir}/man1/i386-rtems4.10-g++.1*
 
+%dir %{_bindir}
 %{_bindir}/i386-rtems4.10-c++%{_exeext}
 %{_bindir}/i386-rtems4.10-g++%{_exeext}
 
+%dir %{_libexecdir}
 %dir %{_libexecdir}/gcc
 %dir %{_libexecdir}/gcc/i386-rtems4.10
 %dir %{_libexecdir}/gcc/i386-rtems4.10/%{gcc_version}
 %{_libexecdir}/gcc/i386-rtems4.10/%{gcc_version}/cc1plus%{_exeext}
 
+
+%files -n rtems-4.10-i386-rtems4.10-gcc-libstdc++ -f build/files.g++
+%defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_gcclibdir}
+%dir %{_gcclibdir}/gcc
+%dir %{_gcclibdir}/gcc/i386-rtems4.10
+%dir %{_gcclibdir}/gcc/i386-rtems4.10/%{gcc_version}
 %dir %{_gcclibdir}/gcc/i386-rtems4.10/%{gcc_version}/include
 %{_gcclibdir}/gcc/i386-rtems4.10/%{gcc_version}/include/c++
 
@@ -601,6 +651,7 @@ Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
 Release:        47%{?dist}
+%{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.10-newlib-common
 
@@ -610,6 +661,7 @@ Newlib C Library for i386-rtems4.10.
 %files -n rtems-4.10-i386-rtems4.10-newlib -f build/files.newlib
 %defattr(-,root,root)
 %dir %{_prefix}
+%dir %{_exec_prefix}
 %dir %{_exec_prefix}/i386-rtems4.10
 %{_exec_prefix}/i386-rtems4.10/include
 
@@ -621,6 +673,7 @@ Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
 Release:        47%{?dist}
+%{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable
 
 Requires(post): 	/sbin/install-info
diff --git a/contrib/crossrpms/rtems4.10/lm32/rtems-4.10-lm32-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/lm32/rtems-4.10-lm32-rtems4.10-gcc.spec
index c02ce9170d..37bd907a3e 100644
--- a/contrib/crossrpms/rtems4.10/lm32/rtems-4.10-lm32-rtems4.10-gcc.spec
+++ b/contrib/crossrpms/rtems4.10/lm32/rtems-4.10-lm32-rtems4.10-gcc.spec
@@ -135,6 +135,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}-47%{?dist}
 
 
@@ -307,11 +308,11 @@ cd ..
   fi
 
   # Collect multilib subdirectories
-  f=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'`
+  multilibs=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'`
 
   echo "%defattr(-,root,root,-)" > build/files.newlib
   TGTDIR="%{_exec_prefix}/lm32-rtems4.10/lib"
-  for i in $f; do
+  for i in $multilibs; do
     case $i in
     \.) echo "%dir ${TGTDIR}" >> build/files.newlib
       ;;
@@ -323,13 +324,8 @@ cd ..
   rm -f dirs ;
   echo "%defattr(-,root,root,-)" >> dirs
   echo "%dir %{_prefix}" >> dirs
-  echo "%dir %{_gcclibdir}" >> dirs
-  echo "%dir %{_libexecdir}" >> dirs
-  echo "%dir %{_gcclibdir}/gcc" >> dirs
-  echo "%dir %{_gcclibdir}/gcc/lm32-rtems4.10" >> dirs
-
   TGTDIR="%{_gcclibdir}/gcc/lm32-rtems4.10/%{gcc_version}"
-  for i in $f; do
+  for i in $multilibs; do
     case $i in
     \.) echo "%dir ${TGTDIR}" >> dirs
       ;;
@@ -360,6 +356,7 @@ cd ..
     *include/objc*) ;;
     *include/g++*);;
     *include/c++*);;
+    *include-fixed/*);;
     *finclude/*);;
     *adainclude*);;
     *adalib*);;
@@ -473,8 +470,25 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 %description -n rtems-4.10-lm32-rtems4.10-gcc
 GNU cc compiler for lm32-rtems4.10.
 
-%files -n rtems-4.10-lm32-rtems4.10-gcc -f build/files.gcc
+# ==============================================================
+# rtems-4.10-lm32-rtems4.10-gcc-libgcc
+# ==============================================================
+%package -n rtems-4.10-lm32-rtems4.10-gcc-libgcc
+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}-47%{?dist}
+License:	GPL
+
+%description -n rtems-4.10-lm32-rtems4.10-gcc-libgcc
+libgcc lm32-rtems4.10-gcc.
+
+
+%files -n rtems-4.10-lm32-rtems4.10-gcc
 %defattr(-,root,root)
+%dir %{_prefix}
+
 %dir %{_mandir}
 %dir %{_mandir}/man1
 %{_mandir}/man1/lm32-rtems4.10-gcc.1*
@@ -488,7 +502,23 @@ GNU cc compiler for lm32-rtems4.10.
 %{_bindir}/lm32-rtems4.10-gcov%{_exeext}
 %{_bindir}/lm32-rtems4.10-gccbug
 
+%dir %{_libexecdir}
+%dir %{_libexecdir}/gcc
+%dir %{_libexecdir}/gcc/lm32-rtems4.10
+%dir %{_libexecdir}/gcc/lm32-rtems4.10/%{gcc_version}
+%{_libexecdir}/gcc/lm32-rtems4.10/%{gcc_version}/cc1%{_exeext}
+%{_libexecdir}/gcc/lm32-rtems4.10/%{gcc_version}/collect2%{_exeext}
+
+
+%files -n rtems-4.10-lm32-rtems4.10-gcc-libgcc -f build/files.gcc
+%defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_gcclibdir}
+%dir %{_gcclibdir}/gcc
+%dir %{_gcclibdir}/gcc/lm32-rtems4.10
+%dir %{_gcclibdir}/gcc/lm32-rtems4.10/%{gcc_version}
 %dir %{_gcclibdir}/gcc/lm32-rtems4.10/%{gcc_version}/include
+
 %if "%{gcc_version}" > "4.0.3"
 %if "lm32-rtems4.10" != "bfin-rtems4.10"
 %if "lm32-rtems4.10" != "avr-rtems4.10"
@@ -498,15 +528,9 @@ GNU cc compiler for lm32-rtems4.10.
 %endif
 
 %if "%{gcc_version}" >= "4.3.0"
-%dir %{_gcclibdir}/gcc/lm32-rtems4.10/%{gcc_version}/include-fixed
+%{_gcclibdir}/gcc/lm32-rtems4.10/%{gcc_version}/include-fixed
 %endif
 
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/lm32-rtems4.10
-%dir %{_libexecdir}/gcc/lm32-rtems4.10/%{gcc_version}
-%{_libexecdir}/gcc/lm32-rtems4.10/%{gcc_version}/cc1%{_exeext}
-%{_libexecdir}/gcc/lm32-rtems4.10/%{gcc_version}/collect2%{_exeext}
-
 # ==============================================================
 # rtems-4.10-gcc-common
 # ==============================================================
@@ -514,6 +538,7 @@ GNU cc compiler for lm32-rtems4.10.
 Summary:	Base package for rtems gcc and newlib C Library
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
+%{?_with_noarch_subpackages:BuildArch: noarch}
 License:	GPL
 
 Requires(post): 	/sbin/install-info
@@ -562,12 +587,11 @@ Summary:	GCC c++ compiler for lm32-rtems4.10
 Group:		Development/Tools
 Version:        %{gcc_rpmvers}
 License:	GPL
+Requires:       rtems-4.10-lm32-rtems4.10-gcc-libstdc++ = %{gcc_rpmvers}-%{release}
 
 %if "%{_build}" != "%{_host}"
 BuildRequires:  rtems-4.10-lm32-rtems4.10-gcc-c++ = %{gcc_rpmvers}
 %endif
-Provides:	rtems-4.10-lm32-rtems4.10-c++ = %{gcc_rpmvers}-%{release}
-Obsoletes:	rtems-4.10-lm32-rtems4.10-c++ < %{gcc_rpmvers}-%{release}
 
 Requires:       rtems-4.10-gcc-common
 Requires:       rtems-4.10-lm32-rtems4.10-gcc = %{gcc_rpmvers}-%{release}
@@ -575,18 +599,44 @@ Requires:       rtems-4.10-lm32-rtems4.10-gcc = %{gcc_rpmvers}-%{release}
 %description -n rtems-4.10-lm32-rtems4.10-gcc-c++
 GCC c++ compiler for lm32-rtems4.10.
 
-%files -n rtems-4.10-lm32-rtems4.10-gcc-c++ -f build/files.g++
+
+%package -n rtems-4.10-lm32-rtems4.10-gcc-libstdc++
+Summary:	libstdc++ for lm32-rtems4.10
+Group:		Development/Tools
+Version:        %{gcc_rpmvers}
+%{?_with_noarch_subpackages:BuildArch: noarch}
+License:	GPL
+
+%description -n rtems-4.10-lm32-rtems4.10-gcc-libstdc++
+%{_summary}
+
+
+%files -n rtems-4.10-lm32-rtems4.10-gcc-c++
 %defattr(-,root,root)
+%dir %{_prefix}
+
+%dir %{_mandir}
+%dir %{_mandir}/man1
 %{_mandir}/man1/lm32-rtems4.10-g++.1*
 
+%dir %{_bindir}
 %{_bindir}/lm32-rtems4.10-c++%{_exeext}
 %{_bindir}/lm32-rtems4.10-g++%{_exeext}
 
+%dir %{_libexecdir}
 %dir %{_libexecdir}/gcc
 %dir %{_libexecdir}/gcc/lm32-rtems4.10
 %dir %{_libexecdir}/gcc/lm32-rtems4.10/%{gcc_version}
 %{_libexecdir}/gcc/lm32-rtems4.10/%{gcc_version}/cc1plus%{_exeext}
 
+
+%files -n rtems-4.10-lm32-rtems4.10-gcc-libstdc++ -f build/files.g++
+%defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_gcclibdir}
+%dir %{_gcclibdir}/gcc
+%dir %{_gcclibdir}/gcc/lm32-rtems4.10
+%dir %{_gcclibdir}/gcc/lm32-rtems4.10/%{gcc_version}
 %dir %{_gcclibdir}/gcc/lm32-rtems4.10/%{gcc_version}/include
 %{_gcclibdir}/gcc/lm32-rtems4.10/%{gcc_version}/include/c++
 
@@ -601,6 +651,7 @@ Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
 Release:        47%{?dist}
+%{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.10-newlib-common
 
@@ -610,6 +661,7 @@ Newlib C Library for lm32-rtems4.10.
 %files -n rtems-4.10-lm32-rtems4.10-newlib -f build/files.newlib
 %defattr(-,root,root)
 %dir %{_prefix}
+%dir %{_exec_prefix}
 %dir %{_exec_prefix}/lm32-rtems4.10
 %{_exec_prefix}/lm32-rtems4.10/include
 
@@ -621,6 +673,7 @@ Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
 Release:        47%{?dist}
+%{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable
 
 Requires(post): 	/sbin/install-info
diff --git a/contrib/crossrpms/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-gcc.spec
index 7dcc707cde..0641a2bee1 100644
--- a/contrib/crossrpms/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-gcc.spec
+++ b/contrib/crossrpms/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-gcc.spec
@@ -134,6 +134,7 @@ BuildRequires:	texinfo >= 4.2
 BuildRequires:	rtems-4.10-m32c-rtems4.10-binutils
 
 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}-47%{?dist}
 
 
@@ -299,11 +300,11 @@ cd ..
   fi
 
   # Collect multilib subdirectories
-  f=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'`
+  multilibs=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'`
 
   echo "%defattr(-,root,root,-)" > build/files.newlib
   TGTDIR="%{_exec_prefix}/m32c-rtems4.10/lib"
-  for i in $f; do
+  for i in $multilibs; do
     case $i in
     \.) echo "%dir ${TGTDIR}" >> build/files.newlib
       ;;
@@ -315,13 +316,8 @@ cd ..
   rm -f dirs ;
   echo "%defattr(-,root,root,-)" >> dirs
   echo "%dir %{_prefix}" >> dirs
-  echo "%dir %{_gcclibdir}" >> dirs
-  echo "%dir %{_libexecdir}" >> dirs
-  echo "%dir %{_gcclibdir}/gcc" >> dirs
-  echo "%dir %{_gcclibdir}/gcc/m32c-rtems4.10" >> dirs
-
   TGTDIR="%{_gcclibdir}/gcc/m32c-rtems4.10/%{gcc_version}"
-  for i in $f; do
+  for i in $multilibs; do
     case $i in
     \.) echo "%dir ${TGTDIR}" >> dirs
       ;;
@@ -352,6 +348,7 @@ cd ..
     *include/objc*) ;;
     *include/g++*);;
     *include/c++*);;
+    *include-fixed/*);;
     *finclude/*);;
     *adainclude*);;
     *adalib*);;
@@ -465,8 +462,25 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 %description -n rtems-4.10-m32c-rtems4.10-gcc
 GNU cc compiler for m32c-rtems4.10.
 
-%files -n rtems-4.10-m32c-rtems4.10-gcc -f build/files.gcc
+# ==============================================================
+# rtems-4.10-m32c-rtems4.10-gcc-libgcc
+# ==============================================================
+%package -n rtems-4.10-m32c-rtems4.10-gcc-libgcc
+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}-47%{?dist}
+License:	GPL
+
+%description -n rtems-4.10-m32c-rtems4.10-gcc-libgcc
+libgcc m32c-rtems4.10-gcc.
+
+
+%files -n rtems-4.10-m32c-rtems4.10-gcc
 %defattr(-,root,root)
+%dir %{_prefix}
+
 %dir %{_mandir}
 %dir %{_mandir}/man1
 %{_mandir}/man1/m32c-rtems4.10-gcc.1*
@@ -480,7 +494,23 @@ GNU cc compiler for m32c-rtems4.10.
 %{_bindir}/m32c-rtems4.10-gcov%{_exeext}
 %{_bindir}/m32c-rtems4.10-gccbug
 
+%dir %{_libexecdir}
+%dir %{_libexecdir}/gcc
+%dir %{_libexecdir}/gcc/m32c-rtems4.10
+%dir %{_libexecdir}/gcc/m32c-rtems4.10/%{gcc_version}
+%{_libexecdir}/gcc/m32c-rtems4.10/%{gcc_version}/cc1%{_exeext}
+%{_libexecdir}/gcc/m32c-rtems4.10/%{gcc_version}/collect2%{_exeext}
+
+
+%files -n rtems-4.10-m32c-rtems4.10-gcc-libgcc -f build/files.gcc
+%defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_gcclibdir}
+%dir %{_gcclibdir}/gcc
+%dir %{_gcclibdir}/gcc/m32c-rtems4.10
+%dir %{_gcclibdir}/gcc/m32c-rtems4.10/%{gcc_version}
 %dir %{_gcclibdir}/gcc/m32c-rtems4.10/%{gcc_version}/include
+
 %if "%{gcc_version}" > "4.0.3"
 %if "m32c-rtems4.10" != "bfin-rtems4.10"
 %if "m32c-rtems4.10" != "avr-rtems4.10"
@@ -490,15 +520,9 @@ GNU cc compiler for m32c-rtems4.10.
 %endif
 
 %if "%{gcc_version}" >= "4.3.0"
-%dir %{_gcclibdir}/gcc/m32c-rtems4.10/%{gcc_version}/include-fixed
+%{_gcclibdir}/gcc/m32c-rtems4.10/%{gcc_version}/include-fixed
 %endif
 
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/m32c-rtems4.10
-%dir %{_libexecdir}/gcc/m32c-rtems4.10/%{gcc_version}
-%{_libexecdir}/gcc/m32c-rtems4.10/%{gcc_version}/cc1%{_exeext}
-%{_libexecdir}/gcc/m32c-rtems4.10/%{gcc_version}/collect2%{_exeext}
-
 
 
 
@@ -511,6 +535,7 @@ Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
 Release:        47%{?dist}
+%{?_with_noarch_subpackages:BuildArch: noarch}
 
 
 %description -n rtems-4.10-m32c-rtems4.10-newlib
@@ -519,6 +544,7 @@ Newlib C Library for m32c-rtems4.10.
 %files -n rtems-4.10-m32c-rtems4.10-newlib -f build/files.newlib
 %defattr(-,root,root)
 %dir %{_prefix}
+%dir %{_exec_prefix}
 %dir %{_exec_prefix}/m32c-rtems4.10
 %{_exec_prefix}/m32c-rtems4.10/include
 
diff --git a/contrib/crossrpms/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-gcc.spec
index 8f7bc69e0e..5145d9f633 100644
--- a/contrib/crossrpms/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-gcc.spec
+++ b/contrib/crossrpms/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-gcc.spec
@@ -134,6 +134,7 @@ BuildRequires:	texinfo >= 4.2
 BuildRequires:	rtems-4.10-m32r-rtems4.10-binutils
 
 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}-47%{?dist}
 
 
@@ -299,11 +300,11 @@ cd ..
   fi
 
   # Collect multilib subdirectories
-  f=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'`
+  multilibs=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'`
 
   echo "%defattr(-,root,root,-)" > build/files.newlib
   TGTDIR="%{_exec_prefix}/m32r-rtems4.10/lib"
-  for i in $f; do
+  for i in $multilibs; do
     case $i in
     \.) echo "%dir ${TGTDIR}" >> build/files.newlib
       ;;
@@ -315,13 +316,8 @@ cd ..
   rm -f dirs ;
   echo "%defattr(-,root,root,-)" >> dirs
   echo "%dir %{_prefix}" >> dirs
-  echo "%dir %{_gcclibdir}" >> dirs
-  echo "%dir %{_libexecdir}" >> dirs
-  echo "%dir %{_gcclibdir}/gcc" >> dirs
-  echo "%dir %{_gcclibdir}/gcc/m32r-rtems4.10" >> dirs
-
   TGTDIR="%{_gcclibdir}/gcc/m32r-rtems4.10/%{gcc_version}"
-  for i in $f; do
+  for i in $multilibs; do
     case $i in
     \.) echo "%dir ${TGTDIR}" >> dirs
       ;;
@@ -352,6 +348,7 @@ cd ..
     *include/objc*) ;;
     *include/g++*);;
     *include/c++*);;
+    *include-fixed/*);;
     *finclude/*);;
     *adainclude*);;
     *adalib*);;
@@ -465,8 +462,25 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 %description -n rtems-4.10-m32r-rtems4.10-gcc
 GNU cc compiler for m32r-rtems4.10.
 
-%files -n rtems-4.10-m32r-rtems4.10-gcc -f build/files.gcc
+# ==============================================================
+# rtems-4.10-m32r-rtems4.10-gcc-libgcc
+# ==============================================================
+%package -n rtems-4.10-m32r-rtems4.10-gcc-libgcc
+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}-47%{?dist}
+License:	GPL
+
+%description -n rtems-4.10-m32r-rtems4.10-gcc-libgcc
+libgcc m32r-rtems4.10-gcc.
+
+
+%files -n rtems-4.10-m32r-rtems4.10-gcc
 %defattr(-,root,root)
+%dir %{_prefix}
+
 %dir %{_mandir}
 %dir %{_mandir}/man1
 %{_mandir}/man1/m32r-rtems4.10-gcc.1*
@@ -480,7 +494,23 @@ GNU cc compiler for m32r-rtems4.10.
 %{_bindir}/m32r-rtems4.10-gcov%{_exeext}
 %{_bindir}/m32r-rtems4.10-gccbug
 
+%dir %{_libexecdir}
+%dir %{_libexecdir}/gcc
+%dir %{_libexecdir}/gcc/m32r-rtems4.10
+%dir %{_libexecdir}/gcc/m32r-rtems4.10/%{gcc_version}
+%{_libexecdir}/gcc/m32r-rtems4.10/%{gcc_version}/cc1%{_exeext}
+%{_libexecdir}/gcc/m32r-rtems4.10/%{gcc_version}/collect2%{_exeext}
+
+
+%files -n rtems-4.10-m32r-rtems4.10-gcc-libgcc -f build/files.gcc
+%defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_gcclibdir}
+%dir %{_gcclibdir}/gcc
+%dir %{_gcclibdir}/gcc/m32r-rtems4.10
+%dir %{_gcclibdir}/gcc/m32r-rtems4.10/%{gcc_version}
 %dir %{_gcclibdir}/gcc/m32r-rtems4.10/%{gcc_version}/include
+
 %if "%{gcc_version}" > "4.0.3"
 %if "m32r-rtems4.10" != "bfin-rtems4.10"
 %if "m32r-rtems4.10" != "avr-rtems4.10"
@@ -490,15 +520,9 @@ GNU cc compiler for m32r-rtems4.10.
 %endif
 
 %if "%{gcc_version}" >= "4.3.0"
-%dir %{_gcclibdir}/gcc/m32r-rtems4.10/%{gcc_version}/include-fixed
+%{_gcclibdir}/gcc/m32r-rtems4.10/%{gcc_version}/include-fixed
 %endif
 
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/m32r-rtems4.10
-%dir %{_libexecdir}/gcc/m32r-rtems4.10/%{gcc_version}
-%{_libexecdir}/gcc/m32r-rtems4.10/%{gcc_version}/cc1%{_exeext}
-%{_libexecdir}/gcc/m32r-rtems4.10/%{gcc_version}/collect2%{_exeext}
-
 
 
 
@@ -511,6 +535,7 @@ Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
 Release:        47%{?dist}
+%{?_with_noarch_subpackages:BuildArch: noarch}
 
 
 %description -n rtems-4.10-m32r-rtems4.10-newlib
@@ -519,6 +544,7 @@ Newlib C Library for m32r-rtems4.10.
 %files -n rtems-4.10-m32r-rtems4.10-newlib -f build/files.newlib
 %defattr(-,root,root)
 %dir %{_prefix}
+%dir %{_exec_prefix}
 %dir %{_exec_prefix}/m32r-rtems4.10
 %{_exec_prefix}/m32r-rtems4.10/include
 
diff --git a/contrib/crossrpms/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-gcc.spec
index 41270a9708..37c257c9f4 100644
--- a/contrib/crossrpms/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-gcc.spec
+++ b/contrib/crossrpms/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-gcc.spec
@@ -135,6 +135,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}-47%{?dist}
 
 
@@ -307,11 +308,11 @@ cd ..
   fi
 
   # Collect multilib subdirectories
-  f=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'`
+  multilibs=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'`
 
   echo "%defattr(-,root,root,-)" > build/files.newlib
   TGTDIR="%{_exec_prefix}/m68k-rtems4.10/lib"
-  for i in $f; do
+  for i in $multilibs; do
     case $i in
     \.) echo "%dir ${TGTDIR}" >> build/files.newlib
       ;;
@@ -323,13 +324,8 @@ cd ..
   rm -f dirs ;
   echo "%defattr(-,root,root,-)" >> dirs
   echo "%dir %{_prefix}" >> dirs
-  echo "%dir %{_gcclibdir}" >> dirs
-  echo "%dir %{_libexecdir}" >> dirs
-  echo "%dir %{_gcclibdir}/gcc" >> dirs
-  echo "%dir %{_gcclibdir}/gcc/m68k-rtems4.10" >> dirs
-
   TGTDIR="%{_gcclibdir}/gcc/m68k-rtems4.10/%{gcc_version}"
-  for i in $f; do
+  for i in $multilibs; do
     case $i in
     \.) echo "%dir ${TGTDIR}" >> dirs
       ;;
@@ -360,6 +356,7 @@ cd ..
     *include/objc*) ;;
     *include/g++*);;
     *include/c++*);;
+    *include-fixed/*);;
     *finclude/*);;
     *adainclude*);;
     *adalib*);;
@@ -473,8 +470,25 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 %description -n rtems-4.10-m68k-rtems4.10-gcc
 GNU cc compiler for m68k-rtems4.10.
 
-%files -n rtems-4.10-m68k-rtems4.10-gcc -f build/files.gcc
+# ==============================================================
+# rtems-4.10-m68k-rtems4.10-gcc-libgcc
+# ==============================================================
+%package -n rtems-4.10-m68k-rtems4.10-gcc-libgcc
+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}-47%{?dist}
+License:	GPL
+
+%description -n rtems-4.10-m68k-rtems4.10-gcc-libgcc
+libgcc m68k-rtems4.10-gcc.
+
+
+%files -n rtems-4.10-m68k-rtems4.10-gcc
 %defattr(-,root,root)
+%dir %{_prefix}
+
 %dir %{_mandir}
 %dir %{_mandir}/man1
 %{_mandir}/man1/m68k-rtems4.10-gcc.1*
@@ -488,7 +502,23 @@ GNU cc compiler for m68k-rtems4.10.
 %{_bindir}/m68k-rtems4.10-gcov%{_exeext}
 %{_bindir}/m68k-rtems4.10-gccbug
 
+%dir %{_libexecdir}
+%dir %{_libexecdir}/gcc
+%dir %{_libexecdir}/gcc/m68k-rtems4.10
+%dir %{_libexecdir}/gcc/m68k-rtems4.10/%{gcc_version}
+%{_libexecdir}/gcc/m68k-rtems4.10/%{gcc_version}/cc1%{_exeext}
+%{_libexecdir}/gcc/m68k-rtems4.10/%{gcc_version}/collect2%{_exeext}
+
+
+%files -n rtems-4.10-m68k-rtems4.10-gcc-libgcc -f build/files.gcc
+%defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_gcclibdir}
+%dir %{_gcclibdir}/gcc
+%dir %{_gcclibdir}/gcc/m68k-rtems4.10
+%dir %{_gcclibdir}/gcc/m68k-rtems4.10/%{gcc_version}
 %dir %{_gcclibdir}/gcc/m68k-rtems4.10/%{gcc_version}/include
+
 %if "%{gcc_version}" > "4.0.3"
 %if "m68k-rtems4.10" != "bfin-rtems4.10"
 %if "m68k-rtems4.10" != "avr-rtems4.10"
@@ -498,15 +528,9 @@ GNU cc compiler for m68k-rtems4.10.
 %endif
 
 %if "%{gcc_version}" >= "4.3.0"
-%dir %{_gcclibdir}/gcc/m68k-rtems4.10/%{gcc_version}/include-fixed
+%{_gcclibdir}/gcc/m68k-rtems4.10/%{gcc_version}/include-fixed
 %endif
 
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/m68k-rtems4.10
-%dir %{_libexecdir}/gcc/m68k-rtems4.10/%{gcc_version}
-%{_libexecdir}/gcc/m68k-rtems4.10/%{gcc_version}/cc1%{_exeext}
-%{_libexecdir}/gcc/m68k-rtems4.10/%{gcc_version}/collect2%{_exeext}
-
 # ==============================================================
 # rtems-4.10-gcc-common
 # ==============================================================
@@ -514,6 +538,7 @@ GNU cc compiler for m68k-rtems4.10.
 Summary:	Base package for rtems gcc and newlib C Library
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
+%{?_with_noarch_subpackages:BuildArch: noarch}
 License:	GPL
 
 Requires(post): 	/sbin/install-info
@@ -562,12 +587,11 @@ Summary:	GCC c++ compiler for m68k-rtems4.10
 Group:		Development/Tools
 Version:        %{gcc_rpmvers}
 License:	GPL
+Requires:       rtems-4.10-m68k-rtems4.10-gcc-libstdc++ = %{gcc_rpmvers}-%{release}
 
 %if "%{_build}" != "%{_host}"
 BuildRequires:  rtems-4.10-m68k-rtems4.10-gcc-c++ = %{gcc_rpmvers}
 %endif
-Provides:	rtems-4.10-m68k-rtems4.10-c++ = %{gcc_rpmvers}-%{release}
-Obsoletes:	rtems-4.10-m68k-rtems4.10-c++ < %{gcc_rpmvers}-%{release}
 
 Requires:       rtems-4.10-gcc-common
 Requires:       rtems-4.10-m68k-rtems4.10-gcc = %{gcc_rpmvers}-%{release}
@@ -575,18 +599,44 @@ Requires:       rtems-4.10-m68k-rtems4.10-gcc = %{gcc_rpmvers}-%{release}
 %description -n rtems-4.10-m68k-rtems4.10-gcc-c++
 GCC c++ compiler for m68k-rtems4.10.
 
-%files -n rtems-4.10-m68k-rtems4.10-gcc-c++ -f build/files.g++
+
+%package -n rtems-4.10-m68k-rtems4.10-gcc-libstdc++
+Summary:	libstdc++ for m68k-rtems4.10
+Group:		Development/Tools
+Version:        %{gcc_rpmvers}
+%{?_with_noarch_subpackages:BuildArch: noarch}
+License:	GPL
+
+%description -n rtems-4.10-m68k-rtems4.10-gcc-libstdc++
+%{_summary}
+
+
+%files -n rtems-4.10-m68k-rtems4.10-gcc-c++
 %defattr(-,root,root)
+%dir %{_prefix}
+
+%dir %{_mandir}
+%dir %{_mandir}/man1
 %{_mandir}/man1/m68k-rtems4.10-g++.1*
 
+%dir %{_bindir}
 %{_bindir}/m68k-rtems4.10-c++%{_exeext}
 %{_bindir}/m68k-rtems4.10-g++%{_exeext}
 
+%dir %{_libexecdir}
 %dir %{_libexecdir}/gcc
 %dir %{_libexecdir}/gcc/m68k-rtems4.10
 %dir %{_libexecdir}/gcc/m68k-rtems4.10/%{gcc_version}
 %{_libexecdir}/gcc/m68k-rtems4.10/%{gcc_version}/cc1plus%{_exeext}
 
+
+%files -n rtems-4.10-m68k-rtems4.10-gcc-libstdc++ -f build/files.g++
+%defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_gcclibdir}
+%dir %{_gcclibdir}/gcc
+%dir %{_gcclibdir}/gcc/m68k-rtems4.10
+%dir %{_gcclibdir}/gcc/m68k-rtems4.10/%{gcc_version}
 %dir %{_gcclibdir}/gcc/m68k-rtems4.10/%{gcc_version}/include
 %{_gcclibdir}/gcc/m68k-rtems4.10/%{gcc_version}/include/c++
 
@@ -601,6 +651,7 @@ Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
 Release:        47%{?dist}
+%{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.10-newlib-common
 
@@ -610,6 +661,7 @@ Newlib C Library for m68k-rtems4.10.
 %files -n rtems-4.10-m68k-rtems4.10-newlib -f build/files.newlib
 %defattr(-,root,root)
 %dir %{_prefix}
+%dir %{_exec_prefix}
 %dir %{_exec_prefix}/m68k-rtems4.10
 %{_exec_prefix}/m68k-rtems4.10/include
 
@@ -621,6 +673,7 @@ Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
 Release:        47%{?dist}
+%{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable
 
 Requires(post): 	/sbin/install-info
diff --git a/contrib/crossrpms/rtems4.10/mips/rtems-4.10-mips-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/mips/rtems-4.10-mips-rtems4.10-gcc.spec
index a4e03dfa40..f17e6c2b05 100644
--- a/contrib/crossrpms/rtems4.10/mips/rtems-4.10-mips-rtems4.10-gcc.spec
+++ b/contrib/crossrpms/rtems4.10/mips/rtems-4.10-mips-rtems4.10-gcc.spec
@@ -135,6 +135,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}-47%{?dist}
 
 
@@ -307,11 +308,11 @@ cd ..
   fi
 
   # Collect multilib subdirectories
-  f=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'`
+  multilibs=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'`
 
   echo "%defattr(-,root,root,-)" > build/files.newlib
   TGTDIR="%{_exec_prefix}/mips-rtems4.10/lib"
-  for i in $f; do
+  for i in $multilibs; do
     case $i in
     \.) echo "%dir ${TGTDIR}" >> build/files.newlib
       ;;
@@ -323,13 +324,8 @@ cd ..
   rm -f dirs ;
   echo "%defattr(-,root,root,-)" >> dirs
   echo "%dir %{_prefix}" >> dirs
-  echo "%dir %{_gcclibdir}" >> dirs
-  echo "%dir %{_libexecdir}" >> dirs
-  echo "%dir %{_gcclibdir}/gcc" >> dirs
-  echo "%dir %{_gcclibdir}/gcc/mips-rtems4.10" >> dirs
-
   TGTDIR="%{_gcclibdir}/gcc/mips-rtems4.10/%{gcc_version}"
-  for i in $f; do
+  for i in $multilibs; do
     case $i in
     \.) echo "%dir ${TGTDIR}" >> dirs
       ;;
@@ -360,6 +356,7 @@ cd ..
     *include/objc*) ;;
     *include/g++*);;
     *include/c++*);;
+    *include-fixed/*);;
     *finclude/*);;
     *adainclude*);;
     *adalib*);;
@@ -473,8 +470,25 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 %description -n rtems-4.10-mips-rtems4.10-gcc
 GNU cc compiler for mips-rtems4.10.
 
-%files -n rtems-4.10-mips-rtems4.10-gcc -f build/files.gcc
+# ==============================================================
+# rtems-4.10-mips-rtems4.10-gcc-libgcc
+# ==============================================================
+%package -n rtems-4.10-mips-rtems4.10-gcc-libgcc
+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}-47%{?dist}
+License:	GPL
+
+%description -n rtems-4.10-mips-rtems4.10-gcc-libgcc
+libgcc mips-rtems4.10-gcc.
+
+
+%files -n rtems-4.10-mips-rtems4.10-gcc
 %defattr(-,root,root)
+%dir %{_prefix}
+
 %dir %{_mandir}
 %dir %{_mandir}/man1
 %{_mandir}/man1/mips-rtems4.10-gcc.1*
@@ -488,7 +502,23 @@ GNU cc compiler for mips-rtems4.10.
 %{_bindir}/mips-rtems4.10-gcov%{_exeext}
 %{_bindir}/mips-rtems4.10-gccbug
 
+%dir %{_libexecdir}
+%dir %{_libexecdir}/gcc
+%dir %{_libexecdir}/gcc/mips-rtems4.10
+%dir %{_libexecdir}/gcc/mips-rtems4.10/%{gcc_version}
+%{_libexecdir}/gcc/mips-rtems4.10/%{gcc_version}/cc1%{_exeext}
+%{_libexecdir}/gcc/mips-rtems4.10/%{gcc_version}/collect2%{_exeext}
+
+
+%files -n rtems-4.10-mips-rtems4.10-gcc-libgcc -f build/files.gcc
+%defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_gcclibdir}
+%dir %{_gcclibdir}/gcc
+%dir %{_gcclibdir}/gcc/mips-rtems4.10
+%dir %{_gcclibdir}/gcc/mips-rtems4.10/%{gcc_version}
 %dir %{_gcclibdir}/gcc/mips-rtems4.10/%{gcc_version}/include
+
 %if "%{gcc_version}" > "4.0.3"
 %if "mips-rtems4.10" != "bfin-rtems4.10"
 %if "mips-rtems4.10" != "avr-rtems4.10"
@@ -498,15 +528,9 @@ GNU cc compiler for mips-rtems4.10.
 %endif
 
 %if "%{gcc_version}" >= "4.3.0"
-%dir %{_gcclibdir}/gcc/mips-rtems4.10/%{gcc_version}/include-fixed
+%{_gcclibdir}/gcc/mips-rtems4.10/%{gcc_version}/include-fixed
 %endif
 
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/mips-rtems4.10
-%dir %{_libexecdir}/gcc/mips-rtems4.10/%{gcc_version}
-%{_libexecdir}/gcc/mips-rtems4.10/%{gcc_version}/cc1%{_exeext}
-%{_libexecdir}/gcc/mips-rtems4.10/%{gcc_version}/collect2%{_exeext}
-
 # ==============================================================
 # rtems-4.10-gcc-common
 # ==============================================================
@@ -514,6 +538,7 @@ GNU cc compiler for mips-rtems4.10.
 Summary:	Base package for rtems gcc and newlib C Library
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
+%{?_with_noarch_subpackages:BuildArch: noarch}
 License:	GPL
 
 Requires(post): 	/sbin/install-info
@@ -562,12 +587,11 @@ Summary:	GCC c++ compiler for mips-rtems4.10
 Group:		Development/Tools
 Version:        %{gcc_rpmvers}
 License:	GPL
+Requires:       rtems-4.10-mips-rtems4.10-gcc-libstdc++ = %{gcc_rpmvers}-%{release}
 
 %if "%{_build}" != "%{_host}"
 BuildRequires:  rtems-4.10-mips-rtems4.10-gcc-c++ = %{gcc_rpmvers}
 %endif
-Provides:	rtems-4.10-mips-rtems4.10-c++ = %{gcc_rpmvers}-%{release}
-Obsoletes:	rtems-4.10-mips-rtems4.10-c++ < %{gcc_rpmvers}-%{release}
 
 Requires:       rtems-4.10-gcc-common
 Requires:       rtems-4.10-mips-rtems4.10-gcc = %{gcc_rpmvers}-%{release}
@@ -575,18 +599,44 @@ Requires:       rtems-4.10-mips-rtems4.10-gcc = %{gcc_rpmvers}-%{release}
 %description -n rtems-4.10-mips-rtems4.10-gcc-c++
 GCC c++ compiler for mips-rtems4.10.
 
-%files -n rtems-4.10-mips-rtems4.10-gcc-c++ -f build/files.g++
+
+%package -n rtems-4.10-mips-rtems4.10-gcc-libstdc++
+Summary:	libstdc++ for mips-rtems4.10
+Group:		Development/Tools
+Version:        %{gcc_rpmvers}
+%{?_with_noarch_subpackages:BuildArch: noarch}
+License:	GPL
+
+%description -n rtems-4.10-mips-rtems4.10-gcc-libstdc++
+%{_summary}
+
+
+%files -n rtems-4.10-mips-rtems4.10-gcc-c++
 %defattr(-,root,root)
+%dir %{_prefix}
+
+%dir %{_mandir}
+%dir %{_mandir}/man1
 %{_mandir}/man1/mips-rtems4.10-g++.1*
 
+%dir %{_bindir}
 %{_bindir}/mips-rtems4.10-c++%{_exeext}
 %{_bindir}/mips-rtems4.10-g++%{_exeext}
 
+%dir %{_libexecdir}
 %dir %{_libexecdir}/gcc
 %dir %{_libexecdir}/gcc/mips-rtems4.10
 %dir %{_libexecdir}/gcc/mips-rtems4.10/%{gcc_version}
 %{_libexecdir}/gcc/mips-rtems4.10/%{gcc_version}/cc1plus%{_exeext}
 
+
+%files -n rtems-4.10-mips-rtems4.10-gcc-libstdc++ -f build/files.g++
+%defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_gcclibdir}
+%dir %{_gcclibdir}/gcc
+%dir %{_gcclibdir}/gcc/mips-rtems4.10
+%dir %{_gcclibdir}/gcc/mips-rtems4.10/%{gcc_version}
 %dir %{_gcclibdir}/gcc/mips-rtems4.10/%{gcc_version}/include
 %{_gcclibdir}/gcc/mips-rtems4.10/%{gcc_version}/include/c++
 
@@ -601,6 +651,7 @@ Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
 Release:        47%{?dist}
+%{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.10-newlib-common
 
@@ -610,6 +661,7 @@ Newlib C Library for mips-rtems4.10.
 %files -n rtems-4.10-mips-rtems4.10-newlib -f build/files.newlib
 %defattr(-,root,root)
 %dir %{_prefix}
+%dir %{_exec_prefix}
 %dir %{_exec_prefix}/mips-rtems4.10
 %{_exec_prefix}/mips-rtems4.10/include
 
@@ -621,6 +673,7 @@ Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
 Release:        47%{?dist}
+%{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable
 
 Requires(post): 	/sbin/install-info
diff --git a/contrib/crossrpms/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-gcc.spec
index 8edf196888..6689299bd1 100644
--- a/contrib/crossrpms/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-gcc.spec
+++ b/contrib/crossrpms/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-gcc.spec
@@ -135,6 +135,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}-47%{?dist}
 
 
@@ -307,11 +308,11 @@ cd ..
   fi
 
   # Collect multilib subdirectories
-  f=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'`
+  multilibs=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'`
 
   echo "%defattr(-,root,root,-)" > build/files.newlib
   TGTDIR="%{_exec_prefix}/powerpc-rtems4.10/lib"
-  for i in $f; do
+  for i in $multilibs; do
     case $i in
     \.) echo "%dir ${TGTDIR}" >> build/files.newlib
       ;;
@@ -323,13 +324,8 @@ cd ..
   rm -f dirs ;
   echo "%defattr(-,root,root,-)" >> dirs
   echo "%dir %{_prefix}" >> dirs
-  echo "%dir %{_gcclibdir}" >> dirs
-  echo "%dir %{_libexecdir}" >> dirs
-  echo "%dir %{_gcclibdir}/gcc" >> dirs
-  echo "%dir %{_gcclibdir}/gcc/powerpc-rtems4.10" >> dirs
-
   TGTDIR="%{_gcclibdir}/gcc/powerpc-rtems4.10/%{gcc_version}"
-  for i in $f; do
+  for i in $multilibs; do
     case $i in
     \.) echo "%dir ${TGTDIR}" >> dirs
       ;;
@@ -360,6 +356,7 @@ cd ..
     *include/objc*) ;;
     *include/g++*);;
     *include/c++*);;
+    *include-fixed/*);;
     *finclude/*);;
     *adainclude*);;
     *adalib*);;
@@ -473,8 +470,25 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 %description -n rtems-4.10-powerpc-rtems4.10-gcc
 GNU cc compiler for powerpc-rtems4.10.
 
-%files -n rtems-4.10-powerpc-rtems4.10-gcc -f build/files.gcc
+# ==============================================================
+# rtems-4.10-powerpc-rtems4.10-gcc-libgcc
+# ==============================================================
+%package -n rtems-4.10-powerpc-rtems4.10-gcc-libgcc
+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}-47%{?dist}
+License:	GPL
+
+%description -n rtems-4.10-powerpc-rtems4.10-gcc-libgcc
+libgcc powerpc-rtems4.10-gcc.
+
+
+%files -n rtems-4.10-powerpc-rtems4.10-gcc
 %defattr(-,root,root)
+%dir %{_prefix}
+
 %dir %{_mandir}
 %dir %{_mandir}/man1
 %{_mandir}/man1/powerpc-rtems4.10-gcc.1*
@@ -488,7 +502,23 @@ GNU cc compiler for powerpc-rtems4.10.
 %{_bindir}/powerpc-rtems4.10-gcov%{_exeext}
 %{_bindir}/powerpc-rtems4.10-gccbug
 
+%dir %{_libexecdir}
+%dir %{_libexecdir}/gcc
+%dir %{_libexecdir}/gcc/powerpc-rtems4.10
+%dir %{_libexecdir}/gcc/powerpc-rtems4.10/%{gcc_version}
+%{_libexecdir}/gcc/powerpc-rtems4.10/%{gcc_version}/cc1%{_exeext}
+%{_libexecdir}/gcc/powerpc-rtems4.10/%{gcc_version}/collect2%{_exeext}
+
+
+%files -n rtems-4.10-powerpc-rtems4.10-gcc-libgcc -f build/files.gcc
+%defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_gcclibdir}
+%dir %{_gcclibdir}/gcc
+%dir %{_gcclibdir}/gcc/powerpc-rtems4.10
+%dir %{_gcclibdir}/gcc/powerpc-rtems4.10/%{gcc_version}
 %dir %{_gcclibdir}/gcc/powerpc-rtems4.10/%{gcc_version}/include
+
 %if "%{gcc_version}" > "4.0.3"
 %if "powerpc-rtems4.10" != "bfin-rtems4.10"
 %if "powerpc-rtems4.10" != "avr-rtems4.10"
@@ -498,15 +528,9 @@ GNU cc compiler for powerpc-rtems4.10.
 %endif
 
 %if "%{gcc_version}" >= "4.3.0"
-%dir %{_gcclibdir}/gcc/powerpc-rtems4.10/%{gcc_version}/include-fixed
+%{_gcclibdir}/gcc/powerpc-rtems4.10/%{gcc_version}/include-fixed
 %endif
 
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/powerpc-rtems4.10
-%dir %{_libexecdir}/gcc/powerpc-rtems4.10/%{gcc_version}
-%{_libexecdir}/gcc/powerpc-rtems4.10/%{gcc_version}/cc1%{_exeext}
-%{_libexecdir}/gcc/powerpc-rtems4.10/%{gcc_version}/collect2%{_exeext}
-
 # ==============================================================
 # rtems-4.10-gcc-common
 # ==============================================================
@@ -514,6 +538,7 @@ GNU cc compiler for powerpc-rtems4.10.
 Summary:	Base package for rtems gcc and newlib C Library
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
+%{?_with_noarch_subpackages:BuildArch: noarch}
 License:	GPL
 
 Requires(post): 	/sbin/install-info
@@ -562,12 +587,11 @@ Summary:	GCC c++ compiler for powerpc-rtems4.10
 Group:		Development/Tools
 Version:        %{gcc_rpmvers}
 License:	GPL
+Requires:       rtems-4.10-powerpc-rtems4.10-gcc-libstdc++ = %{gcc_rpmvers}-%{release}
 
 %if "%{_build}" != "%{_host}"
 BuildRequires:  rtems-4.10-powerpc-rtems4.10-gcc-c++ = %{gcc_rpmvers}
 %endif
-Provides:	rtems-4.10-powerpc-rtems4.10-c++ = %{gcc_rpmvers}-%{release}
-Obsoletes:	rtems-4.10-powerpc-rtems4.10-c++ < %{gcc_rpmvers}-%{release}
 
 Requires:       rtems-4.10-gcc-common
 Requires:       rtems-4.10-powerpc-rtems4.10-gcc = %{gcc_rpmvers}-%{release}
@@ -575,18 +599,44 @@ Requires:       rtems-4.10-powerpc-rtems4.10-gcc = %{gcc_rpmvers}-%{release}
 %description -n rtems-4.10-powerpc-rtems4.10-gcc-c++
 GCC c++ compiler for powerpc-rtems4.10.
 
-%files -n rtems-4.10-powerpc-rtems4.10-gcc-c++ -f build/files.g++
+
+%package -n rtems-4.10-powerpc-rtems4.10-gcc-libstdc++
+Summary:	libstdc++ for powerpc-rtems4.10
+Group:		Development/Tools
+Version:        %{gcc_rpmvers}
+%{?_with_noarch_subpackages:BuildArch: noarch}
+License:	GPL
+
+%description -n rtems-4.10-powerpc-rtems4.10-gcc-libstdc++
+%{_summary}
+
+
+%files -n rtems-4.10-powerpc-rtems4.10-gcc-c++
 %defattr(-,root,root)
+%dir %{_prefix}
+
+%dir %{_mandir}
+%dir %{_mandir}/man1
 %{_mandir}/man1/powerpc-rtems4.10-g++.1*
 
+%dir %{_bindir}
 %{_bindir}/powerpc-rtems4.10-c++%{_exeext}
 %{_bindir}/powerpc-rtems4.10-g++%{_exeext}
 
+%dir %{_libexecdir}
 %dir %{_libexecdir}/gcc
 %dir %{_libexecdir}/gcc/powerpc-rtems4.10
 %dir %{_libexecdir}/gcc/powerpc-rtems4.10/%{gcc_version}
 %{_libexecdir}/gcc/powerpc-rtems4.10/%{gcc_version}/cc1plus%{_exeext}
 
+
+%files -n rtems-4.10-powerpc-rtems4.10-gcc-libstdc++ -f build/files.g++
+%defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_gcclibdir}
+%dir %{_gcclibdir}/gcc
+%dir %{_gcclibdir}/gcc/powerpc-rtems4.10
+%dir %{_gcclibdir}/gcc/powerpc-rtems4.10/%{gcc_version}
 %dir %{_gcclibdir}/gcc/powerpc-rtems4.10/%{gcc_version}/include
 %{_gcclibdir}/gcc/powerpc-rtems4.10/%{gcc_version}/include/c++
 
@@ -601,6 +651,7 @@ Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
 Release:        47%{?dist}
+%{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.10-newlib-common
 
@@ -610,6 +661,7 @@ Newlib C Library for powerpc-rtems4.10.
 %files -n rtems-4.10-powerpc-rtems4.10-newlib -f build/files.newlib
 %defattr(-,root,root)
 %dir %{_prefix}
+%dir %{_exec_prefix}
 %dir %{_exec_prefix}/powerpc-rtems4.10
 %{_exec_prefix}/powerpc-rtems4.10/include
 
@@ -621,6 +673,7 @@ Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
 Release:        47%{?dist}
+%{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable
 
 Requires(post): 	/sbin/install-info
diff --git a/contrib/crossrpms/rtems4.10/sh/rtems-4.10-sh-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/sh/rtems-4.10-sh-rtems4.10-gcc.spec
index b906bccaa3..5aefd7608e 100644
--- a/contrib/crossrpms/rtems4.10/sh/rtems-4.10-sh-rtems4.10-gcc.spec
+++ b/contrib/crossrpms/rtems4.10/sh/rtems-4.10-sh-rtems4.10-gcc.spec
@@ -135,6 +135,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}-47%{?dist}
 
 
@@ -307,11 +308,11 @@ cd ..
   fi
 
   # Collect multilib subdirectories
-  f=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'`
+  multilibs=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'`
 
   echo "%defattr(-,root,root,-)" > build/files.newlib
   TGTDIR="%{_exec_prefix}/sh-rtems4.10/lib"
-  for i in $f; do
+  for i in $multilibs; do
     case $i in
     \.) echo "%dir ${TGTDIR}" >> build/files.newlib
       ;;
@@ -323,13 +324,8 @@ cd ..
   rm -f dirs ;
   echo "%defattr(-,root,root,-)" >> dirs
   echo "%dir %{_prefix}" >> dirs
-  echo "%dir %{_gcclibdir}" >> dirs
-  echo "%dir %{_libexecdir}" >> dirs
-  echo "%dir %{_gcclibdir}/gcc" >> dirs
-  echo "%dir %{_gcclibdir}/gcc/sh-rtems4.10" >> dirs
-
   TGTDIR="%{_gcclibdir}/gcc/sh-rtems4.10/%{gcc_version}"
-  for i in $f; do
+  for i in $multilibs; do
     case $i in
     \.) echo "%dir ${TGTDIR}" >> dirs
       ;;
@@ -360,6 +356,7 @@ cd ..
     *include/objc*) ;;
     *include/g++*);;
     *include/c++*);;
+    *include-fixed/*);;
     *finclude/*);;
     *adainclude*);;
     *adalib*);;
@@ -473,8 +470,25 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 %description -n rtems-4.10-sh-rtems4.10-gcc
 GNU cc compiler for sh-rtems4.10.
 
-%files -n rtems-4.10-sh-rtems4.10-gcc -f build/files.gcc
+# ==============================================================
+# rtems-4.10-sh-rtems4.10-gcc-libgcc
+# ==============================================================
+%package -n rtems-4.10-sh-rtems4.10-gcc-libgcc
+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}-47%{?dist}
+License:	GPL
+
+%description -n rtems-4.10-sh-rtems4.10-gcc-libgcc
+libgcc sh-rtems4.10-gcc.
+
+
+%files -n rtems-4.10-sh-rtems4.10-gcc
 %defattr(-,root,root)
+%dir %{_prefix}
+
 %dir %{_mandir}
 %dir %{_mandir}/man1
 %{_mandir}/man1/sh-rtems4.10-gcc.1*
@@ -488,7 +502,23 @@ GNU cc compiler for sh-rtems4.10.
 %{_bindir}/sh-rtems4.10-gcov%{_exeext}
 %{_bindir}/sh-rtems4.10-gccbug
 
+%dir %{_libexecdir}
+%dir %{_libexecdir}/gcc
+%dir %{_libexecdir}/gcc/sh-rtems4.10
+%dir %{_libexecdir}/gcc/sh-rtems4.10/%{gcc_version}
+%{_libexecdir}/gcc/sh-rtems4.10/%{gcc_version}/cc1%{_exeext}
+%{_libexecdir}/gcc/sh-rtems4.10/%{gcc_version}/collect2%{_exeext}
+
+
+%files -n rtems-4.10-sh-rtems4.10-gcc-libgcc -f build/files.gcc
+%defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_gcclibdir}
+%dir %{_gcclibdir}/gcc
+%dir %{_gcclibdir}/gcc/sh-rtems4.10
+%dir %{_gcclibdir}/gcc/sh-rtems4.10/%{gcc_version}
 %dir %{_gcclibdir}/gcc/sh-rtems4.10/%{gcc_version}/include
+
 %if "%{gcc_version}" > "4.0.3"
 %if "sh-rtems4.10" != "bfin-rtems4.10"
 %if "sh-rtems4.10" != "avr-rtems4.10"
@@ -498,15 +528,9 @@ GNU cc compiler for sh-rtems4.10.
 %endif
 
 %if "%{gcc_version}" >= "4.3.0"
-%dir %{_gcclibdir}/gcc/sh-rtems4.10/%{gcc_version}/include-fixed
+%{_gcclibdir}/gcc/sh-rtems4.10/%{gcc_version}/include-fixed
 %endif
 
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/sh-rtems4.10
-%dir %{_libexecdir}/gcc/sh-rtems4.10/%{gcc_version}
-%{_libexecdir}/gcc/sh-rtems4.10/%{gcc_version}/cc1%{_exeext}
-%{_libexecdir}/gcc/sh-rtems4.10/%{gcc_version}/collect2%{_exeext}
-
 # ==============================================================
 # rtems-4.10-gcc-common
 # ==============================================================
@@ -514,6 +538,7 @@ GNU cc compiler for sh-rtems4.10.
 Summary:	Base package for rtems gcc and newlib C Library
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
+%{?_with_noarch_subpackages:BuildArch: noarch}
 License:	GPL
 
 Requires(post): 	/sbin/install-info
@@ -562,12 +587,11 @@ Summary:	GCC c++ compiler for sh-rtems4.10
 Group:		Development/Tools
 Version:        %{gcc_rpmvers}
 License:	GPL
+Requires:       rtems-4.10-sh-rtems4.10-gcc-libstdc++ = %{gcc_rpmvers}-%{release}
 
 %if "%{_build}" != "%{_host}"
 BuildRequires:  rtems-4.10-sh-rtems4.10-gcc-c++ = %{gcc_rpmvers}
 %endif
-Provides:	rtems-4.10-sh-rtems4.10-c++ = %{gcc_rpmvers}-%{release}
-Obsoletes:	rtems-4.10-sh-rtems4.10-c++ < %{gcc_rpmvers}-%{release}
 
 Requires:       rtems-4.10-gcc-common
 Requires:       rtems-4.10-sh-rtems4.10-gcc = %{gcc_rpmvers}-%{release}
@@ -575,18 +599,44 @@ Requires:       rtems-4.10-sh-rtems4.10-gcc = %{gcc_rpmvers}-%{release}
 %description -n rtems-4.10-sh-rtems4.10-gcc-c++
 GCC c++ compiler for sh-rtems4.10.
 
-%files -n rtems-4.10-sh-rtems4.10-gcc-c++ -f build/files.g++
+
+%package -n rtems-4.10-sh-rtems4.10-gcc-libstdc++
+Summary:	libstdc++ for sh-rtems4.10
+Group:		Development/Tools
+Version:        %{gcc_rpmvers}
+%{?_with_noarch_subpackages:BuildArch: noarch}
+License:	GPL
+
+%description -n rtems-4.10-sh-rtems4.10-gcc-libstdc++
+%{_summary}
+
+
+%files -n rtems-4.10-sh-rtems4.10-gcc-c++
 %defattr(-,root,root)
+%dir %{_prefix}
+
+%dir %{_mandir}
+%dir %{_mandir}/man1
 %{_mandir}/man1/sh-rtems4.10-g++.1*
 
+%dir %{_bindir}
 %{_bindir}/sh-rtems4.10-c++%{_exeext}
 %{_bindir}/sh-rtems4.10-g++%{_exeext}
 
+%dir %{_libexecdir}
 %dir %{_libexecdir}/gcc
 %dir %{_libexecdir}/gcc/sh-rtems4.10
 %dir %{_libexecdir}/gcc/sh-rtems4.10/%{gcc_version}
 %{_libexecdir}/gcc/sh-rtems4.10/%{gcc_version}/cc1plus%{_exeext}
 
+
+%files -n rtems-4.10-sh-rtems4.10-gcc-libstdc++ -f build/files.g++
+%defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_gcclibdir}
+%dir %{_gcclibdir}/gcc
+%dir %{_gcclibdir}/gcc/sh-rtems4.10
+%dir %{_gcclibdir}/gcc/sh-rtems4.10/%{gcc_version}
 %dir %{_gcclibdir}/gcc/sh-rtems4.10/%{gcc_version}/include
 %{_gcclibdir}/gcc/sh-rtems4.10/%{gcc_version}/include/c++
 
@@ -601,6 +651,7 @@ Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
 Release:        47%{?dist}
+%{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.10-newlib-common
 
@@ -610,6 +661,7 @@ Newlib C Library for sh-rtems4.10.
 %files -n rtems-4.10-sh-rtems4.10-newlib -f build/files.newlib
 %defattr(-,root,root)
 %dir %{_prefix}
+%dir %{_exec_prefix}
 %dir %{_exec_prefix}/sh-rtems4.10
 %{_exec_prefix}/sh-rtems4.10/include
 
@@ -621,6 +673,7 @@ Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
 Release:        47%{?dist}
+%{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable
 
 Requires(post): 	/sbin/install-info
diff --git a/contrib/crossrpms/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-gcc.spec
index 0b15de335e..754213c45e 100644
--- a/contrib/crossrpms/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-gcc.spec
+++ b/contrib/crossrpms/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-gcc.spec
@@ -135,6 +135,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}-47%{?dist}
 
 
@@ -307,11 +308,11 @@ cd ..
   fi
 
   # Collect multilib subdirectories
-  f=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'`
+  multilibs=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'`
 
   echo "%defattr(-,root,root,-)" > build/files.newlib
   TGTDIR="%{_exec_prefix}/sparc-rtems4.10/lib"
-  for i in $f; do
+  for i in $multilibs; do
     case $i in
     \.) echo "%dir ${TGTDIR}" >> build/files.newlib
       ;;
@@ -323,13 +324,8 @@ cd ..
   rm -f dirs ;
   echo "%defattr(-,root,root,-)" >> dirs
   echo "%dir %{_prefix}" >> dirs
-  echo "%dir %{_gcclibdir}" >> dirs
-  echo "%dir %{_libexecdir}" >> dirs
-  echo "%dir %{_gcclibdir}/gcc" >> dirs
-  echo "%dir %{_gcclibdir}/gcc/sparc-rtems4.10" >> dirs
-
   TGTDIR="%{_gcclibdir}/gcc/sparc-rtems4.10/%{gcc_version}"
-  for i in $f; do
+  for i in $multilibs; do
     case $i in
     \.) echo "%dir ${TGTDIR}" >> dirs
       ;;
@@ -360,6 +356,7 @@ cd ..
     *include/objc*) ;;
     *include/g++*);;
     *include/c++*);;
+    *include-fixed/*);;
     *finclude/*);;
     *adainclude*);;
     *adalib*);;
@@ -473,8 +470,25 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 %description -n rtems-4.10-sparc-rtems4.10-gcc
 GNU cc compiler for sparc-rtems4.10.
 
-%files -n rtems-4.10-sparc-rtems4.10-gcc -f build/files.gcc
+# ==============================================================
+# rtems-4.10-sparc-rtems4.10-gcc-libgcc
+# ==============================================================
+%package -n rtems-4.10-sparc-rtems4.10-gcc-libgcc
+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}-47%{?dist}
+License:	GPL
+
+%description -n rtems-4.10-sparc-rtems4.10-gcc-libgcc
+libgcc sparc-rtems4.10-gcc.
+
+
+%files -n rtems-4.10-sparc-rtems4.10-gcc
 %defattr(-,root,root)
+%dir %{_prefix}
+
 %dir %{_mandir}
 %dir %{_mandir}/man1
 %{_mandir}/man1/sparc-rtems4.10-gcc.1*
@@ -488,7 +502,23 @@ GNU cc compiler for sparc-rtems4.10.
 %{_bindir}/sparc-rtems4.10-gcov%{_exeext}
 %{_bindir}/sparc-rtems4.10-gccbug
 
+%dir %{_libexecdir}
+%dir %{_libexecdir}/gcc
+%dir %{_libexecdir}/gcc/sparc-rtems4.10
+%dir %{_libexecdir}/gcc/sparc-rtems4.10/%{gcc_version}
+%{_libexecdir}/gcc/sparc-rtems4.10/%{gcc_version}/cc1%{_exeext}
+%{_libexecdir}/gcc/sparc-rtems4.10/%{gcc_version}/collect2%{_exeext}
+
+
+%files -n rtems-4.10-sparc-rtems4.10-gcc-libgcc -f build/files.gcc
+%defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_gcclibdir}
+%dir %{_gcclibdir}/gcc
+%dir %{_gcclibdir}/gcc/sparc-rtems4.10
+%dir %{_gcclibdir}/gcc/sparc-rtems4.10/%{gcc_version}
 %dir %{_gcclibdir}/gcc/sparc-rtems4.10/%{gcc_version}/include
+
 %if "%{gcc_version}" > "4.0.3"
 %if "sparc-rtems4.10" != "bfin-rtems4.10"
 %if "sparc-rtems4.10" != "avr-rtems4.10"
@@ -498,15 +528,9 @@ GNU cc compiler for sparc-rtems4.10.
 %endif
 
 %if "%{gcc_version}" >= "4.3.0"
-%dir %{_gcclibdir}/gcc/sparc-rtems4.10/%{gcc_version}/include-fixed
+%{_gcclibdir}/gcc/sparc-rtems4.10/%{gcc_version}/include-fixed
 %endif
 
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/sparc-rtems4.10
-%dir %{_libexecdir}/gcc/sparc-rtems4.10/%{gcc_version}
-%{_libexecdir}/gcc/sparc-rtems4.10/%{gcc_version}/cc1%{_exeext}
-%{_libexecdir}/gcc/sparc-rtems4.10/%{gcc_version}/collect2%{_exeext}
-
 # ==============================================================
 # rtems-4.10-gcc-common
 # ==============================================================
@@ -514,6 +538,7 @@ GNU cc compiler for sparc-rtems4.10.
 Summary:	Base package for rtems gcc and newlib C Library
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
+%{?_with_noarch_subpackages:BuildArch: noarch}
 License:	GPL
 
 Requires(post): 	/sbin/install-info
@@ -562,12 +587,11 @@ Summary:	GCC c++ compiler for sparc-rtems4.10
 Group:		Development/Tools
 Version:        %{gcc_rpmvers}
 License:	GPL
+Requires:       rtems-4.10-sparc-rtems4.10-gcc-libstdc++ = %{gcc_rpmvers}-%{release}
 
 %if "%{_build}" != "%{_host}"
 BuildRequires:  rtems-4.10-sparc-rtems4.10-gcc-c++ = %{gcc_rpmvers}
 %endif
-Provides:	rtems-4.10-sparc-rtems4.10-c++ = %{gcc_rpmvers}-%{release}
-Obsoletes:	rtems-4.10-sparc-rtems4.10-c++ < %{gcc_rpmvers}-%{release}
 
 Requires:       rtems-4.10-gcc-common
 Requires:       rtems-4.10-sparc-rtems4.10-gcc = %{gcc_rpmvers}-%{release}
@@ -575,18 +599,44 @@ Requires:       rtems-4.10-sparc-rtems4.10-gcc = %{gcc_rpmvers}-%{release}
 %description -n rtems-4.10-sparc-rtems4.10-gcc-c++
 GCC c++ compiler for sparc-rtems4.10.
 
-%files -n rtems-4.10-sparc-rtems4.10-gcc-c++ -f build/files.g++
+
+%package -n rtems-4.10-sparc-rtems4.10-gcc-libstdc++
+Summary:	libstdc++ for sparc-rtems4.10
+Group:		Development/Tools
+Version:        %{gcc_rpmvers}
+%{?_with_noarch_subpackages:BuildArch: noarch}
+License:	GPL
+
+%description -n rtems-4.10-sparc-rtems4.10-gcc-libstdc++
+%{_summary}
+
+
+%files -n rtems-4.10-sparc-rtems4.10-gcc-c++
 %defattr(-,root,root)
+%dir %{_prefix}
+
+%dir %{_mandir}
+%dir %{_mandir}/man1
 %{_mandir}/man1/sparc-rtems4.10-g++.1*
 
+%dir %{_bindir}
 %{_bindir}/sparc-rtems4.10-c++%{_exeext}
 %{_bindir}/sparc-rtems4.10-g++%{_exeext}
 
+%dir %{_libexecdir}
 %dir %{_libexecdir}/gcc
 %dir %{_libexecdir}/gcc/sparc-rtems4.10
 %dir %{_libexecdir}/gcc/sparc-rtems4.10/%{gcc_version}
 %{_libexecdir}/gcc/sparc-rtems4.10/%{gcc_version}/cc1plus%{_exeext}
 
+
+%files -n rtems-4.10-sparc-rtems4.10-gcc-libstdc++ -f build/files.g++
+%defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_gcclibdir}
+%dir %{_gcclibdir}/gcc
+%dir %{_gcclibdir}/gcc/sparc-rtems4.10
+%dir %{_gcclibdir}/gcc/sparc-rtems4.10/%{gcc_version}
 %dir %{_gcclibdir}/gcc/sparc-rtems4.10/%{gcc_version}/include
 %{_gcclibdir}/gcc/sparc-rtems4.10/%{gcc_version}/include/c++
 
@@ -601,6 +651,7 @@ Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
 Release:        47%{?dist}
+%{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.10-newlib-common
 
@@ -610,6 +661,7 @@ Newlib C Library for sparc-rtems4.10.
 %files -n rtems-4.10-sparc-rtems4.10-newlib -f build/files.newlib
 %defattr(-,root,root)
 %dir %{_prefix}
+%dir %{_exec_prefix}
 %dir %{_exec_prefix}/sparc-rtems4.10
 %{_exec_prefix}/sparc-rtems4.10/include
 
@@ -621,6 +673,7 @@ Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
 Release:        47%{?dist}
+%{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable
 
 Requires(post): 	/sbin/install-info