change log for rtems (2011-08-07)

rtems-vc at rtems.org rtems-vc at rtems.org
Sun Aug 7 06:10:13 UTC 2011


 *ralf* (on branch rtems-4-9-branch):
Bump GCC_RPMREL.

M 1.29.2.22  contrib/crossrpms/rtems4.9/arm/Makefile.am
M 1.26.2.22  contrib/crossrpms/rtems4.9/avr/Makefile.am
M 1.24.2.19  contrib/crossrpms/rtems4.9/bfin/Makefile.am
M 1.26.2.21  contrib/crossrpms/rtems4.9/h8300/Makefile.am
M 1.29.2.21  contrib/crossrpms/rtems4.9/i386/Makefile.am
M 1.30.2.21  contrib/crossrpms/rtems4.9/m68k/Makefile.am
M 1.29.2.21  contrib/crossrpms/rtems4.9/mips/Makefile.am
M 1.28.2.23  contrib/crossrpms/rtems4.9/powerpc/Makefile.am
M 1.29.2.21  contrib/crossrpms/rtems4.9/sh/Makefile.am
M 1.31.2.21  contrib/crossrpms/rtems4.9/sparc/Makefile.am

diff -u rtems/contrib/crossrpms/rtems4.9/arm/Makefile.am:1.29.2.21 rtems/contrib/crossrpms/rtems4.9/arm/Makefile.am:1.29.2.22
--- rtems/contrib/crossrpms/rtems4.9/arm/Makefile.am:1.29.2.21	Fri Nov 27 04:30:50 2009
+++ rtems/contrib/crossrpms/rtems4.9/arm/Makefile.am	Sun Aug  7 00:23:06 2011
@@ -12,7 +12,7 @@
 
 GCC_VERS = 4.3.2
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 24
+GCC_RPMREL = 25
 NEWLIB_VERS = 1.16.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
 NEWLIB_RPMREL = $(GCC_RPMREL)

diff -u rtems/contrib/crossrpms/rtems4.9/avr/Makefile.am:1.26.2.21 rtems/contrib/crossrpms/rtems4.9/avr/Makefile.am:1.26.2.22
--- rtems/contrib/crossrpms/rtems4.9/avr/Makefile.am:1.26.2.21	Fri Nov 27 04:30:50 2009
+++ rtems/contrib/crossrpms/rtems4.9/avr/Makefile.am	Sun Aug  7 00:23:06 2011
@@ -12,7 +12,7 @@
 
 GCC_VERS = 4.3.2
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 24
+GCC_RPMREL = 25
 NEWLIB_VERS = 1.16.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
 NEWLIB_RPMREL = $(GCC_RPMREL)

diff -u rtems/contrib/crossrpms/rtems4.9/bfin/Makefile.am:1.24.2.18 rtems/contrib/crossrpms/rtems4.9/bfin/Makefile.am:1.24.2.19
--- rtems/contrib/crossrpms/rtems4.9/bfin/Makefile.am:1.24.2.18	Fri Nov 27 04:30:50 2009
+++ rtems/contrib/crossrpms/rtems4.9/bfin/Makefile.am	Sun Aug  7 00:23:06 2011
@@ -12,7 +12,7 @@
 
 GCC_VERS = 4.3.2
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 24
+GCC_RPMREL = 25
 NEWLIB_VERS = 1.16.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
 NEWLIB_RPMREL = $(GCC_RPMREL)

diff -u rtems/contrib/crossrpms/rtems4.9/h8300/Makefile.am:1.26.2.20 rtems/contrib/crossrpms/rtems4.9/h8300/Makefile.am:1.26.2.21
--- rtems/contrib/crossrpms/rtems4.9/h8300/Makefile.am:1.26.2.20	Fri Nov 27 04:30:50 2009
+++ rtems/contrib/crossrpms/rtems4.9/h8300/Makefile.am	Sun Aug  7 00:23:06 2011
@@ -12,7 +12,7 @@
 
 GCC_VERS = 4.3.2
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 24
+GCC_RPMREL = 25
 NEWLIB_VERS = 1.16.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
 NEWLIB_RPMREL = $(GCC_RPMREL)

diff -u rtems/contrib/crossrpms/rtems4.9/i386/Makefile.am:1.29.2.20 rtems/contrib/crossrpms/rtems4.9/i386/Makefile.am:1.29.2.21
--- rtems/contrib/crossrpms/rtems4.9/i386/Makefile.am:1.29.2.20	Fri Nov 27 04:30:50 2009
+++ rtems/contrib/crossrpms/rtems4.9/i386/Makefile.am	Sun Aug  7 00:23:06 2011
@@ -12,7 +12,7 @@
 
 GCC_VERS = 4.3.2
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 24
+GCC_RPMREL = 25
 NEWLIB_VERS = 1.16.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
 NEWLIB_RPMREL = $(GCC_RPMREL)

diff -u rtems/contrib/crossrpms/rtems4.9/m68k/Makefile.am:1.30.2.20 rtems/contrib/crossrpms/rtems4.9/m68k/Makefile.am:1.30.2.21
--- rtems/contrib/crossrpms/rtems4.9/m68k/Makefile.am:1.30.2.20	Fri Nov 27 04:30:50 2009
+++ rtems/contrib/crossrpms/rtems4.9/m68k/Makefile.am	Sun Aug  7 00:23:06 2011
@@ -12,7 +12,7 @@
 
 GCC_VERS = 4.3.2
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 24
+GCC_RPMREL = 25
 NEWLIB_VERS = 1.16.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
 NEWLIB_RPMREL = $(GCC_RPMREL)

diff -u rtems/contrib/crossrpms/rtems4.9/mips/Makefile.am:1.29.2.20 rtems/contrib/crossrpms/rtems4.9/mips/Makefile.am:1.29.2.21
--- rtems/contrib/crossrpms/rtems4.9/mips/Makefile.am:1.29.2.20	Fri Nov 27 04:30:50 2009
+++ rtems/contrib/crossrpms/rtems4.9/mips/Makefile.am	Sun Aug  7 00:23:06 2011
@@ -12,7 +12,7 @@
 
 GCC_VERS = 4.3.2
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 24
+GCC_RPMREL = 25
 NEWLIB_VERS = 1.16.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
 NEWLIB_RPMREL = $(GCC_RPMREL)

diff -u rtems/contrib/crossrpms/rtems4.9/powerpc/Makefile.am:1.28.2.22 rtems/contrib/crossrpms/rtems4.9/powerpc/Makefile.am:1.28.2.23
--- rtems/contrib/crossrpms/rtems4.9/powerpc/Makefile.am:1.28.2.22	Fri Nov 27 04:30:50 2009
+++ rtems/contrib/crossrpms/rtems4.9/powerpc/Makefile.am	Sun Aug  7 00:23:06 2011
@@ -12,7 +12,7 @@
 
 GCC_VERS = 4.3.2
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 24
+GCC_RPMREL = 25
 NEWLIB_VERS = 1.16.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
 NEWLIB_RPMREL = $(GCC_RPMREL)

diff -u rtems/contrib/crossrpms/rtems4.9/sh/Makefile.am:1.29.2.20 rtems/contrib/crossrpms/rtems4.9/sh/Makefile.am:1.29.2.21
--- rtems/contrib/crossrpms/rtems4.9/sh/Makefile.am:1.29.2.20	Fri Nov 27 04:30:50 2009
+++ rtems/contrib/crossrpms/rtems4.9/sh/Makefile.am	Sun Aug  7 00:23:06 2011
@@ -12,7 +12,7 @@
 
 GCC_VERS = 4.3.2
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 24
+GCC_RPMREL = 25
 NEWLIB_VERS = 1.16.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
 NEWLIB_RPMREL = $(GCC_RPMREL)

diff -u rtems/contrib/crossrpms/rtems4.9/sparc/Makefile.am:1.31.2.20 rtems/contrib/crossrpms/rtems4.9/sparc/Makefile.am:1.31.2.21
--- rtems/contrib/crossrpms/rtems4.9/sparc/Makefile.am:1.31.2.20	Fri Nov 27 04:30:50 2009
+++ rtems/contrib/crossrpms/rtems4.9/sparc/Makefile.am	Sun Aug  7 00:23:06 2011
@@ -12,7 +12,7 @@
 
 GCC_VERS = 4.3.2
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 24
+GCC_RPMREL = 25
 NEWLIB_VERS = 1.16.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
 NEWLIB_RPMREL = $(GCC_RPMREL)


 *ralf* (on branch rtems-4-9-branch):
Regenerate.

M 1.19.2.11  contrib/crossrpms/rtems4.9/arm/rtems-4.9-arm-rtems4.9-gcc.spec
M 1.18.2.11  contrib/crossrpms/rtems4.9/avr/rtems-4.9-avr-rtems4.9-gcc.spec
M 1.19.2.10  contrib/crossrpms/rtems4.9/bfin/rtems-4.9-bfin-rtems4.9-gcc.spec
M 1.16.2.10  contrib/crossrpms/rtems4.9/h8300/rtems-4.9-h8300-rtems4.9-gcc.spec
M 1.19.2.10  contrib/crossrpms/rtems4.9/i386/rtems-4.9-i386-rtems4.9-gcc.spec
M 1.21.2.10  contrib/crossrpms/rtems4.9/m68k/rtems-4.9-m68k-rtems4.9-gcc.spec
M 1.19.2.10  contrib/crossrpms/rtems4.9/mips/rtems-4.9-mips-rtems4.9-gcc.spec
M 1.19.2.10  contrib/crossrpms/rtems4.9/powerpc/rtems-4.9-powerpc-rtems4.9-gcc.spec
M 1.19.2.10  contrib/crossrpms/rtems4.9/sh/rtems-4.9-sh-rtems4.9-gcc.spec
M 1.19.2.10  contrib/crossrpms/rtems4.9/sparc/rtems-4.9-sparc-rtems4.9-gcc.spec

diff -u rtems/contrib/crossrpms/rtems4.9/arm/rtems-4.9-arm-rtems4.9-gcc.spec:1.19.2.10 rtems/contrib/crossrpms/rtems4.9/arm/rtems-4.9-arm-rtems4.9-gcc.spec:1.19.2.11
--- rtems/contrib/crossrpms/rtems4.9/arm/rtems-4.9-arm-rtems4.9-gcc.spec:1.19.2.10	Fri Nov 27 04:31:33 2009
+++ rtems/contrib/crossrpms/rtems4.9/arm/rtems-4.9-arm-rtems4.9-gcc.spec	Sun Aug  7 00:23:35 2011
@@ -53,14 +53,12 @@
 %define newlib_pkgvers		1.16.0
 %define newlib_version		1.16.0
 
-%define mpfr_version	2.3.1
-
 Name:         	rtems-4.9-arm-rtems4.9-gcc
 Summary:      	arm-rtems4.9 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	24%{?dist}
+Release:      	25%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -69,21 +67,145 @@
 
 BuildRequires:  %{_host_rpmprefix}gcc
 
+# versions of libraries, we conditionally bundle if necessary
+%global mpc_version	0.8.1
+%global mpfr_version	2.4.2
+%global gmp_version	4.3.2
+%global libelf_version  0.8.13
+
+# versions of libraries these distros are known to ship
+%if 0%{?fc16}
+%global mpc_provided 0.8.3
+%global mpfr_provided 3.0.0
+%global gmp_provided 4.3.2
+%endif
+
+%if 0%{?fc15}
+%global mpc_provided 0.8.3
+%global mpfr_provided 3.0.0
+%global gmp_provided 4.3.2
+%endif
+
+%if 0%{?fc14}
+%global mpc_provided 0.8.1
+%global mpfr_provided 2.4.2
+%global gmp_provided 4.3.1
+%endif
+
+%if 0%{?el6}
+%global mpc_provided %{nil}
+%global mpfr_provided 2.4.1
+%global gmp_provided 4.3.1
+%endif
+
+%if 0%{?el5}
+%global mpc_provided %{nil}
+%global mpfr_provided %{nil}
+%global gmp_provided 4.1.4
+%endif
+
+%if 0%{?suse11_3}
+%global mpc_provided 0.8.1
+%global mpfr_provided 2.4.2
+%global gmp_provided 4.3.2
+%endif
+
+%if 0%{?suse11_4}
+%global mpc_provided 0.8.2
+%global mpfr_provided 3.0.0
+%global gmp_provided 5.0.1
+%endif
+
+%if 0%{?cygwin}
+%global mpc_provided 0.8
+%global mpfr_provided 2.4.1
+%global gmp_provided 4.3.1
+%endif
+
+%if 0%{?mingw32}
+%global mpc_provided 0.8.1
+%global mpfr_provided 2.4.1
+%global gmp_provided 4.3.2
+%endif
+
+%if "%{gcc_version}" >= "4.2.0"
+%endif
+
 %if "%{gcc_version}" >= "4.3.0"
-BuildRequires:  gmp-devel >= 4.1
+%define gmp_required		4.1
+%define mpfr_required		2.3.1
+%endif
+
+%if "%{gcc_version}" >= "4.3.3"
+%define cloog_required 		0.15
+%endif
+
+%if "%{gcc_version}" >= "4.4.0"
+%define mpfr_required		2.3.2
+%endif
+
+%if "%{gcc_version}" >= "4.5.0"
+%define mpc_required 		0.8
+%if %{with lto}
+%define libelf_required 	0.8.12
+%endif
+%endif
+
+%if %{defined mpc_required}
+%if "%{mpc_provided}" >= "%{mpc_required}"
+%{?fedora:BuildRequires: libmpc-devel >= %{mpc_required}}
+%{?suse:BuildRequires: mpc-devel >= %{mpc_required}}
 %if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}gmp-devel
-BuildRequires:  %{_host_rpmprefix}mpfr-devel
+BuildRequires:  %{_host_rpmprefix}mpc-devel >= %{mpc_required}
 %endif
-%if 0%{?fedora} >= 8
-BuildRequires:  mpfr-devel >= 2.3.0
+%else
+%define _build_mpc 1
+%define gmp_required 		4.2
+%endif
+%endif
+
+%if %{defined gmp_required}
+%if "%{gmp_provided}" >= "%{gmp_required}"
+BuildRequires: gmp-devel >= %{gmp_required}
+%if "%{_build}" != "%{_host}"
+BuildRequires:  %{_host_rpmprefix}gmp-devel >= %{gmp_required}
+%endif
+%else
+%define _build_gmp 1
+%endif
+%endif
+
+%if %{defined libelf_required}
+%if "%{libelf_provided}" >= "%{libelf_required}"
+BuildRequires: libelf-devel >= %{libelf_required}
+%if "%{_build}" != "%{_host}"
+BuildRequires:  %{_host_rpmprefix}libelf-devel >= %{libelf_required}
+%endif
+%else
+%define _build_libelf 1
+%endif
+%endif
+
+
+%if %{defined cloog_required}
+%{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required}
+%{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required}
+%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required}
+%{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required}
+%{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
+%{?suse11_3:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
+%endif
+
+
+%if %{defined mpfr_required}
+%if "%{mpfr_provided}" >= "%{mpfr_required}"
+BuildRequires: mpfr-devel >= %{mpfr_required}
+%if "%{_build}" != "%{_host}"
+BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
 %endif
-%if "%{?suse}" > "10.3"
-BuildRequires:  mpfr-devel >= 2.3.0
+%else
+%define _build_mpfr 1
 %endif
-# These distros ship an insufficient mpfr
-%{?el4:%define 	_build_mpfr 	1}
-%{?suse10_3:%define 	_build_mpfr 	1}
 %endif
 
 %if "%{_build}" != "%{_host}"
@@ -100,17 +222,19 @@
 
 Requires:	rtems-4.9-gcc-common
 Requires:	rtems-4.9-arm-rtems4.9-binutils
-Requires:	rtems-4.9-arm-rtems4.9-newlib = %{newlib_version}-24%{?dist}
+Requires:	rtems-4.9-arm-rtems4.9-gcc-libgcc = %{gcc_rpmvers}-%{release}
+Requires:	rtems-4.9-arm-rtems4.9-newlib = %{newlib_version}-25%{?dist}
 
-
-%if "%{gcc_version}" >= "3.4"
-%define gcclib %{_libdir}/gcc
-%define gccexec %{_libexecdir}/gcc
+%if "%{gcc_version}" >= "4.5.0"
+BuildRequires:  zlib-devel
+%if "%{_build}" != "%{_host}"
+BuildRequires:  %{_host_rpmprefix}zlib-devel
+%endif
 %else
-%define gcclib %{_libdir}/gcc-lib
-%define gccexec %{_libdir}/gcc-lib
 %endif
 
+%global _gcclibdir %{_prefix}/lib
+
 %if "%{gcc_version}" == "4.3.2"
 Source0:	ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
 Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20090825.diff
@@ -131,8 +255,20 @@
 %endif
 %{?_without_sources:NoSource:	50}
 
-%if "%{gcc_version}" >= "4.3.0"
-Source60:    http://www.mpfr.org/mpfr-current/mpfr-%{mpfr_version}.tar.bz2
+%if 0%{?_build_mpfr}
+Source60:    http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.bz2
+%endif
+
+%if 0%{?_build_mpc}
+Source61:    http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.gz
+%endif
+
+%if 0%{?_build_gmp}
+Source62:    ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2
+%endif
+
+%if 0%{?_build_libelf}
+Source63:    http://www.mr511.de/software/libelf-%{libelf_version}.tar.gz
 %endif
 
 %description
@@ -142,10 +278,14 @@
 %setup -c -T -n %{name}-%{version}
 
 %setup -q -T -D -n %{name}-%{version} -a0
-%{?PATCH0:%patch0 -p0}
+cd gcc-%{gcc_pkgvers}
+%{?PATCH0:%patch0 -p1}
+cd ..
 
 %setup -q -T -D -n %{name}-%{version} -a1
-%{?PATCH1:%patch1 -p0}
+cd gcc-%{gcc_pkgvers}
+%{?PATCH1:%patch1 -p1}
+cd ..
 
 
 
@@ -157,6 +297,9 @@
 cd ..
   # Copy the C library into gcc's source tree
   ln -s ../newlib-%{newlib_version}/newlib gcc-%{gcc_pkgvers}
+  # Make sure not to be using GPL'ed sources
+  rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/linux
+  rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/rdos
 
 %if 0%{?_build_mpfr}
 %setup -q -T -D -n %{name}-%{version} -a60
@@ -165,7 +308,28 @@
   ln -s ../mpfr-%{mpfr_version} gcc-%{gcc_pkgvers}/mpfr
 %endif
 
-echo "RTEMS gcc-%{gcc_version}-24%{?dist}\/newlib-%{newlib_version}-24%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+%if 0%{?_build_mpc}
+%setup -q -T -D -n %{name}-%{version} -a61
+%{?PATCH61:%patch61 -p1}
+  # Build mpc one-tree style
+  ln -s ../mpc-%{mpc_version} gcc-%{gcc_pkgvers}/mpc
+%endif
+
+%if 0%{?_build_gmp}
+%setup -q -T -D -n %{name}-%{version} -a62
+%{?PATCH62:%patch62 -p1}
+  # Build gmp one-tree style
+  ln -s ../gmp-%{gmp_version} gcc-%{gcc_pkgvers}/gmp
+%endif
+
+%if 0%{?_build_libelf}
+%setup -q -T -D -n %{name}-%{version} -a63
+%{?PATCH63:%patch63 -p1}
+  # Build libelf one-tree style
+  ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
+%endif
+
+echo "RTEMS gcc-%{gcc_version}-25%{?dist}\/newlib-%{newlib_version}-25%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -192,7 +356,7 @@
     --bindir=%{_bindir} \
     --exec_prefix=%{_exec_prefix} \
     --includedir=%{_includedir} \
-    --libdir=%{_libdir} \
+    --libdir=%{_gcclibdir} \
     --libexecdir=%{_libexecdir} \
     --mandir=%{_mandir} \
     --infodir=%{_infodir} \
@@ -208,7 +372,7 @@
     --enable-version-specific-runtime-libs \
     --enable-threads \
     --enable-newlib-io-c99-formats \
-    --enable-languages="$languages" $optargs
+    --enable-languages="$languages"
 
 %if "%_host" != "%_build"
   # Bug in gcc-3.2.1:
@@ -238,12 +402,19 @@
 # Misplaced header file
   if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then
     mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \
-      $RPM_BUILD_ROOT%{gcclib}/arm-rtems4.9/%{gcc_version}/include/
+      $RPM_BUILD_ROOT%{_gcclibdir}/gcc/arm-rtems4.9/%{gcc_version}/include/
   fi
 %endif
 
   # host library
+%if "%{gcc_version}" >= "4.2.0"
+  # libiberty doesn't honor --libdir, but always installs to a 
+  # magically guessed _libdir
   rm -f  ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a
+%else
+  # libiberty installs to --libdir=...
+  rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a
+%endif
 
   # We use the version from binutils
   rm -f $RPM_BUILD_ROOT%{_bindir}/arm-rtems4.9-c++filt%{_exeext}
@@ -253,18 +424,16 @@
   rm -f $RPM_BUILD_ROOT%{_infodir}/dir
   touch $RPM_BUILD_ROOT%{_infodir}/dir
 
+  # We don't want libffi's man-pages
+  rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*ffi*
 
-%if "%{gcc_version}" >= "3.4"
   # Bug in gcc-3.4.0pre
   rm -f $RPM_BUILD_ROOT%{_bindir}/arm-rtems4.9-arm-rtems4.9-gcjh%{_exeext}
-%endif
 
-%if "%{gcc_version}" >= "3.3"
   # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs
   # the fixinclude-install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{gcclib}/arm-rtems4.9/%{gcc_version}/install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{gccexec}/arm-rtems4.9/%{gcc_version}/install-tools
-%endif
+  rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/arm-rtems4.9/%{gcc_version}/install-tools
+  rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/arm-rtems4.9/%{gcc_version}/install-tools
 
   # Bug in gcc > 4.1.0: Installs an unused, empty directory
   if test -d ${RPM_BUILD_ROOT}%{_prefix}/arm-rtems4.9/include/bits; then
@@ -272,11 +441,11 @@
   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.9/lib"
-  for i in $f; do
+  for i in $multilibs; do
     case $i in
     \.) echo "%dir ${TGTDIR}" >> build/files.newlib
       ;;
@@ -287,19 +456,10 @@
 
   rm -f dirs ;
   echo "%defattr(-,root,root,-)" >> dirs
-  echo "%dir %{_prefix}" >> dirs
-  echo "%dir %{_libdir}" >> dirs
-%if "%{gcc_version}" >= "3.4"
-  echo "%dir %{_libexecdir}" >> dirs
-%endif
-  echo "%dir %{gcclib}" >> dirs
-  echo "%dir %{gcclib}/arm-rtems4.9" >> dirs
-
-  TGTDIR="%{gcclib}/arm-rtems4.9/%{gcc_version}"
-  for i in $f; do
+  TGTDIR="%{_gcclibdir}/gcc/arm-rtems4.9/%{gcc_version}"
+  for i in $multilibs; do
     case $i in
-    \.) echo "%dir ${TGTDIR}" >> dirs
-      ;;
+    \.) ;; # ignore, handled elsewhere
     *)  echo "%dir ${TGTDIR}/$i" >> dirs
       ;;
     esac
@@ -312,7 +472,7 @@
   cp dirs build/files.gcj
   cp dirs build/files.g++
 
-  TGTDIR="%{gcclib}/arm-rtems4.9/%{gcc_version}"
+  TGTDIR="%{_gcclibdir}/gcc/arm-rtems4.9/%{gcc_version}"
   f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
   for i in $f; do
     case $i in
@@ -327,6 +487,8 @@
     *include/objc*) ;;
     *include/g++*);;
     *include/c++*);;
+    *include-fixed/*);;
+    *finclude/*);;
     *adainclude*);;
     *adalib*);;
     *gnat1);;
@@ -381,7 +543,7 @@
 cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
 #!/bin/sh
 grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/arm-rtems4.9/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/arm-rtems4.9/' | %__find_provides
+  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/arm-rtems4.9/'} | %__find_provides
 EOF
 chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
 %define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
@@ -389,7 +551,7 @@
 cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
 #!/bin/sh
 grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/arm-rtems4.9/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/arm-rtems4.9/' | %__find_requires
+  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/arm-rtems4.9/'} | %__find_requires
 EOF
 chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
 %define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
@@ -429,7 +591,7 @@
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.9-arm-rtems4.9-binutils
-# Requires:       rtems-4.9-arm-rtems4.9-newlib = %{newlib_version}-24%{?dist}
+# Requires:       rtems-4.9-arm-rtems4.9-newlib = %{newlib_version}-25%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -439,44 +601,72 @@
 %description -n rtems-4.9-arm-rtems4.9-gcc
 GNU cc compiler for arm-rtems4.9.
 
-%files -n rtems-4.9-arm-rtems4.9-gcc -f build/files.gcc
+# ==============================================================
+# rtems-4.9-arm-rtems4.9-gcc-libgcc
+# ==============================================================
+%package -n rtems-4.9-arm-rtems4.9-gcc-libgcc
+Summary:        libgcc for arm-rtems4.9-gcc
+Group:          Development/Tools
+Version:        %{gcc_rpmvers}
+%{?_with_noarch_subpackages:BuildArch: noarch}
+Requires:       rtems-4.9-arm-rtems4.9-newlib = %{newlib_version}-25%{?dist}
+License:	GPL
+
+%description -n rtems-4.9-arm-rtems4.9-gcc-libgcc
+libgcc arm-rtems4.9-gcc.
+
+
+%files -n rtems-4.9-arm-rtems4.9-gcc
 %defattr(-,root,root)
+%dir %{_prefix}
+
 %dir %{_mandir}
 %dir %{_mandir}/man1
 %{_mandir}/man1/arm-rtems4.9-gcc.1*
-%if "%{gcc_version}" >= "3.4"
 %{_mandir}/man1/arm-rtems4.9-cpp.1*
 %{_mandir}/man1/arm-rtems4.9-gcov.1*
-%endif
 
 %dir %{_bindir}
 %{_bindir}/arm-rtems4.9-cpp%{_exeext}
 %{_bindir}/arm-rtems4.9-gcc%{_exeext}
-%if "%{gcc_version}" >= "3.3"
 %{_bindir}/arm-rtems4.9-gcc-%{gcc_version}%{_exeext}
-%endif
 %{_bindir}/arm-rtems4.9-gcov%{_exeext}
+%if "%{gcc_version}" < "4.6.0"
 %{_bindir}/arm-rtems4.9-gccbug
+%endif
+
+%dir %{_libexecdir}
+%dir %{_libexecdir}/gcc
+%dir %{_libexecdir}/gcc/arm-rtems4.9
+%dir %{_libexecdir}/gcc/arm-rtems4.9/%{gcc_version}
+%{_libexecdir}/gcc/arm-rtems4.9/%{gcc_version}/cc1%{_exeext}
+%{_libexecdir}/gcc/arm-rtems4.9/%{gcc_version}/collect2%{_exeext}
+%if "%{gcc_version}" >= "4.5.0"
+%{?with_lto:%{_libexecdir}/gcc/arm-rtems4.9/%{gcc_version}/lto%{_exeext}}
+%{_libexecdir}/gcc/arm-rtems4.9/%{gcc_version}/lto-wrapper%{_exeext}
+%endif
+
+%files -n rtems-4.9-arm-rtems4.9-gcc-libgcc -f build/files.gcc
+%defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_gcclibdir}
+%dir %{_gcclibdir}/gcc
+%dir %{_gcclibdir}/gcc/arm-rtems4.9
+%dir %{_gcclibdir}/gcc/arm-rtems4.9/%{gcc_version}
+%dir %{_gcclibdir}/gcc/arm-rtems4.9/%{gcc_version}/include
 
-%dir %{gcclib}/arm-rtems4.9/%{gcc_version}/include
 %if "%{gcc_version}" > "4.0.3"
 %if "arm-rtems4.9" != "bfin-rtems4.9"
 %if "arm-rtems4.9" != "avr-rtems4.9"
-%dir %{gcclib}/arm-rtems4.9/%{gcc_version}/include/ssp
+%dir %{_gcclibdir}/gcc/arm-rtems4.9/%{gcc_version}/include/ssp
 %endif
 %endif
 %endif
 
 %if "%{gcc_version}" >= "4.3.0"
-%dir %{gcclib}/arm-rtems4.9/%{gcc_version}/include-fixed
+%{_gcclibdir}/gcc/arm-rtems4.9/%{gcc_version}/include-fixed
 %endif
 
-%dir %{gccexec}
-%dir %{gccexec}/arm-rtems4.9
-%dir %{gccexec}/arm-rtems4.9/%{gcc_version}
-%{gccexec}/arm-rtems4.9/%{gcc_version}/cc1%{_exeext}
-%{gccexec}/arm-rtems4.9/%{gcc_version}/collect2%{_exeext}
-
 # ==============================================================
 # rtems-4.9-gcc-common
 # ==============================================================
@@ -484,6 +674,7 @@
 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
@@ -494,22 +685,21 @@
 
 %files -n rtems-4.9-gcc-common
 %defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_prefix}/share
+
 %dir %{_infodir}
 %ghost %{_infodir}/dir
 %{_infodir}/cpp.info*
 %{_infodir}/cppinternals.info*
 %{_infodir}/gcc.info*
 %{_infodir}/gccint.info*
-%if "%{gcc_version}" >= "3.4"
 %{_infodir}/gccinstall.info*
+%if "%{gcc_version}" >= "4.6.0"
+%{_infodir}/libquadmath.info*
 %endif
 
 %dir %{_mandir}
-%if "%{gcc_version}" < "3.4"
-%dir %{_mandir}/man1
-%{_mandir}/man1/cpp.1*
-%{_mandir}/man1/gcov.1*
-%endif
 %dir %{_mandir}/man7
 %{_mandir}/man7/fsf-funding.7*
 %{_mandir}/man7/gfdl.7*
@@ -520,9 +710,7 @@
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
-%if "%{gcc_version}" >= "3.4"
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
-%endif
 
 %preun -n rtems-4.9-gcc-common
 if [ $1 -eq 0 ]; then
@@ -530,9 +718,7 @@
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || :
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
-%if "%{gcc_version}" >= "3.4"
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
-%endif
 fi
 
 # ==============================================================
@@ -543,12 +729,11 @@
 Group:		Development/Tools
 Version:        %{gcc_rpmvers}
 License:	GPL
+Requires:       rtems-4.9-arm-rtems4.9-gcc-libstdc++ = %{gcc_rpmvers}-%{release}
 
 %if "%{_build}" != "%{_host}"
 BuildRequires:  rtems-4.9-arm-rtems4.9-gcc-c++ = %{gcc_rpmvers}
 %endif
-Provides:	rtems-4.9-arm-rtems4.9-c++ = %{gcc_rpmvers}-%{release}
-Obsoletes:	rtems-4.9-arm-rtems4.9-c++ < %{gcc_rpmvers}-%{release}
 
 Requires:       rtems-4.9-gcc-common
 Requires:       rtems-4.9-arm-rtems4.9-gcc = %{gcc_rpmvers}-%{release}
@@ -556,20 +741,46 @@
 %description -n rtems-4.9-arm-rtems4.9-gcc-c++
 GCC c++ compiler for arm-rtems4.9.
 
-%files -n rtems-4.9-arm-rtems4.9-gcc-c++ -f build/files.g++
+
+%package -n rtems-4.9-arm-rtems4.9-gcc-libstdc++
+Summary:	libstdc++ for arm-rtems4.9
+Group:		Development/Tools
+Version:        %{gcc_rpmvers}
+%{?_with_noarch_subpackages:BuildArch: noarch}
+License:	GPL
+
+%description -n rtems-4.9-arm-rtems4.9-gcc-libstdc++
+%{summary}
+
+
+%files -n rtems-4.9-arm-rtems4.9-gcc-c++
 %defattr(-,root,root)
+%dir %{_prefix}
+
+%dir %{_mandir}
+%dir %{_mandir}/man1
 %{_mandir}/man1/arm-rtems4.9-g++.1*
 
+%dir %{_bindir}
 %{_bindir}/arm-rtems4.9-c++%{_exeext}
 %{_bindir}/arm-rtems4.9-g++%{_exeext}
 
-%dir %{gccexec}
-%dir %{gccexec}/arm-rtems4.9
-%dir %{gccexec}/arm-rtems4.9/%{gcc_version}
-%{gccexec}/arm-rtems4.9/%{gcc_version}/cc1plus%{_exeext}
+%dir %{_libexecdir}
+%dir %{_libexecdir}/gcc
+%dir %{_libexecdir}/gcc/arm-rtems4.9
+%dir %{_libexecdir}/gcc/arm-rtems4.9/%{gcc_version}
+%{_libexecdir}/gcc/arm-rtems4.9/%{gcc_version}/cc1plus%{_exeext}
+
 
-%dir %{gcclib}/arm-rtems4.9/%{gcc_version}/include
-%{gcclib}/arm-rtems4.9/%{gcc_version}/include/c++
+%files -n rtems-4.9-arm-rtems4.9-gcc-libstdc++ -f build/files.g++
+%defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_gcclibdir}
+%dir %{_gcclibdir}/gcc
+%dir %{_gcclibdir}/gcc/arm-rtems4.9
+%dir %{_gcclibdir}/gcc/arm-rtems4.9/%{gcc_version}
+%dir %{_gcclibdir}/gcc/arm-rtems4.9/%{gcc_version}/include
+%{_gcclibdir}/gcc/arm-rtems4.9/%{gcc_version}/include/c++
 
 
 
@@ -581,7 +792,8 @@
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        24%{?dist}
+Release:        25%{?dist}
+%{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.9-newlib-common
 
@@ -590,7 +802,7 @@
 
 %files -n rtems-4.9-arm-rtems4.9-newlib -f build/files.newlib
 %defattr(-,root,root)
-%dir %{_prefix}
+%dir %{_exec_prefix}
 %dir %{_exec_prefix}/arm-rtems4.9
 %{_exec_prefix}/arm-rtems4.9/include
 
@@ -601,7 +813,8 @@
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        24%{?dist}
+Release:        25%{?dist}
+%{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable
 
 Requires(post): 	/sbin/install-info
@@ -612,6 +825,9 @@
 
 %files -n rtems-4.9-newlib-common
 %defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_prefix}/share
+
 %dir %{_infodir}
 %ghost %{_infodir}/dir
 %{_infodir}/libc.info*

diff -u rtems/contrib/crossrpms/rtems4.9/avr/rtems-4.9-avr-rtems4.9-gcc.spec:1.18.2.10 rtems/contrib/crossrpms/rtems4.9/avr/rtems-4.9-avr-rtems4.9-gcc.spec:1.18.2.11
--- rtems/contrib/crossrpms/rtems4.9/avr/rtems-4.9-avr-rtems4.9-gcc.spec:1.18.2.10	Fri Nov 27 04:31:33 2009
+++ rtems/contrib/crossrpms/rtems4.9/avr/rtems-4.9-avr-rtems4.9-gcc.spec	Sun Aug  7 00:23:35 2011
@@ -53,14 +53,12 @@
 %define newlib_pkgvers		1.16.0
 %define newlib_version		1.16.0
 
-%define mpfr_version	2.3.1
-
 Name:         	rtems-4.9-avr-rtems4.9-gcc
 Summary:      	avr-rtems4.9 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	24%{?dist}
+Release:      	25%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -69,21 +67,145 @@
 
 BuildRequires:  %{_host_rpmprefix}gcc
 
+# versions of libraries, we conditionally bundle if necessary
+%global mpc_version	0.8.1
+%global mpfr_version	2.4.2
+%global gmp_version	4.3.2
+%global libelf_version  0.8.13
+
+# versions of libraries these distros are known to ship
+%if 0%{?fc16}
+%global mpc_provided 0.8.3
+%global mpfr_provided 3.0.0
+%global gmp_provided 4.3.2
+%endif
+
+%if 0%{?fc15}
+%global mpc_provided 0.8.3
+%global mpfr_provided 3.0.0
+%global gmp_provided 4.3.2
+%endif
+
+%if 0%{?fc14}
+%global mpc_provided 0.8.1
+%global mpfr_provided 2.4.2
+%global gmp_provided 4.3.1
+%endif
+
+%if 0%{?el6}
+%global mpc_provided %{nil}
+%global mpfr_provided 2.4.1
+%global gmp_provided 4.3.1
+%endif
+
+%if 0%{?el5}
+%global mpc_provided %{nil}
+%global mpfr_provided %{nil}
+%global gmp_provided 4.1.4
+%endif
+
+%if 0%{?suse11_3}
+%global mpc_provided 0.8.1
+%global mpfr_provided 2.4.2
+%global gmp_provided 4.3.2
+%endif
+
+%if 0%{?suse11_4}
+%global mpc_provided 0.8.2
+%global mpfr_provided 3.0.0
+%global gmp_provided 5.0.1
+%endif
+
+%if 0%{?cygwin}
+%global mpc_provided 0.8
+%global mpfr_provided 2.4.1
+%global gmp_provided 4.3.1
+%endif
+
+%if 0%{?mingw32}
+%global mpc_provided 0.8.1
+%global mpfr_provided 2.4.1
+%global gmp_provided 4.3.2
+%endif
+
+%if "%{gcc_version}" >= "4.2.0"
+%endif
+
 %if "%{gcc_version}" >= "4.3.0"
-BuildRequires:  gmp-devel >= 4.1
+%define gmp_required		4.1
+%define mpfr_required		2.3.1
+%endif
+
+%if "%{gcc_version}" >= "4.3.3"
+%define cloog_required 		0.15
+%endif
+
+%if "%{gcc_version}" >= "4.4.0"
+%define mpfr_required		2.3.2
+%endif
+
+%if "%{gcc_version}" >= "4.5.0"
+%define mpc_required 		0.8
+%if %{with lto}
+%define libelf_required 	0.8.12
+%endif
+%endif
+
+%if %{defined mpc_required}
+%if "%{mpc_provided}" >= "%{mpc_required}"
+%{?fedora:BuildRequires: libmpc-devel >= %{mpc_required}}
+%{?suse:BuildRequires: mpc-devel >= %{mpc_required}}
+%if "%{_build}" != "%{_host}"
+BuildRequires:  %{_host_rpmprefix}mpc-devel >= %{mpc_required}
+%endif
+%else
+%define _build_mpc 1
+%define gmp_required 		4.2
+%endif
+%endif
+
+%if %{defined gmp_required}
+%if "%{gmp_provided}" >= "%{gmp_required}"
+BuildRequires: gmp-devel >= %{gmp_required}
+%if "%{_build}" != "%{_host}"
+BuildRequires:  %{_host_rpmprefix}gmp-devel >= %{gmp_required}
+%endif
+%else
+%define _build_gmp 1
+%endif
+%endif
+
+%if %{defined libelf_required}
+%if "%{libelf_provided}" >= "%{libelf_required}"
+BuildRequires: libelf-devel >= %{libelf_required}
 %if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}gmp-devel
-BuildRequires:  %{_host_rpmprefix}mpfr-devel
+BuildRequires:  %{_host_rpmprefix}libelf-devel >= %{libelf_required}
+%endif
+%else
+%define _build_libelf 1
+%endif
+%endif
+
+
+%if %{defined cloog_required}
+%{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required}
+%{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required}
+%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required}
+%{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required}
+%{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
+%{?suse11_3:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
 %endif
-%if 0%{?fedora} >= 8
-BuildRequires:  mpfr-devel >= 2.3.0
+
+
+%if %{defined mpfr_required}
+%if "%{mpfr_provided}" >= "%{mpfr_required}"
+BuildRequires: mpfr-devel >= %{mpfr_required}
+%if "%{_build}" != "%{_host}"
+BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
 %endif
-%if "%{?suse}" > "10.3"
-BuildRequires:  mpfr-devel >= 2.3.0
+%else
+%define _build_mpfr 1
 %endif
-# These distros ship an insufficient mpfr
-%{?el4:%define 	_build_mpfr 	1}
-%{?suse10_3:%define 	_build_mpfr 	1}
 %endif
 
 %if "%{_build}" != "%{_host}"
@@ -100,17 +222,19 @@
 
 Requires:	rtems-4.9-gcc-common
 Requires:	rtems-4.9-avr-rtems4.9-binutils
-Requires:	rtems-4.9-avr-rtems4.9-newlib = %{newlib_version}-24%{?dist}
-
+Requires:	rtems-4.9-avr-rtems4.9-gcc-libgcc = %{gcc_rpmvers}-%{release}
+Requires:	rtems-4.9-avr-rtems4.9-newlib = %{newlib_version}-25%{?dist}
 
-%if "%{gcc_version}" >= "3.4"
-%define gcclib %{_libdir}/gcc
-%define gccexec %{_libexecdir}/gcc
+%if "%{gcc_version}" >= "4.5.0"
+BuildRequires:  zlib-devel
+%if "%{_build}" != "%{_host}"
+BuildRequires:  %{_host_rpmprefix}zlib-devel
+%endif
 %else
-%define gcclib %{_libdir}/gcc-lib
-%define gccexec %{_libdir}/gcc-lib
 %endif
 
+%global _gcclibdir %{_prefix}/lib
+
 %if "%{gcc_version}" == "4.3.2"
 Source0:	ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
 Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20090825.diff
@@ -123,8 +247,20 @@
 %endif
 %{?_without_sources:NoSource:	50}
 
-%if "%{gcc_version}" >= "4.3.0"
-Source60:    http://www.mpfr.org/mpfr-current/mpfr-%{mpfr_version}.tar.bz2
+%if 0%{?_build_mpfr}
+Source60:    http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.bz2
+%endif
+
+%if 0%{?_build_mpc}
+Source61:    http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.gz
+%endif
+
+%if 0%{?_build_gmp}
+Source62:    ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2
+%endif
+
+%if 0%{?_build_libelf}
+Source63:    http://www.mr511.de/software/libelf-%{libelf_version}.tar.gz
 %endif
 
 %description
@@ -134,7 +270,9 @@
 %setup -c -T -n %{name}-%{version}
 
 %setup -q -T -D -n %{name}-%{version} -a0
-%{?PATCH0:%patch0 -p0}
+cd gcc-%{gcc_pkgvers}
+%{?PATCH0:%patch0 -p1}
+cd ..
 
 
 
@@ -147,6 +285,9 @@
 cd ..
   # Copy the C library into gcc's source tree
   ln -s ../newlib-%{newlib_version}/newlib gcc-%{gcc_pkgvers}
+  # Make sure not to be using GPL'ed sources
+  rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/linux
+  rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/rdos
 
 %if 0%{?_build_mpfr}
 %setup -q -T -D -n %{name}-%{version} -a60
@@ -155,7 +296,28 @@
   ln -s ../mpfr-%{mpfr_version} gcc-%{gcc_pkgvers}/mpfr
 %endif
 
-echo "RTEMS gcc-%{gcc_version}-24%{?dist}\/newlib-%{newlib_version}-24%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+%if 0%{?_build_mpc}
+%setup -q -T -D -n %{name}-%{version} -a61
+%{?PATCH61:%patch61 -p1}
+  # Build mpc one-tree style
+  ln -s ../mpc-%{mpc_version} gcc-%{gcc_pkgvers}/mpc
+%endif
+
+%if 0%{?_build_gmp}
+%setup -q -T -D -n %{name}-%{version} -a62
+%{?PATCH62:%patch62 -p1}
+  # Build gmp one-tree style
+  ln -s ../gmp-%{gmp_version} gcc-%{gcc_pkgvers}/gmp
+%endif
+
+%if 0%{?_build_libelf}
+%setup -q -T -D -n %{name}-%{version} -a63
+%{?PATCH63:%patch63 -p1}
+  # Build libelf one-tree style
+  ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
+%endif
+
+echo "RTEMS gcc-%{gcc_version}-25%{?dist}\/newlib-%{newlib_version}-25%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -181,7 +343,7 @@
     --bindir=%{_bindir} \
     --exec_prefix=%{_exec_prefix} \
     --includedir=%{_includedir} \
-    --libdir=%{_libdir} \
+    --libdir=%{_gcclibdir} \
     --libexecdir=%{_libexecdir} \
     --mandir=%{_mandir} \
     --infodir=%{_infodir} \
@@ -197,7 +359,7 @@
     --enable-version-specific-runtime-libs \
     --enable-threads \
     --enable-newlib-io-c99-formats \
-    --enable-languages="$languages" $optargs
+    --enable-languages="$languages"
 
 %if "%_host" != "%_build"
   # Bug in gcc-3.2.1:
@@ -227,12 +389,19 @@
 # Misplaced header file
   if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then
     mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \
-      $RPM_BUILD_ROOT%{gcclib}/avr-rtems4.9/%{gcc_version}/include/
+      $RPM_BUILD_ROOT%{_gcclibdir}/gcc/avr-rtems4.9/%{gcc_version}/include/
   fi
 %endif
 
   # host library
+%if "%{gcc_version}" >= "4.2.0"
+  # libiberty doesn't honor --libdir, but always installs to a 
+  # magically guessed _libdir
   rm -f  ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a
+%else
+  # libiberty installs to --libdir=...
+  rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a
+%endif
 
   # We use the version from binutils
   rm -f $RPM_BUILD_ROOT%{_bindir}/avr-rtems4.9-c++filt%{_exeext}
@@ -242,18 +411,16 @@
   rm -f $RPM_BUILD_ROOT%{_infodir}/dir
   touch $RPM_BUILD_ROOT%{_infodir}/dir
 
+  # We don't want libffi's man-pages
+  rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*ffi*
 
-%if "%{gcc_version}" >= "3.4"
   # Bug in gcc-3.4.0pre
   rm -f $RPM_BUILD_ROOT%{_bindir}/avr-rtems4.9-avr-rtems4.9-gcjh%{_exeext}
-%endif
 
-%if "%{gcc_version}" >= "3.3"
   # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs
   # the fixinclude-install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{gcclib}/avr-rtems4.9/%{gcc_version}/install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{gccexec}/avr-rtems4.9/%{gcc_version}/install-tools
-%endif
+  rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/avr-rtems4.9/%{gcc_version}/install-tools
+  rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/avr-rtems4.9/%{gcc_version}/install-tools
 
   # Bug in gcc > 4.1.0: Installs an unused, empty directory
   if test -d ${RPM_BUILD_ROOT}%{_prefix}/avr-rtems4.9/include/bits; then
@@ -261,11 +428,11 @@
   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.9/lib"
-  for i in $f; do
+  for i in $multilibs; do
     case $i in
     \.) echo "%dir ${TGTDIR}" >> build/files.newlib
       ;;
@@ -276,19 +443,10 @@
 
   rm -f dirs ;
   echo "%defattr(-,root,root,-)" >> dirs
-  echo "%dir %{_prefix}" >> dirs
-  echo "%dir %{_libdir}" >> dirs
-%if "%{gcc_version}" >= "3.4"
-  echo "%dir %{_libexecdir}" >> dirs
-%endif
-  echo "%dir %{gcclib}" >> dirs
-  echo "%dir %{gcclib}/avr-rtems4.9" >> dirs
-
-  TGTDIR="%{gcclib}/avr-rtems4.9/%{gcc_version}"
-  for i in $f; do
+  TGTDIR="%{_gcclibdir}/gcc/avr-rtems4.9/%{gcc_version}"
+  for i in $multilibs; do
     case $i in
-    \.) echo "%dir ${TGTDIR}" >> dirs
-      ;;
+    \.) ;; # ignore, handled elsewhere
     *)  echo "%dir ${TGTDIR}/$i" >> dirs
       ;;
     esac
@@ -301,7 +459,7 @@
   cp dirs build/files.gcj
   cp dirs build/files.g++
 
-  TGTDIR="%{gcclib}/avr-rtems4.9/%{gcc_version}"
+  TGTDIR="%{_gcclibdir}/gcc/avr-rtems4.9/%{gcc_version}"
   f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
   for i in $f; do
     case $i in
@@ -316,6 +474,8 @@
     *include/objc*) ;;
     *include/g++*);;
     *include/c++*);;
+    *include-fixed/*);;
+    *finclude/*);;
     *adainclude*);;
     *adalib*);;
     *gnat1);;
@@ -370,7 +530,7 @@
 cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
 #!/bin/sh
 grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/avr-rtems4.9/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/avr-rtems4.9/' | %__find_provides
+  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/avr-rtems4.9/'} | %__find_provides
 EOF
 chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
 %define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
@@ -378,7 +538,7 @@
 cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
 #!/bin/sh
 grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/avr-rtems4.9/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/avr-rtems4.9/' | %__find_requires
+  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/avr-rtems4.9/'} | %__find_requires
 EOF
 chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
 %define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
@@ -418,7 +578,7 @@
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.9-avr-rtems4.9-binutils
-# Requires:       rtems-4.9-avr-rtems4.9-newlib = %{newlib_version}-24%{?dist}
+# Requires:       rtems-4.9-avr-rtems4.9-newlib = %{newlib_version}-25%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -428,44 +588,72 @@
 %description -n rtems-4.9-avr-rtems4.9-gcc
 GNU cc compiler for avr-rtems4.9.
 
-%files -n rtems-4.9-avr-rtems4.9-gcc -f build/files.gcc
+# ==============================================================
+# rtems-4.9-avr-rtems4.9-gcc-libgcc
+# ==============================================================
+%package -n rtems-4.9-avr-rtems4.9-gcc-libgcc
+Summary:        libgcc for avr-rtems4.9-gcc
+Group:          Development/Tools
+Version:        %{gcc_rpmvers}
+%{?_with_noarch_subpackages:BuildArch: noarch}
+Requires:       rtems-4.9-avr-rtems4.9-newlib = %{newlib_version}-25%{?dist}
+License:	GPL
+
+%description -n rtems-4.9-avr-rtems4.9-gcc-libgcc
+libgcc avr-rtems4.9-gcc.
+
+
+%files -n rtems-4.9-avr-rtems4.9-gcc
 %defattr(-,root,root)
+%dir %{_prefix}
+
 %dir %{_mandir}
 %dir %{_mandir}/man1
 %{_mandir}/man1/avr-rtems4.9-gcc.1*
-%if "%{gcc_version}" >= "3.4"
 %{_mandir}/man1/avr-rtems4.9-cpp.1*
 %{_mandir}/man1/avr-rtems4.9-gcov.1*
-%endif
 
 %dir %{_bindir}
 %{_bindir}/avr-rtems4.9-cpp%{_exeext}
 %{_bindir}/avr-rtems4.9-gcc%{_exeext}
-%if "%{gcc_version}" >= "3.3"
 %{_bindir}/avr-rtems4.9-gcc-%{gcc_version}%{_exeext}
-%endif
 %{_bindir}/avr-rtems4.9-gcov%{_exeext}
+%if "%{gcc_version}" < "4.6.0"
 %{_bindir}/avr-rtems4.9-gccbug
+%endif
+
+%dir %{_libexecdir}
+%dir %{_libexecdir}/gcc
+%dir %{_libexecdir}/gcc/avr-rtems4.9
+%dir %{_libexecdir}/gcc/avr-rtems4.9/%{gcc_version}
+%{_libexecdir}/gcc/avr-rtems4.9/%{gcc_version}/cc1%{_exeext}
+%{_libexecdir}/gcc/avr-rtems4.9/%{gcc_version}/collect2%{_exeext}
+%if "%{gcc_version}" >= "4.5.0"
+%{?with_lto:%{_libexecdir}/gcc/avr-rtems4.9/%{gcc_version}/lto%{_exeext}}
+%{_libexecdir}/gcc/avr-rtems4.9/%{gcc_version}/lto-wrapper%{_exeext}
+%endif
+
+%files -n rtems-4.9-avr-rtems4.9-gcc-libgcc -f build/files.gcc
+%defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_gcclibdir}
+%dir %{_gcclibdir}/gcc
+%dir %{_gcclibdir}/gcc/avr-rtems4.9
+%dir %{_gcclibdir}/gcc/avr-rtems4.9/%{gcc_version}
+%dir %{_gcclibdir}/gcc/avr-rtems4.9/%{gcc_version}/include
 
-%dir %{gcclib}/avr-rtems4.9/%{gcc_version}/include
 %if "%{gcc_version}" > "4.0.3"
 %if "avr-rtems4.9" != "bfin-rtems4.9"
 %if "avr-rtems4.9" != "avr-rtems4.9"
-%dir %{gcclib}/avr-rtems4.9/%{gcc_version}/include/ssp
+%dir %{_gcclibdir}/gcc/avr-rtems4.9/%{gcc_version}/include/ssp
 %endif
 %endif
 %endif
 
 %if "%{gcc_version}" >= "4.3.0"
-%dir %{gcclib}/avr-rtems4.9/%{gcc_version}/include-fixed
+%{_gcclibdir}/gcc/avr-rtems4.9/%{gcc_version}/include-fixed
 %endif
 
-%dir %{gccexec}
-%dir %{gccexec}/avr-rtems4.9
-%dir %{gccexec}/avr-rtems4.9/%{gcc_version}
-%{gccexec}/avr-rtems4.9/%{gcc_version}/cc1%{_exeext}
-%{gccexec}/avr-rtems4.9/%{gcc_version}/collect2%{_exeext}
-
 # ==============================================================
 # rtems-4.9-gcc-common
 # ==============================================================
@@ -473,6 +661,7 @@
 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
@@ -483,22 +672,21 @@
 
 %files -n rtems-4.9-gcc-common
 %defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_prefix}/share
+
 %dir %{_infodir}
 %ghost %{_infodir}/dir
 %{_infodir}/cpp.info*
 %{_infodir}/cppinternals.info*
 %{_infodir}/gcc.info*
 %{_infodir}/gccint.info*
-%if "%{gcc_version}" >= "3.4"
 %{_infodir}/gccinstall.info*
+%if "%{gcc_version}" >= "4.6.0"
+%{_infodir}/libquadmath.info*
 %endif
 
 %dir %{_mandir}
-%if "%{gcc_version}" < "3.4"
-%dir %{_mandir}/man1
-%{_mandir}/man1/cpp.1*
-%{_mandir}/man1/gcov.1*
-%endif
 %dir %{_mandir}/man7
 %{_mandir}/man7/fsf-funding.7*
 %{_mandir}/man7/gfdl.7*
@@ -509,9 +697,7 @@
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
-%if "%{gcc_version}" >= "3.4"
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
-%endif
 
 %preun -n rtems-4.9-gcc-common
 if [ $1 -eq 0 ]; then
@@ -519,9 +705,7 @@
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || :
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
-%if "%{gcc_version}" >= "3.4"
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
-%endif
 fi
 
 
@@ -535,7 +719,8 @@
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        24%{?dist}
+Release:        25%{?dist}
+%{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.9-newlib-common
 
@@ -544,7 +729,7 @@
 
 %files -n rtems-4.9-avr-rtems4.9-newlib -f build/files.newlib
 %defattr(-,root,root)
-%dir %{_prefix}
+%dir %{_exec_prefix}
 %dir %{_exec_prefix}/avr-rtems4.9
 %{_exec_prefix}/avr-rtems4.9/include
 
@@ -555,7 +740,8 @@
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        24%{?dist}
+Release:        25%{?dist}
+%{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable
 
 Requires(post): 	/sbin/install-info
@@ -566,6 +752,9 @@
 
 %files -n rtems-4.9-newlib-common
 %defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_prefix}/share
+
 %dir %{_infodir}
 %ghost %{_infodir}/dir
 %{_infodir}/libc.info*

diff -u rtems/contrib/crossrpms/rtems4.9/bfin/rtems-4.9-bfin-rtems4.9-gcc.spec:1.19.2.9 rtems/contrib/crossrpms/rtems4.9/bfin/rtems-4.9-bfin-rtems4.9-gcc.spec:1.19.2.10
--- rtems/contrib/crossrpms/rtems4.9/bfin/rtems-4.9-bfin-rtems4.9-gcc.spec:1.19.2.9	Fri Nov 27 04:31:33 2009
+++ rtems/contrib/crossrpms/rtems4.9/bfin/rtems-4.9-bfin-rtems4.9-gcc.spec	Sun Aug  7 00:23:35 2011
@@ -53,14 +53,12 @@
 %define newlib_pkgvers		1.16.0
 %define newlib_version		1.16.0
 
-%define mpfr_version	2.3.1
-
 Name:         	rtems-4.9-bfin-rtems4.9-gcc
 Summary:      	bfin-rtems4.9 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	24%{?dist}
+Release:      	25%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -69,21 +67,145 @@
 
 BuildRequires:  %{_host_rpmprefix}gcc
 
+# versions of libraries, we conditionally bundle if necessary
+%global mpc_version	0.8.1
+%global mpfr_version	2.4.2
+%global gmp_version	4.3.2
+%global libelf_version  0.8.13
+
+# versions of libraries these distros are known to ship
+%if 0%{?fc16}
+%global mpc_provided 0.8.3
+%global mpfr_provided 3.0.0
+%global gmp_provided 4.3.2
+%endif
+
+%if 0%{?fc15}
+%global mpc_provided 0.8.3
+%global mpfr_provided 3.0.0
+%global gmp_provided 4.3.2
+%endif
+
+%if 0%{?fc14}
+%global mpc_provided 0.8.1
+%global mpfr_provided 2.4.2
+%global gmp_provided 4.3.1
+%endif
+
+%if 0%{?el6}
+%global mpc_provided %{nil}
+%global mpfr_provided 2.4.1
+%global gmp_provided 4.3.1
+%endif
+
+%if 0%{?el5}
+%global mpc_provided %{nil}
+%global mpfr_provided %{nil}
+%global gmp_provided 4.1.4
+%endif
+
+%if 0%{?suse11_3}
+%global mpc_provided 0.8.1
+%global mpfr_provided 2.4.2
+%global gmp_provided 4.3.2
+%endif
+
+%if 0%{?suse11_4}
+%global mpc_provided 0.8.2
+%global mpfr_provided 3.0.0
+%global gmp_provided 5.0.1
+%endif
+
+%if 0%{?cygwin}
+%global mpc_provided 0.8
+%global mpfr_provided 2.4.1
+%global gmp_provided 4.3.1
+%endif
+
+%if 0%{?mingw32}
+%global mpc_provided 0.8.1
+%global mpfr_provided 2.4.1
+%global gmp_provided 4.3.2
+%endif
+
+%if "%{gcc_version}" >= "4.2.0"
+%endif
+
 %if "%{gcc_version}" >= "4.3.0"
-BuildRequires:  gmp-devel >= 4.1
+%define gmp_required		4.1
+%define mpfr_required		2.3.1
+%endif
+
+%if "%{gcc_version}" >= "4.3.3"
+%define cloog_required 		0.15
+%endif
+
+%if "%{gcc_version}" >= "4.4.0"
+%define mpfr_required		2.3.2
+%endif
+
+%if "%{gcc_version}" >= "4.5.0"
+%define mpc_required 		0.8
+%if %{with lto}
+%define libelf_required 	0.8.12
+%endif
+%endif
+
+%if %{defined mpc_required}
+%if "%{mpc_provided}" >= "%{mpc_required}"
+%{?fedora:BuildRequires: libmpc-devel >= %{mpc_required}}
+%{?suse:BuildRequires: mpc-devel >= %{mpc_required}}
 %if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}gmp-devel
-BuildRequires:  %{_host_rpmprefix}mpfr-devel
+BuildRequires:  %{_host_rpmprefix}mpc-devel >= %{mpc_required}
 %endif
-%if 0%{?fedora} >= 8
-BuildRequires:  mpfr-devel >= 2.3.0
+%else
+%define _build_mpc 1
+%define gmp_required 		4.2
+%endif
+%endif
+
+%if %{defined gmp_required}
+%if "%{gmp_provided}" >= "%{gmp_required}"
+BuildRequires: gmp-devel >= %{gmp_required}
+%if "%{_build}" != "%{_host}"
+BuildRequires:  %{_host_rpmprefix}gmp-devel >= %{gmp_required}
+%endif
+%else
+%define _build_gmp 1
+%endif
+%endif
+
+%if %{defined libelf_required}
+%if "%{libelf_provided}" >= "%{libelf_required}"
+BuildRequires: libelf-devel >= %{libelf_required}
+%if "%{_build}" != "%{_host}"
+BuildRequires:  %{_host_rpmprefix}libelf-devel >= %{libelf_required}
+%endif
+%else
+%define _build_libelf 1
+%endif
+%endif
+
+
+%if %{defined cloog_required}
+%{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required}
+%{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required}
+%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required}
+%{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required}
+%{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
+%{?suse11_3:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
+%endif
+
+
+%if %{defined mpfr_required}
+%if "%{mpfr_provided}" >= "%{mpfr_required}"
+BuildRequires: mpfr-devel >= %{mpfr_required}
+%if "%{_build}" != "%{_host}"
+BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
 %endif
-%if "%{?suse}" > "10.3"
-BuildRequires:  mpfr-devel >= 2.3.0
+%else
+%define _build_mpfr 1
 %endif
-# These distros ship an insufficient mpfr
-%{?el4:%define 	_build_mpfr 	1}
-%{?suse10_3:%define 	_build_mpfr 	1}
 %endif
 
 %if "%{_build}" != "%{_host}"
@@ -100,17 +222,19 @@
 
 Requires:	rtems-4.9-gcc-common
 Requires:	rtems-4.9-bfin-rtems4.9-binutils
-Requires:	rtems-4.9-bfin-rtems4.9-newlib = %{newlib_version}-24%{?dist}
+Requires:	rtems-4.9-bfin-rtems4.9-gcc-libgcc = %{gcc_rpmvers}-%{release}
+Requires:	rtems-4.9-bfin-rtems4.9-newlib = %{newlib_version}-25%{?dist}
 
-
-%if "%{gcc_version}" >= "3.4"
-%define gcclib %{_libdir}/gcc
-%define gccexec %{_libexecdir}/gcc
+%if "%{gcc_version}" >= "4.5.0"
+BuildRequires:  zlib-devel
+%if "%{_build}" != "%{_host}"
+BuildRequires:  %{_host_rpmprefix}zlib-devel
+%endif
 %else
-%define gcclib %{_libdir}/gcc-lib
-%define gccexec %{_libdir}/gcc-lib
 %endif
 
+%global _gcclibdir %{_prefix}/lib
+
 %if "%{gcc_version}" == "4.3.2"
 Source0:	ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
 Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20090825.diff
@@ -131,8 +255,20 @@
 %endif
 %{?_without_sources:NoSource:	50}
 
-%if "%{gcc_version}" >= "4.3.0"
-Source60:    http://www.mpfr.org/mpfr-current/mpfr-%{mpfr_version}.tar.bz2
+%if 0%{?_build_mpfr}
+Source60:    http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.bz2
+%endif
+
+%if 0%{?_build_mpc}
+Source61:    http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.gz
+%endif
+
+%if 0%{?_build_gmp}
+Source62:    ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2
+%endif
+
+%if 0%{?_build_libelf}
+Source63:    http://www.mr511.de/software/libelf-%{libelf_version}.tar.gz
 %endif
 
 %description
@@ -142,10 +278,14 @@
 %setup -c -T -n %{name}-%{version}
 
 %setup -q -T -D -n %{name}-%{version} -a0
-%{?PATCH0:%patch0 -p0}
+cd gcc-%{gcc_pkgvers}
+%{?PATCH0:%patch0 -p1}
+cd ..
 
 %setup -q -T -D -n %{name}-%{version} -a1
-%{?PATCH1:%patch1 -p0}
+cd gcc-%{gcc_pkgvers}
+%{?PATCH1:%patch1 -p1}
+cd ..
 
 
 
@@ -157,6 +297,9 @@
 cd ..
   # Copy the C library into gcc's source tree
   ln -s ../newlib-%{newlib_version}/newlib gcc-%{gcc_pkgvers}
+  # Make sure not to be using GPL'ed sources
+  rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/linux
+  rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/rdos
 
 %if 0%{?_build_mpfr}
 %setup -q -T -D -n %{name}-%{version} -a60
@@ -165,7 +308,28 @@
   ln -s ../mpfr-%{mpfr_version} gcc-%{gcc_pkgvers}/mpfr
 %endif
 
-echo "RTEMS gcc-%{gcc_version}-24%{?dist}\/newlib-%{newlib_version}-24%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+%if 0%{?_build_mpc}
+%setup -q -T -D -n %{name}-%{version} -a61
+%{?PATCH61:%patch61 -p1}
+  # Build mpc one-tree style
+  ln -s ../mpc-%{mpc_version} gcc-%{gcc_pkgvers}/mpc
+%endif
+
+%if 0%{?_build_gmp}
+%setup -q -T -D -n %{name}-%{version} -a62
+%{?PATCH62:%patch62 -p1}
+  # Build gmp one-tree style
+  ln -s ../gmp-%{gmp_version} gcc-%{gcc_pkgvers}/gmp
+%endif
+
+%if 0%{?_build_libelf}
+%setup -q -T -D -n %{name}-%{version} -a63
+%{?PATCH63:%patch63 -p1}
+  # Build libelf one-tree style
+  ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
+%endif
+
+echo "RTEMS gcc-%{gcc_version}-25%{?dist}\/newlib-%{newlib_version}-25%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -192,7 +356,7 @@
     --bindir=%{_bindir} \
     --exec_prefix=%{_exec_prefix} \
     --includedir=%{_includedir} \
-    --libdir=%{_libdir} \
+    --libdir=%{_gcclibdir} \
     --libexecdir=%{_libexecdir} \
     --mandir=%{_mandir} \
     --infodir=%{_infodir} \
@@ -208,7 +372,7 @@
     --enable-version-specific-runtime-libs \
     --enable-threads \
     --enable-newlib-io-c99-formats \
-    --enable-languages="$languages" $optargs
+    --enable-languages="$languages"
 
 %if "%_host" != "%_build"
   # Bug in gcc-3.2.1:
@@ -238,12 +402,19 @@
 # Misplaced header file
   if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then
     mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \
-      $RPM_BUILD_ROOT%{gcclib}/bfin-rtems4.9/%{gcc_version}/include/
+      $RPM_BUILD_ROOT%{_gcclibdir}/gcc/bfin-rtems4.9/%{gcc_version}/include/
   fi
 %endif
 
   # host library
+%if "%{gcc_version}" >= "4.2.0"
+  # libiberty doesn't honor --libdir, but always installs to a 
+  # magically guessed _libdir
   rm -f  ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a
+%else
+  # libiberty installs to --libdir=...
+  rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a
+%endif
 
   # We use the version from binutils
   rm -f $RPM_BUILD_ROOT%{_bindir}/bfin-rtems4.9-c++filt%{_exeext}
@@ -253,18 +424,16 @@
   rm -f $RPM_BUILD_ROOT%{_infodir}/dir
   touch $RPM_BUILD_ROOT%{_infodir}/dir
 
+  # We don't want libffi's man-pages
+  rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*ffi*
 
-%if "%{gcc_version}" >= "3.4"
   # Bug in gcc-3.4.0pre
   rm -f $RPM_BUILD_ROOT%{_bindir}/bfin-rtems4.9-bfin-rtems4.9-gcjh%{_exeext}
-%endif
 
-%if "%{gcc_version}" >= "3.3"
   # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs
   # the fixinclude-install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{gcclib}/bfin-rtems4.9/%{gcc_version}/install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{gccexec}/bfin-rtems4.9/%{gcc_version}/install-tools
-%endif
+  rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/bfin-rtems4.9/%{gcc_version}/install-tools
+  rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/bfin-rtems4.9/%{gcc_version}/install-tools
 
   # Bug in gcc > 4.1.0: Installs an unused, empty directory
   if test -d ${RPM_BUILD_ROOT}%{_prefix}/bfin-rtems4.9/include/bits; then
@@ -272,11 +441,11 @@
   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.9/lib"
-  for i in $f; do
+  for i in $multilibs; do
     case $i in
     \.) echo "%dir ${TGTDIR}" >> build/files.newlib
       ;;
@@ -287,19 +456,10 @@
 
   rm -f dirs ;
   echo "%defattr(-,root,root,-)" >> dirs
-  echo "%dir %{_prefix}" >> dirs
-  echo "%dir %{_libdir}" >> dirs
-%if "%{gcc_version}" >= "3.4"
-  echo "%dir %{_libexecdir}" >> dirs
-%endif
-  echo "%dir %{gcclib}" >> dirs
-  echo "%dir %{gcclib}/bfin-rtems4.9" >> dirs
-
-  TGTDIR="%{gcclib}/bfin-rtems4.9/%{gcc_version}"
-  for i in $f; do
+  TGTDIR="%{_gcclibdir}/gcc/bfin-rtems4.9/%{gcc_version}"
+  for i in $multilibs; do
     case $i in
-    \.) echo "%dir ${TGTDIR}" >> dirs
-      ;;
+    \.) ;; # ignore, handled elsewhere
     *)  echo "%dir ${TGTDIR}/$i" >> dirs
       ;;
     esac
@@ -312,7 +472,7 @@
   cp dirs build/files.gcj
   cp dirs build/files.g++
 
-  TGTDIR="%{gcclib}/bfin-rtems4.9/%{gcc_version}"
+  TGTDIR="%{_gcclibdir}/gcc/bfin-rtems4.9/%{gcc_version}"
   f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
   for i in $f; do
     case $i in
@@ -327,6 +487,8 @@
     *include/objc*) ;;
     *include/g++*);;
     *include/c++*);;
+    *include-fixed/*);;
+    *finclude/*);;
     *adainclude*);;
     *adalib*);;
     *gnat1);;
@@ -381,7 +543,7 @@
 cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
 #!/bin/sh
 grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/bfin-rtems4.9/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/bfin-rtems4.9/' | %__find_provides
+  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/bfin-rtems4.9/'} | %__find_provides
 EOF
 chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
 %define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
@@ -389,7 +551,7 @@
 cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
 #!/bin/sh
 grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/bfin-rtems4.9/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/bfin-rtems4.9/' | %__find_requires
+  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/bfin-rtems4.9/'} | %__find_requires
 EOF
 chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
 %define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
@@ -429,7 +591,7 @@
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.9-bfin-rtems4.9-binutils
-# Requires:       rtems-4.9-bfin-rtems4.9-newlib = %{newlib_version}-24%{?dist}
+# Requires:       rtems-4.9-bfin-rtems4.9-newlib = %{newlib_version}-25%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -439,44 +601,72 @@
 %description -n rtems-4.9-bfin-rtems4.9-gcc
 GNU cc compiler for bfin-rtems4.9.
 
-%files -n rtems-4.9-bfin-rtems4.9-gcc -f build/files.gcc
+# ==============================================================
+# rtems-4.9-bfin-rtems4.9-gcc-libgcc
+# ==============================================================
+%package -n rtems-4.9-bfin-rtems4.9-gcc-libgcc
+Summary:        libgcc for bfin-rtems4.9-gcc
+Group:          Development/Tools
+Version:        %{gcc_rpmvers}
+%{?_with_noarch_subpackages:BuildArch: noarch}
+Requires:       rtems-4.9-bfin-rtems4.9-newlib = %{newlib_version}-25%{?dist}
+License:	GPL
+
+%description -n rtems-4.9-bfin-rtems4.9-gcc-libgcc
+libgcc bfin-rtems4.9-gcc.
+
+
+%files -n rtems-4.9-bfin-rtems4.9-gcc
 %defattr(-,root,root)
+%dir %{_prefix}
+
 %dir %{_mandir}
 %dir %{_mandir}/man1
 %{_mandir}/man1/bfin-rtems4.9-gcc.1*
-%if "%{gcc_version}" >= "3.4"
 %{_mandir}/man1/bfin-rtems4.9-cpp.1*
 %{_mandir}/man1/bfin-rtems4.9-gcov.1*
-%endif
 
 %dir %{_bindir}
 %{_bindir}/bfin-rtems4.9-cpp%{_exeext}
 %{_bindir}/bfin-rtems4.9-gcc%{_exeext}
-%if "%{gcc_version}" >= "3.3"
 %{_bindir}/bfin-rtems4.9-gcc-%{gcc_version}%{_exeext}
-%endif
 %{_bindir}/bfin-rtems4.9-gcov%{_exeext}
+%if "%{gcc_version}" < "4.6.0"
 %{_bindir}/bfin-rtems4.9-gccbug
+%endif
+
+%dir %{_libexecdir}
+%dir %{_libexecdir}/gcc
+%dir %{_libexecdir}/gcc/bfin-rtems4.9
+%dir %{_libexecdir}/gcc/bfin-rtems4.9/%{gcc_version}
+%{_libexecdir}/gcc/bfin-rtems4.9/%{gcc_version}/cc1%{_exeext}
+%{_libexecdir}/gcc/bfin-rtems4.9/%{gcc_version}/collect2%{_exeext}
+%if "%{gcc_version}" >= "4.5.0"
+%{?with_lto:%{_libexecdir}/gcc/bfin-rtems4.9/%{gcc_version}/lto%{_exeext}}
+%{_libexecdir}/gcc/bfin-rtems4.9/%{gcc_version}/lto-wrapper%{_exeext}
+%endif
+
+%files -n rtems-4.9-bfin-rtems4.9-gcc-libgcc -f build/files.gcc
+%defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_gcclibdir}
+%dir %{_gcclibdir}/gcc
+%dir %{_gcclibdir}/gcc/bfin-rtems4.9
+%dir %{_gcclibdir}/gcc/bfin-rtems4.9/%{gcc_version}
+%dir %{_gcclibdir}/gcc/bfin-rtems4.9/%{gcc_version}/include
 
-%dir %{gcclib}/bfin-rtems4.9/%{gcc_version}/include
 %if "%{gcc_version}" > "4.0.3"
 %if "bfin-rtems4.9" != "bfin-rtems4.9"
 %if "bfin-rtems4.9" != "avr-rtems4.9"
-%dir %{gcclib}/bfin-rtems4.9/%{gcc_version}/include/ssp
+%dir %{_gcclibdir}/gcc/bfin-rtems4.9/%{gcc_version}/include/ssp
 %endif
 %endif
 %endif
 
 %if "%{gcc_version}" >= "4.3.0"
-%dir %{gcclib}/bfin-rtems4.9/%{gcc_version}/include-fixed
+%{_gcclibdir}/gcc/bfin-rtems4.9/%{gcc_version}/include-fixed
 %endif
 
-%dir %{gccexec}
-%dir %{gccexec}/bfin-rtems4.9
-%dir %{gccexec}/bfin-rtems4.9/%{gcc_version}
-%{gccexec}/bfin-rtems4.9/%{gcc_version}/cc1%{_exeext}
-%{gccexec}/bfin-rtems4.9/%{gcc_version}/collect2%{_exeext}
-
 # ==============================================================
 # rtems-4.9-gcc-common
 # ==============================================================
@@ -484,6 +674,7 @@
 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
@@ -494,22 +685,21 @@
 
 %files -n rtems-4.9-gcc-common
 %defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_prefix}/share
+
 %dir %{_infodir}
 %ghost %{_infodir}/dir
 %{_infodir}/cpp.info*
 %{_infodir}/cppinternals.info*
 %{_infodir}/gcc.info*
 %{_infodir}/gccint.info*
-%if "%{gcc_version}" >= "3.4"
 %{_infodir}/gccinstall.info*
+%if "%{gcc_version}" >= "4.6.0"
+%{_infodir}/libquadmath.info*
 %endif
 
 %dir %{_mandir}
-%if "%{gcc_version}" < "3.4"
-%dir %{_mandir}/man1
-%{_mandir}/man1/cpp.1*
-%{_mandir}/man1/gcov.1*
-%endif
 %dir %{_mandir}/man7
 %{_mandir}/man7/fsf-funding.7*
 %{_mandir}/man7/gfdl.7*
@@ -520,9 +710,7 @@
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
-%if "%{gcc_version}" >= "3.4"
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
-%endif
 
 %preun -n rtems-4.9-gcc-common
 if [ $1 -eq 0 ]; then
@@ -530,9 +718,7 @@
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || :
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
-%if "%{gcc_version}" >= "3.4"
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
-%endif
 fi
 
 # ==============================================================
@@ -543,12 +729,11 @@
 Group:		Development/Tools
 Version:        %{gcc_rpmvers}
 License:	GPL
+Requires:       rtems-4.9-bfin-rtems4.9-gcc-libstdc++ = %{gcc_rpmvers}-%{release}
 
 %if "%{_build}" != "%{_host}"
 BuildRequires:  rtems-4.9-bfin-rtems4.9-gcc-c++ = %{gcc_rpmvers}
 %endif
-Provides:	rtems-4.9-bfin-rtems4.9-c++ = %{gcc_rpmvers}-%{release}
-Obsoletes:	rtems-4.9-bfin-rtems4.9-c++ < %{gcc_rpmvers}-%{release}
 
 Requires:       rtems-4.9-gcc-common
 Requires:       rtems-4.9-bfin-rtems4.9-gcc = %{gcc_rpmvers}-%{release}
@@ -556,20 +741,46 @@
 %description -n rtems-4.9-bfin-rtems4.9-gcc-c++
 GCC c++ compiler for bfin-rtems4.9.
 
-%files -n rtems-4.9-bfin-rtems4.9-gcc-c++ -f build/files.g++
+
+%package -n rtems-4.9-bfin-rtems4.9-gcc-libstdc++
+Summary:	libstdc++ for bfin-rtems4.9
+Group:		Development/Tools
+Version:        %{gcc_rpmvers}
+%{?_with_noarch_subpackages:BuildArch: noarch}
+License:	GPL
+
+%description -n rtems-4.9-bfin-rtems4.9-gcc-libstdc++
+%{summary}
+
+
+%files -n rtems-4.9-bfin-rtems4.9-gcc-c++
 %defattr(-,root,root)
+%dir %{_prefix}
+
+%dir %{_mandir}
+%dir %{_mandir}/man1
 %{_mandir}/man1/bfin-rtems4.9-g++.1*
 
+%dir %{_bindir}
 %{_bindir}/bfin-rtems4.9-c++%{_exeext}
 %{_bindir}/bfin-rtems4.9-g++%{_exeext}
 
-%dir %{gccexec}
-%dir %{gccexec}/bfin-rtems4.9
-%dir %{gccexec}/bfin-rtems4.9/%{gcc_version}
-%{gccexec}/bfin-rtems4.9/%{gcc_version}/cc1plus%{_exeext}
+%dir %{_libexecdir}
+%dir %{_libexecdir}/gcc
+%dir %{_libexecdir}/gcc/bfin-rtems4.9
+%dir %{_libexecdir}/gcc/bfin-rtems4.9/%{gcc_version}
+%{_libexecdir}/gcc/bfin-rtems4.9/%{gcc_version}/cc1plus%{_exeext}
+
 
-%dir %{gcclib}/bfin-rtems4.9/%{gcc_version}/include
-%{gcclib}/bfin-rtems4.9/%{gcc_version}/include/c++
+%files -n rtems-4.9-bfin-rtems4.9-gcc-libstdc++ -f build/files.g++
+%defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_gcclibdir}
+%dir %{_gcclibdir}/gcc
+%dir %{_gcclibdir}/gcc/bfin-rtems4.9
+%dir %{_gcclibdir}/gcc/bfin-rtems4.9/%{gcc_version}
+%dir %{_gcclibdir}/gcc/bfin-rtems4.9/%{gcc_version}/include
+%{_gcclibdir}/gcc/bfin-rtems4.9/%{gcc_version}/include/c++
 
 
 
@@ -581,7 +792,8 @@
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        24%{?dist}
+Release:        25%{?dist}
+%{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.9-newlib-common
 
@@ -590,7 +802,7 @@
 
 %files -n rtems-4.9-bfin-rtems4.9-newlib -f build/files.newlib
 %defattr(-,root,root)
-%dir %{_prefix}
+%dir %{_exec_prefix}
 %dir %{_exec_prefix}/bfin-rtems4.9
 %{_exec_prefix}/bfin-rtems4.9/include
 
@@ -601,7 +813,8 @@
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        24%{?dist}
+Release:        25%{?dist}
+%{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable
 
 Requires(post): 	/sbin/install-info
@@ -612,6 +825,9 @@
 
 %files -n rtems-4.9-newlib-common
 %defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_prefix}/share
+
 %dir %{_infodir}
 %ghost %{_infodir}/dir
 %{_infodir}/libc.info*

diff -u rtems/contrib/crossrpms/rtems4.9/h8300/rtems-4.9-h8300-rtems4.9-gcc.spec:1.16.2.9 rtems/contrib/crossrpms/rtems4.9/h8300/rtems-4.9-h8300-rtems4.9-gcc.spec:1.16.2.10
--- rtems/contrib/crossrpms/rtems4.9/h8300/rtems-4.9-h8300-rtems4.9-gcc.spec:1.16.2.9	Fri Nov 27 04:31:33 2009
+++ rtems/contrib/crossrpms/rtems4.9/h8300/rtems-4.9-h8300-rtems4.9-gcc.spec	Sun Aug  7 00:23:35 2011
@@ -53,14 +53,12 @@
 %define newlib_pkgvers		1.16.0
 %define newlib_version		1.16.0
 
-%define mpfr_version	2.3.1
-
 Name:         	rtems-4.9-h8300-rtems4.9-gcc
 Summary:      	h8300-rtems4.9 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	24%{?dist}
+Release:      	25%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -69,21 +67,145 @@
 
 BuildRequires:  %{_host_rpmprefix}gcc
 
+# versions of libraries, we conditionally bundle if necessary
+%global mpc_version	0.8.1
+%global mpfr_version	2.4.2
+%global gmp_version	4.3.2
+%global libelf_version  0.8.13
+
+# versions of libraries these distros are known to ship
+%if 0%{?fc16}
+%global mpc_provided 0.8.3
+%global mpfr_provided 3.0.0
+%global gmp_provided 4.3.2
+%endif
+
+%if 0%{?fc15}
+%global mpc_provided 0.8.3
+%global mpfr_provided 3.0.0
+%global gmp_provided 4.3.2
+%endif
+
+%if 0%{?fc14}
+%global mpc_provided 0.8.1
+%global mpfr_provided 2.4.2
+%global gmp_provided 4.3.1
+%endif
+
+%if 0%{?el6}
+%global mpc_provided %{nil}
+%global mpfr_provided 2.4.1
+%global gmp_provided 4.3.1
+%endif
+
+%if 0%{?el5}
+%global mpc_provided %{nil}
+%global mpfr_provided %{nil}
+%global gmp_provided 4.1.4
+%endif
+
+%if 0%{?suse11_3}
+%global mpc_provided 0.8.1
+%global mpfr_provided 2.4.2
+%global gmp_provided 4.3.2
+%endif
+
+%if 0%{?suse11_4}
+%global mpc_provided 0.8.2
+%global mpfr_provided 3.0.0
+%global gmp_provided 5.0.1
+%endif
+
+%if 0%{?cygwin}
+%global mpc_provided 0.8
+%global mpfr_provided 2.4.1
+%global gmp_provided 4.3.1
+%endif
+
+%if 0%{?mingw32}
+%global mpc_provided 0.8.1
+%global mpfr_provided 2.4.1
+%global gmp_provided 4.3.2
+%endif
+
+%if "%{gcc_version}" >= "4.2.0"
+%endif
+
 %if "%{gcc_version}" >= "4.3.0"
-BuildRequires:  gmp-devel >= 4.1
+%define gmp_required		4.1
+%define mpfr_required		2.3.1
+%endif
+
+%if "%{gcc_version}" >= "4.3.3"
+%define cloog_required 		0.15
+%endif
+
+%if "%{gcc_version}" >= "4.4.0"
+%define mpfr_required		2.3.2
+%endif
+
+%if "%{gcc_version}" >= "4.5.0"
+%define mpc_required 		0.8
+%if %{with lto}
+%define libelf_required 	0.8.12
+%endif
+%endif
+
+%if %{defined mpc_required}
+%if "%{mpc_provided}" >= "%{mpc_required}"
+%{?fedora:BuildRequires: libmpc-devel >= %{mpc_required}}
+%{?suse:BuildRequires: mpc-devel >= %{mpc_required}}
 %if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}gmp-devel
-BuildRequires:  %{_host_rpmprefix}mpfr-devel
+BuildRequires:  %{_host_rpmprefix}mpc-devel >= %{mpc_required}
 %endif
-%if 0%{?fedora} >= 8
-BuildRequires:  mpfr-devel >= 2.3.0
+%else
+%define _build_mpc 1
+%define gmp_required 		4.2
+%endif
+%endif
+
+%if %{defined gmp_required}
+%if "%{gmp_provided}" >= "%{gmp_required}"
+BuildRequires: gmp-devel >= %{gmp_required}
+%if "%{_build}" != "%{_host}"
+BuildRequires:  %{_host_rpmprefix}gmp-devel >= %{gmp_required}
+%endif
+%else
+%define _build_gmp 1
+%endif
+%endif
+
+%if %{defined libelf_required}
+%if "%{libelf_provided}" >= "%{libelf_required}"
+BuildRequires: libelf-devel >= %{libelf_required}
+%if "%{_build}" != "%{_host}"
+BuildRequires:  %{_host_rpmprefix}libelf-devel >= %{libelf_required}
+%endif
+%else
+%define _build_libelf 1
+%endif
+%endif
+
+
+%if %{defined cloog_required}
+%{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required}
+%{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required}
+%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required}
+%{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required}
+%{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
+%{?suse11_3:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
+%endif
+
+
+%if %{defined mpfr_required}
+%if "%{mpfr_provided}" >= "%{mpfr_required}"
+BuildRequires: mpfr-devel >= %{mpfr_required}
+%if "%{_build}" != "%{_host}"
+BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
 %endif
-%if "%{?suse}" > "10.3"
-BuildRequires:  mpfr-devel >= 2.3.0
+%else
+%define _build_mpfr 1
 %endif
-# These distros ship an insufficient mpfr
-%{?el4:%define 	_build_mpfr 	1}
-%{?suse10_3:%define 	_build_mpfr 	1}
 %endif
 
 %if "%{_build}" != "%{_host}"
@@ -100,17 +222,19 @@
 
 Requires:	rtems-4.9-gcc-common
 Requires:	rtems-4.9-h8300-rtems4.9-binutils
-Requires:	rtems-4.9-h8300-rtems4.9-newlib = %{newlib_version}-24%{?dist}
+Requires:	rtems-4.9-h8300-rtems4.9-gcc-libgcc = %{gcc_rpmvers}-%{release}
+Requires:	rtems-4.9-h8300-rtems4.9-newlib = %{newlib_version}-25%{?dist}
 
-
-%if "%{gcc_version}" >= "3.4"
-%define gcclib %{_libdir}/gcc
-%define gccexec %{_libexecdir}/gcc
+%if "%{gcc_version}" >= "4.5.0"
+BuildRequires:  zlib-devel
+%if "%{_build}" != "%{_host}"
+BuildRequires:  %{_host_rpmprefix}zlib-devel
+%endif
 %else
-%define gcclib %{_libdir}/gcc-lib
-%define gccexec %{_libdir}/gcc-lib
 %endif
 
+%global _gcclibdir %{_prefix}/lib
+
 %if "%{gcc_version}" == "4.3.2"
 Source0:	ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
 Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20090825.diff
@@ -131,8 +255,20 @@
 %endif
 %{?_without_sources:NoSource:	50}
 
-%if "%{gcc_version}" >= "4.3.0"
-Source60:    http://www.mpfr.org/mpfr-current/mpfr-%{mpfr_version}.tar.bz2
+%if 0%{?_build_mpfr}
+Source60:    http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.bz2
+%endif
+
+%if 0%{?_build_mpc}
+Source61:    http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.gz
+%endif
+
+%if 0%{?_build_gmp}
+Source62:    ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2
+%endif
+
+%if 0%{?_build_libelf}
+Source63:    http://www.mr511.de/software/libelf-%{libelf_version}.tar.gz
 %endif
 
 %description
@@ -142,10 +278,14 @@
 %setup -c -T -n %{name}-%{version}
 
 %setup -q -T -D -n %{name}-%{version} -a0
-%{?PATCH0:%patch0 -p0}
+cd gcc-%{gcc_pkgvers}
+%{?PATCH0:%patch0 -p1}
+cd ..
 
 %setup -q -T -D -n %{name}-%{version} -a1
-%{?PATCH1:%patch1 -p0}
+cd gcc-%{gcc_pkgvers}
+%{?PATCH1:%patch1 -p1}
+cd ..
 
 
 
@@ -157,6 +297,9 @@
 cd ..
   # Copy the C library into gcc's source tree
   ln -s ../newlib-%{newlib_version}/newlib gcc-%{gcc_pkgvers}
+  # Make sure not to be using GPL'ed sources
+  rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/linux
+  rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/rdos
 
 %if 0%{?_build_mpfr}
 %setup -q -T -D -n %{name}-%{version} -a60
@@ -165,7 +308,28 @@
   ln -s ../mpfr-%{mpfr_version} gcc-%{gcc_pkgvers}/mpfr
 %endif
 
-echo "RTEMS gcc-%{gcc_version}-24%{?dist}\/newlib-%{newlib_version}-24%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+%if 0%{?_build_mpc}
+%setup -q -T -D -n %{name}-%{version} -a61
+%{?PATCH61:%patch61 -p1}
+  # Build mpc one-tree style
+  ln -s ../mpc-%{mpc_version} gcc-%{gcc_pkgvers}/mpc
+%endif
+
+%if 0%{?_build_gmp}
+%setup -q -T -D -n %{name}-%{version} -a62
+%{?PATCH62:%patch62 -p1}
+  # Build gmp one-tree style
+  ln -s ../gmp-%{gmp_version} gcc-%{gcc_pkgvers}/gmp
+%endif
+
+%if 0%{?_build_libelf}
+%setup -q -T -D -n %{name}-%{version} -a63
+%{?PATCH63:%patch63 -p1}
+  # Build libelf one-tree style
+  ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
+%endif
+
+echo "RTEMS gcc-%{gcc_version}-25%{?dist}\/newlib-%{newlib_version}-25%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -192,7 +356,7 @@
     --bindir=%{_bindir} \
     --exec_prefix=%{_exec_prefix} \
     --includedir=%{_includedir} \
-    --libdir=%{_libdir} \
+    --libdir=%{_gcclibdir} \
     --libexecdir=%{_libexecdir} \
     --mandir=%{_mandir} \
     --infodir=%{_infodir} \
@@ -208,7 +372,7 @@
     --enable-version-specific-runtime-libs \
     --enable-threads \
     --enable-newlib-io-c99-formats \
-    --enable-languages="$languages" $optargs
+    --enable-languages="$languages"
 
 %if "%_host" != "%_build"
   # Bug in gcc-3.2.1:
@@ -238,12 +402,19 @@
 # Misplaced header file
   if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then
     mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \
-      $RPM_BUILD_ROOT%{gcclib}/h8300-rtems4.9/%{gcc_version}/include/
+      $RPM_BUILD_ROOT%{_gcclibdir}/gcc/h8300-rtems4.9/%{gcc_version}/include/
   fi
 %endif
 
   # host library
+%if "%{gcc_version}" >= "4.2.0"
+  # libiberty doesn't honor --libdir, but always installs to a 
+  # magically guessed _libdir
   rm -f  ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a
+%else
+  # libiberty installs to --libdir=...
+  rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a
+%endif
 
   # We use the version from binutils
   rm -f $RPM_BUILD_ROOT%{_bindir}/h8300-rtems4.9-c++filt%{_exeext}
@@ -253,18 +424,16 @@
   rm -f $RPM_BUILD_ROOT%{_infodir}/dir
   touch $RPM_BUILD_ROOT%{_infodir}/dir
 
+  # We don't want libffi's man-pages
+  rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*ffi*
 
-%if "%{gcc_version}" >= "3.4"
   # Bug in gcc-3.4.0pre
   rm -f $RPM_BUILD_ROOT%{_bindir}/h8300-rtems4.9-h8300-rtems4.9-gcjh%{_exeext}
-%endif
 
-%if "%{gcc_version}" >= "3.3"
   # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs
   # the fixinclude-install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{gcclib}/h8300-rtems4.9/%{gcc_version}/install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{gccexec}/h8300-rtems4.9/%{gcc_version}/install-tools
-%endif
+  rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/h8300-rtems4.9/%{gcc_version}/install-tools
+  rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/h8300-rtems4.9/%{gcc_version}/install-tools
 
   # Bug in gcc > 4.1.0: Installs an unused, empty directory
   if test -d ${RPM_BUILD_ROOT}%{_prefix}/h8300-rtems4.9/include/bits; then
@@ -272,11 +441,11 @@
   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.9/lib"
-  for i in $f; do
+  for i in $multilibs; do
     case $i in
     \.) echo "%dir ${TGTDIR}" >> build/files.newlib
       ;;
@@ -287,19 +456,10 @@
 
   rm -f dirs ;
   echo "%defattr(-,root,root,-)" >> dirs
-  echo "%dir %{_prefix}" >> dirs
-  echo "%dir %{_libdir}" >> dirs
-%if "%{gcc_version}" >= "3.4"
-  echo "%dir %{_libexecdir}" >> dirs
-%endif
-  echo "%dir %{gcclib}" >> dirs
-  echo "%dir %{gcclib}/h8300-rtems4.9" >> dirs
-
-  TGTDIR="%{gcclib}/h8300-rtems4.9/%{gcc_version}"
-  for i in $f; do
+  TGTDIR="%{_gcclibdir}/gcc/h8300-rtems4.9/%{gcc_version}"
+  for i in $multilibs; do
     case $i in
-    \.) echo "%dir ${TGTDIR}" >> dirs
-      ;;
+    \.) ;; # ignore, handled elsewhere
     *)  echo "%dir ${TGTDIR}/$i" >> dirs
       ;;
     esac
@@ -312,7 +472,7 @@
   cp dirs build/files.gcj
   cp dirs build/files.g++
 
-  TGTDIR="%{gcclib}/h8300-rtems4.9/%{gcc_version}"
+  TGTDIR="%{_gcclibdir}/gcc/h8300-rtems4.9/%{gcc_version}"
   f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
   for i in $f; do
     case $i in
@@ -327,6 +487,8 @@
     *include/objc*) ;;
     *include/g++*);;
     *include/c++*);;
+    *include-fixed/*);;
+    *finclude/*);;
     *adainclude*);;
     *adalib*);;
     *gnat1);;
@@ -381,7 +543,7 @@
 cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
 #!/bin/sh
 grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/h8300-rtems4.9/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/h8300-rtems4.9/' | %__find_provides
+  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/h8300-rtems4.9/'} | %__find_provides
 EOF
 chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
 %define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
@@ -389,7 +551,7 @@
 cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
 #!/bin/sh
 grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/h8300-rtems4.9/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/h8300-rtems4.9/' | %__find_requires
+  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/h8300-rtems4.9/'} | %__find_requires
 EOF
 chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
 %define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
@@ -429,7 +591,7 @@
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.9-h8300-rtems4.9-binutils
-# Requires:       rtems-4.9-h8300-rtems4.9-newlib = %{newlib_version}-24%{?dist}
+# Requires:       rtems-4.9-h8300-rtems4.9-newlib = %{newlib_version}-25%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -439,44 +601,72 @@
 %description -n rtems-4.9-h8300-rtems4.9-gcc
 GNU cc compiler for h8300-rtems4.9.
 
-%files -n rtems-4.9-h8300-rtems4.9-gcc -f build/files.gcc
+# ==============================================================
+# rtems-4.9-h8300-rtems4.9-gcc-libgcc
+# ==============================================================
+%package -n rtems-4.9-h8300-rtems4.9-gcc-libgcc
+Summary:        libgcc for h8300-rtems4.9-gcc
+Group:          Development/Tools
+Version:        %{gcc_rpmvers}
+%{?_with_noarch_subpackages:BuildArch: noarch}
+Requires:       rtems-4.9-h8300-rtems4.9-newlib = %{newlib_version}-25%{?dist}
+License:	GPL
+
+%description -n rtems-4.9-h8300-rtems4.9-gcc-libgcc
+libgcc h8300-rtems4.9-gcc.
+
+
+%files -n rtems-4.9-h8300-rtems4.9-gcc
 %defattr(-,root,root)
+%dir %{_prefix}
+
 %dir %{_mandir}
 %dir %{_mandir}/man1
 %{_mandir}/man1/h8300-rtems4.9-gcc.1*
-%if "%{gcc_version}" >= "3.4"
 %{_mandir}/man1/h8300-rtems4.9-cpp.1*
 %{_mandir}/man1/h8300-rtems4.9-gcov.1*
-%endif
 
 %dir %{_bindir}
 %{_bindir}/h8300-rtems4.9-cpp%{_exeext}
 %{_bindir}/h8300-rtems4.9-gcc%{_exeext}
-%if "%{gcc_version}" >= "3.3"
 %{_bindir}/h8300-rtems4.9-gcc-%{gcc_version}%{_exeext}
-%endif
 %{_bindir}/h8300-rtems4.9-gcov%{_exeext}
+%if "%{gcc_version}" < "4.6.0"
 %{_bindir}/h8300-rtems4.9-gccbug
+%endif
+
+%dir %{_libexecdir}
+%dir %{_libexecdir}/gcc
+%dir %{_libexecdir}/gcc/h8300-rtems4.9
+%dir %{_libexecdir}/gcc/h8300-rtems4.9/%{gcc_version}
+%{_libexecdir}/gcc/h8300-rtems4.9/%{gcc_version}/cc1%{_exeext}
+%{_libexecdir}/gcc/h8300-rtems4.9/%{gcc_version}/collect2%{_exeext}
+%if "%{gcc_version}" >= "4.5.0"
+%{?with_lto:%{_libexecdir}/gcc/h8300-rtems4.9/%{gcc_version}/lto%{_exeext}}
+%{_libexecdir}/gcc/h8300-rtems4.9/%{gcc_version}/lto-wrapper%{_exeext}
+%endif
+
+%files -n rtems-4.9-h8300-rtems4.9-gcc-libgcc -f build/files.gcc
+%defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_gcclibdir}
+%dir %{_gcclibdir}/gcc
+%dir %{_gcclibdir}/gcc/h8300-rtems4.9
+%dir %{_gcclibdir}/gcc/h8300-rtems4.9/%{gcc_version}
+%dir %{_gcclibdir}/gcc/h8300-rtems4.9/%{gcc_version}/include
 
-%dir %{gcclib}/h8300-rtems4.9/%{gcc_version}/include
 %if "%{gcc_version}" > "4.0.3"
 %if "h8300-rtems4.9" != "bfin-rtems4.9"
 %if "h8300-rtems4.9" != "avr-rtems4.9"
-%dir %{gcclib}/h8300-rtems4.9/%{gcc_version}/include/ssp
+%dir %{_gcclibdir}/gcc/h8300-rtems4.9/%{gcc_version}/include/ssp
 %endif
 %endif
 %endif
 
 %if "%{gcc_version}" >= "4.3.0"
-%dir %{gcclib}/h8300-rtems4.9/%{gcc_version}/include-fixed
+%{_gcclibdir}/gcc/h8300-rtems4.9/%{gcc_version}/include-fixed
 %endif
 
-%dir %{gccexec}
-%dir %{gccexec}/h8300-rtems4.9
-%dir %{gccexec}/h8300-rtems4.9/%{gcc_version}
-%{gccexec}/h8300-rtems4.9/%{gcc_version}/cc1%{_exeext}
-%{gccexec}/h8300-rtems4.9/%{gcc_version}/collect2%{_exeext}
-
 # ==============================================================
 # rtems-4.9-gcc-common
 # ==============================================================
@@ -484,6 +674,7 @@
 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
@@ -494,22 +685,21 @@
 
 %files -n rtems-4.9-gcc-common
 %defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_prefix}/share
+
 %dir %{_infodir}
 %ghost %{_infodir}/dir
 %{_infodir}/cpp.info*
 %{_infodir}/cppinternals.info*
 %{_infodir}/gcc.info*
 %{_infodir}/gccint.info*
-%if "%{gcc_version}" >= "3.4"
 %{_infodir}/gccinstall.info*
+%if "%{gcc_version}" >= "4.6.0"
+%{_infodir}/libquadmath.info*
 %endif
 
 %dir %{_mandir}
-%if "%{gcc_version}" < "3.4"
-%dir %{_mandir}/man1
-%{_mandir}/man1/cpp.1*
-%{_mandir}/man1/gcov.1*
-%endif
 %dir %{_mandir}/man7
 %{_mandir}/man7/fsf-funding.7*
 %{_mandir}/man7/gfdl.7*
@@ -520,9 +710,7 @@
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
-%if "%{gcc_version}" >= "3.4"
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
-%endif
 
 %preun -n rtems-4.9-gcc-common
 if [ $1 -eq 0 ]; then
@@ -530,9 +718,7 @@
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || :
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
-%if "%{gcc_version}" >= "3.4"
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
-%endif
 fi
 
 # ==============================================================
@@ -543,12 +729,11 @@
 Group:		Development/Tools
 Version:        %{gcc_rpmvers}
 License:	GPL
+Requires:       rtems-4.9-h8300-rtems4.9-gcc-libstdc++ = %{gcc_rpmvers}-%{release}
 
 %if "%{_build}" != "%{_host}"
 BuildRequires:  rtems-4.9-h8300-rtems4.9-gcc-c++ = %{gcc_rpmvers}
 %endif
-Provides:	rtems-4.9-h8300-rtems4.9-c++ = %{gcc_rpmvers}-%{release}
-Obsoletes:	rtems-4.9-h8300-rtems4.9-c++ < %{gcc_rpmvers}-%{release}
 
 Requires:       rtems-4.9-gcc-common
 Requires:       rtems-4.9-h8300-rtems4.9-gcc = %{gcc_rpmvers}-%{release}
@@ -556,20 +741,46 @@
 %description -n rtems-4.9-h8300-rtems4.9-gcc-c++
 GCC c++ compiler for h8300-rtems4.9.
 
-%files -n rtems-4.9-h8300-rtems4.9-gcc-c++ -f build/files.g++
+
+%package -n rtems-4.9-h8300-rtems4.9-gcc-libstdc++
+Summary:	libstdc++ for h8300-rtems4.9
+Group:		Development/Tools
+Version:        %{gcc_rpmvers}
+%{?_with_noarch_subpackages:BuildArch: noarch}
+License:	GPL
+
+%description -n rtems-4.9-h8300-rtems4.9-gcc-libstdc++
+%{summary}
+
+
+%files -n rtems-4.9-h8300-rtems4.9-gcc-c++
 %defattr(-,root,root)
+%dir %{_prefix}
+
+%dir %{_mandir}
+%dir %{_mandir}/man1
 %{_mandir}/man1/h8300-rtems4.9-g++.1*
 
+%dir %{_bindir}
 %{_bindir}/h8300-rtems4.9-c++%{_exeext}
 %{_bindir}/h8300-rtems4.9-g++%{_exeext}
 
-%dir %{gccexec}
-%dir %{gccexec}/h8300-rtems4.9
-%dir %{gccexec}/h8300-rtems4.9/%{gcc_version}
-%{gccexec}/h8300-rtems4.9/%{gcc_version}/cc1plus%{_exeext}
+%dir %{_libexecdir}
+%dir %{_libexecdir}/gcc
+%dir %{_libexecdir}/gcc/h8300-rtems4.9
+%dir %{_libexecdir}/gcc/h8300-rtems4.9/%{gcc_version}
+%{_libexecdir}/gcc/h8300-rtems4.9/%{gcc_version}/cc1plus%{_exeext}
+
 
-%dir %{gcclib}/h8300-rtems4.9/%{gcc_version}/include
-%{gcclib}/h8300-rtems4.9/%{gcc_version}/include/c++
+%files -n rtems-4.9-h8300-rtems4.9-gcc-libstdc++ -f build/files.g++
+%defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_gcclibdir}
+%dir %{_gcclibdir}/gcc
+%dir %{_gcclibdir}/gcc/h8300-rtems4.9
+%dir %{_gcclibdir}/gcc/h8300-rtems4.9/%{gcc_version}
+%dir %{_gcclibdir}/gcc/h8300-rtems4.9/%{gcc_version}/include
+%{_gcclibdir}/gcc/h8300-rtems4.9/%{gcc_version}/include/c++
 
 
 
@@ -581,7 +792,8 @@
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        24%{?dist}
+Release:        25%{?dist}
+%{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.9-newlib-common
 
@@ -590,7 +802,7 @@
 
 %files -n rtems-4.9-h8300-rtems4.9-newlib -f build/files.newlib
 %defattr(-,root,root)
-%dir %{_prefix}
+%dir %{_exec_prefix}
 %dir %{_exec_prefix}/h8300-rtems4.9
 %{_exec_prefix}/h8300-rtems4.9/include
 
@@ -601,7 +813,8 @@
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        24%{?dist}
+Release:        25%{?dist}
+%{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable
 
 Requires(post): 	/sbin/install-info
@@ -612,6 +825,9 @@
 
 %files -n rtems-4.9-newlib-common
 %defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_prefix}/share
+
 %dir %{_infodir}
 %ghost %{_infodir}/dir
 %{_infodir}/libc.info*

diff -u rtems/contrib/crossrpms/rtems4.9/i386/rtems-4.9-i386-rtems4.9-gcc.spec:1.19.2.9 rtems/contrib/crossrpms/rtems4.9/i386/rtems-4.9-i386-rtems4.9-gcc.spec:1.19.2.10
--- rtems/contrib/crossrpms/rtems4.9/i386/rtems-4.9-i386-rtems4.9-gcc.spec:1.19.2.9	Fri Nov 27 04:31:33 2009
+++ rtems/contrib/crossrpms/rtems4.9/i386/rtems-4.9-i386-rtems4.9-gcc.spec	Sun Aug  7 00:23:35 2011
@@ -53,14 +53,12 @@
 %define newlib_pkgvers		1.16.0
 %define newlib_version		1.16.0
 
-%define mpfr_version	2.3.1
-
 Name:         	rtems-4.9-i386-rtems4.9-gcc
 Summary:      	i386-rtems4.9 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	24%{?dist}
+Release:      	25%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -69,21 +67,145 @@
 
 BuildRequires:  %{_host_rpmprefix}gcc
 
+# versions of libraries, we conditionally bundle if necessary
+%global mpc_version	0.8.1
+%global mpfr_version	2.4.2
+%global gmp_version	4.3.2
+%global libelf_version  0.8.13
+
+# versions of libraries these distros are known to ship
+%if 0%{?fc16}
+%global mpc_provided 0.8.3
+%global mpfr_provided 3.0.0
+%global gmp_provided 4.3.2
+%endif
+
+%if 0%{?fc15}
+%global mpc_provided 0.8.3
+%global mpfr_provided 3.0.0
+%global gmp_provided 4.3.2
+%endif
+
+%if 0%{?fc14}
+%global mpc_provided 0.8.1
+%global mpfr_provided 2.4.2
+%global gmp_provided 4.3.1
+%endif
+
+%if 0%{?el6}
+%global mpc_provided %{nil}
+%global mpfr_provided 2.4.1
+%global gmp_provided 4.3.1
+%endif
+
+%if 0%{?el5}
+%global mpc_provided %{nil}
+%global mpfr_provided %{nil}
+%global gmp_provided 4.1.4
+%endif
+
+%if 0%{?suse11_3}
+%global mpc_provided 0.8.1
+%global mpfr_provided 2.4.2
+%global gmp_provided 4.3.2
+%endif
+
+%if 0%{?suse11_4}
+%global mpc_provided 0.8.2
+%global mpfr_provided 3.0.0
+%global gmp_provided 5.0.1
+%endif
+
+%if 0%{?cygwin}
+%global mpc_provided 0.8
+%global mpfr_provided 2.4.1
+%global gmp_provided 4.3.1
+%endif
+
+%if 0%{?mingw32}
+%global mpc_provided 0.8.1
+%global mpfr_provided 2.4.1
+%global gmp_provided 4.3.2
+%endif
+
+%if "%{gcc_version}" >= "4.2.0"
+%endif
+
 %if "%{gcc_version}" >= "4.3.0"
-BuildRequires:  gmp-devel >= 4.1
+%define gmp_required		4.1
+%define mpfr_required		2.3.1
+%endif
+
+%if "%{gcc_version}" >= "4.3.3"
+%define cloog_required 		0.15
+%endif
+
+%if "%{gcc_version}" >= "4.4.0"
+%define mpfr_required		2.3.2
+%endif
+
+%if "%{gcc_version}" >= "4.5.0"
+%define mpc_required 		0.8
+%if %{with lto}
+%define libelf_required 	0.8.12
+%endif
+%endif
+
+%if %{defined mpc_required}
+%if "%{mpc_provided}" >= "%{mpc_required}"
+%{?fedora:BuildRequires: libmpc-devel >= %{mpc_required}}
+%{?suse:BuildRequires: mpc-devel >= %{mpc_required}}
 %if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}gmp-devel
-BuildRequires:  %{_host_rpmprefix}mpfr-devel
+BuildRequires:  %{_host_rpmprefix}mpc-devel >= %{mpc_required}
 %endif
-%if 0%{?fedora} >= 8
-BuildRequires:  mpfr-devel >= 2.3.0
+%else
+%define _build_mpc 1
+%define gmp_required 		4.2
+%endif
+%endif
+
+%if %{defined gmp_required}
+%if "%{gmp_provided}" >= "%{gmp_required}"
+BuildRequires: gmp-devel >= %{gmp_required}
+%if "%{_build}" != "%{_host}"
+BuildRequires:  %{_host_rpmprefix}gmp-devel >= %{gmp_required}
+%endif
+%else
+%define _build_gmp 1
+%endif
+%endif
+
+%if %{defined libelf_required}
+%if "%{libelf_provided}" >= "%{libelf_required}"
+BuildRequires: libelf-devel >= %{libelf_required}
+%if "%{_build}" != "%{_host}"
+BuildRequires:  %{_host_rpmprefix}libelf-devel >= %{libelf_required}
+%endif
+%else
+%define _build_libelf 1
+%endif
+%endif
+
+
+%if %{defined cloog_required}
+%{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required}
+%{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required}
+%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required}
+%{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required}
+%{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
+%{?suse11_3:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
+%endif
+
+
+%if %{defined mpfr_required}
+%if "%{mpfr_provided}" >= "%{mpfr_required}"
+BuildRequires: mpfr-devel >= %{mpfr_required}
+%if "%{_build}" != "%{_host}"
+BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
 %endif
-%if "%{?suse}" > "10.3"
-BuildRequires:  mpfr-devel >= 2.3.0
+%else
+%define _build_mpfr 1
 %endif
-# These distros ship an insufficient mpfr
-%{?el4:%define 	_build_mpfr 	1}
-%{?suse10_3:%define 	_build_mpfr 	1}
 %endif
 
 %if "%{_build}" != "%{_host}"
@@ -100,17 +222,19 @@
 
 Requires:	rtems-4.9-gcc-common
 Requires:	rtems-4.9-i386-rtems4.9-binutils
-Requires:	rtems-4.9-i386-rtems4.9-newlib = %{newlib_version}-24%{?dist}
+Requires:	rtems-4.9-i386-rtems4.9-gcc-libgcc = %{gcc_rpmvers}-%{release}
+Requires:	rtems-4.9-i386-rtems4.9-newlib = %{newlib_version}-25%{?dist}
 
-
-%if "%{gcc_version}" >= "3.4"
-%define gcclib %{_libdir}/gcc
-%define gccexec %{_libexecdir}/gcc
+%if "%{gcc_version}" >= "4.5.0"
+BuildRequires:  zlib-devel
+%if "%{_build}" != "%{_host}"
+BuildRequires:  %{_host_rpmprefix}zlib-devel
+%endif
 %else
-%define gcclib %{_libdir}/gcc-lib
-%define gccexec %{_libdir}/gcc-lib
 %endif
 
+%global _gcclibdir %{_prefix}/lib
+
 %if "%{gcc_version}" == "4.3.2"
 Source0:	ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
 Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20090825.diff
@@ -131,8 +255,20 @@
 %endif
 %{?_without_sources:NoSource:	50}
 
-%if "%{gcc_version}" >= "4.3.0"
-Source60:    http://www.mpfr.org/mpfr-current/mpfr-%{mpfr_version}.tar.bz2
+%if 0%{?_build_mpfr}
+Source60:    http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.bz2
+%endif
+
+%if 0%{?_build_mpc}
+Source61:    http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.gz
+%endif
+
+%if 0%{?_build_gmp}
+Source62:    ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2
+%endif
+
+%if 0%{?_build_libelf}
+Source63:    http://www.mr511.de/software/libelf-%{libelf_version}.tar.gz
 %endif
 
 %description
@@ -142,10 +278,14 @@
 %setup -c -T -n %{name}-%{version}
 
 %setup -q -T -D -n %{name}-%{version} -a0
-%{?PATCH0:%patch0 -p0}
+cd gcc-%{gcc_pkgvers}
+%{?PATCH0:%patch0 -p1}
+cd ..
 
 %setup -q -T -D -n %{name}-%{version} -a1
-%{?PATCH1:%patch1 -p0}
+cd gcc-%{gcc_pkgvers}
+%{?PATCH1:%patch1 -p1}
+cd ..
 
 
 
@@ -157,6 +297,9 @@
 cd ..
   # Copy the C library into gcc's source tree
   ln -s ../newlib-%{newlib_version}/newlib gcc-%{gcc_pkgvers}
+  # Make sure not to be using GPL'ed sources
+  rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/linux
+  rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/rdos
 
 %if 0%{?_build_mpfr}
 %setup -q -T -D -n %{name}-%{version} -a60
@@ -165,7 +308,28 @@
   ln -s ../mpfr-%{mpfr_version} gcc-%{gcc_pkgvers}/mpfr
 %endif
 
-echo "RTEMS gcc-%{gcc_version}-24%{?dist}\/newlib-%{newlib_version}-24%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+%if 0%{?_build_mpc}
+%setup -q -T -D -n %{name}-%{version} -a61
+%{?PATCH61:%patch61 -p1}
+  # Build mpc one-tree style
+  ln -s ../mpc-%{mpc_version} gcc-%{gcc_pkgvers}/mpc
+%endif
+
+%if 0%{?_build_gmp}
+%setup -q -T -D -n %{name}-%{version} -a62
+%{?PATCH62:%patch62 -p1}
+  # Build gmp one-tree style
+  ln -s ../gmp-%{gmp_version} gcc-%{gcc_pkgvers}/gmp
+%endif
+
+%if 0%{?_build_libelf}
+%setup -q -T -D -n %{name}-%{version} -a63
+%{?PATCH63:%patch63 -p1}
+  # Build libelf one-tree style
+  ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
+%endif
+
+echo "RTEMS gcc-%{gcc_version}-25%{?dist}\/newlib-%{newlib_version}-25%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -192,7 +356,7 @@
     --bindir=%{_bindir} \
     --exec_prefix=%{_exec_prefix} \
     --includedir=%{_includedir} \
-    --libdir=%{_libdir} \
+    --libdir=%{_gcclibdir} \
     --libexecdir=%{_libexecdir} \
     --mandir=%{_mandir} \
     --infodir=%{_infodir} \
@@ -208,7 +372,7 @@
     --enable-version-specific-runtime-libs \
     --enable-threads \
     --enable-newlib-io-c99-formats \
-    --enable-languages="$languages" $optargs
+    --enable-languages="$languages"
 
 %if "%_host" != "%_build"
   # Bug in gcc-3.2.1:
@@ -238,12 +402,19 @@
 # Misplaced header file
   if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then
     mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \
-      $RPM_BUILD_ROOT%{gcclib}/i386-rtems4.9/%{gcc_version}/include/
+      $RPM_BUILD_ROOT%{_gcclibdir}/gcc/i386-rtems4.9/%{gcc_version}/include/
   fi
 %endif
 
   # host library
+%if "%{gcc_version}" >= "4.2.0"
+  # libiberty doesn't honor --libdir, but always installs to a 
+  # magically guessed _libdir
   rm -f  ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a
+%else
+  # libiberty installs to --libdir=...
+  rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a
+%endif
 
   # We use the version from binutils
   rm -f $RPM_BUILD_ROOT%{_bindir}/i386-rtems4.9-c++filt%{_exeext}
@@ -253,18 +424,16 @@
   rm -f $RPM_BUILD_ROOT%{_infodir}/dir
   touch $RPM_BUILD_ROOT%{_infodir}/dir
 
+  # We don't want libffi's man-pages
+  rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*ffi*
 
-%if "%{gcc_version}" >= "3.4"
   # Bug in gcc-3.4.0pre
   rm -f $RPM_BUILD_ROOT%{_bindir}/i386-rtems4.9-i386-rtems4.9-gcjh%{_exeext}
-%endif
 
-%if "%{gcc_version}" >= "3.3"
   # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs
   # the fixinclude-install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{gcclib}/i386-rtems4.9/%{gcc_version}/install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{gccexec}/i386-rtems4.9/%{gcc_version}/install-tools
-%endif
+  rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i386-rtems4.9/%{gcc_version}/install-tools
+  rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/i386-rtems4.9/%{gcc_version}/install-tools
 
   # Bug in gcc > 4.1.0: Installs an unused, empty directory
   if test -d ${RPM_BUILD_ROOT}%{_prefix}/i386-rtems4.9/include/bits; then
@@ -272,11 +441,11 @@
   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.9/lib"
-  for i in $f; do
+  for i in $multilibs; do
     case $i in
     \.) echo "%dir ${TGTDIR}" >> build/files.newlib
       ;;
@@ -287,19 +456,10 @@
 
   rm -f dirs ;
   echo "%defattr(-,root,root,-)" >> dirs
-  echo "%dir %{_prefix}" >> dirs
-  echo "%dir %{_libdir}" >> dirs
-%if "%{gcc_version}" >= "3.4"
-  echo "%dir %{_libexecdir}" >> dirs
-%endif
-  echo "%dir %{gcclib}" >> dirs
-  echo "%dir %{gcclib}/i386-rtems4.9" >> dirs
-
-  TGTDIR="%{gcclib}/i386-rtems4.9/%{gcc_version}"
-  for i in $f; do
+  TGTDIR="%{_gcclibdir}/gcc/i386-rtems4.9/%{gcc_version}"
+  for i in $multilibs; do
     case $i in
-    \.) echo "%dir ${TGTDIR}" >> dirs
-      ;;
+    \.) ;; # ignore, handled elsewhere
     *)  echo "%dir ${TGTDIR}/$i" >> dirs
       ;;
     esac
@@ -312,7 +472,7 @@
   cp dirs build/files.gcj
   cp dirs build/files.g++
 
-  TGTDIR="%{gcclib}/i386-rtems4.9/%{gcc_version}"
+  TGTDIR="%{_gcclibdir}/gcc/i386-rtems4.9/%{gcc_version}"
   f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
   for i in $f; do
     case $i in
@@ -327,6 +487,8 @@
     *include/objc*) ;;
     *include/g++*);;
     *include/c++*);;
+    *include-fixed/*);;
+    *finclude/*);;
     *adainclude*);;
     *adalib*);;
     *gnat1);;
@@ -381,7 +543,7 @@
 cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
 #!/bin/sh
 grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i386-rtems4.9/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/i386-rtems4.9/' | %__find_provides
+  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i386-rtems4.9/'} | %__find_provides
 EOF
 chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
 %define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
@@ -389,7 +551,7 @@
 cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
 #!/bin/sh
 grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i386-rtems4.9/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/i386-rtems4.9/' | %__find_requires
+  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i386-rtems4.9/'} | %__find_requires
 EOF
 chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
 %define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
@@ -429,7 +591,7 @@
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.9-i386-rtems4.9-binutils
-# Requires:       rtems-4.9-i386-rtems4.9-newlib = %{newlib_version}-24%{?dist}
+# Requires:       rtems-4.9-i386-rtems4.9-newlib = %{newlib_version}-25%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -439,44 +601,72 @@
 %description -n rtems-4.9-i386-rtems4.9-gcc
 GNU cc compiler for i386-rtems4.9.
 
-%files -n rtems-4.9-i386-rtems4.9-gcc -f build/files.gcc
+# ==============================================================
+# rtems-4.9-i386-rtems4.9-gcc-libgcc
+# ==============================================================
+%package -n rtems-4.9-i386-rtems4.9-gcc-libgcc
+Summary:        libgcc for i386-rtems4.9-gcc
+Group:          Development/Tools
+Version:        %{gcc_rpmvers}
+%{?_with_noarch_subpackages:BuildArch: noarch}
+Requires:       rtems-4.9-i386-rtems4.9-newlib = %{newlib_version}-25%{?dist}
+License:	GPL
+
+%description -n rtems-4.9-i386-rtems4.9-gcc-libgcc
+libgcc i386-rtems4.9-gcc.
+
+
+%files -n rtems-4.9-i386-rtems4.9-gcc
 %defattr(-,root,root)
+%dir %{_prefix}
+
 %dir %{_mandir}
 %dir %{_mandir}/man1
 %{_mandir}/man1/i386-rtems4.9-gcc.1*
-%if "%{gcc_version}" >= "3.4"
 %{_mandir}/man1/i386-rtems4.9-cpp.1*
 %{_mandir}/man1/i386-rtems4.9-gcov.1*
-%endif
 
 %dir %{_bindir}
 %{_bindir}/i386-rtems4.9-cpp%{_exeext}
 %{_bindir}/i386-rtems4.9-gcc%{_exeext}
-%if "%{gcc_version}" >= "3.3"
 %{_bindir}/i386-rtems4.9-gcc-%{gcc_version}%{_exeext}
-%endif
 %{_bindir}/i386-rtems4.9-gcov%{_exeext}
+%if "%{gcc_version}" < "4.6.0"
 %{_bindir}/i386-rtems4.9-gccbug
+%endif
+
+%dir %{_libexecdir}
+%dir %{_libexecdir}/gcc
+%dir %{_libexecdir}/gcc/i386-rtems4.9
+%dir %{_libexecdir}/gcc/i386-rtems4.9/%{gcc_version}
+%{_libexecdir}/gcc/i386-rtems4.9/%{gcc_version}/cc1%{_exeext}
+%{_libexecdir}/gcc/i386-rtems4.9/%{gcc_version}/collect2%{_exeext}
+%if "%{gcc_version}" >= "4.5.0"
+%{?with_lto:%{_libexecdir}/gcc/i386-rtems4.9/%{gcc_version}/lto%{_exeext}}
+%{_libexecdir}/gcc/i386-rtems4.9/%{gcc_version}/lto-wrapper%{_exeext}
+%endif
+
+%files -n rtems-4.9-i386-rtems4.9-gcc-libgcc -f build/files.gcc
+%defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_gcclibdir}
+%dir %{_gcclibdir}/gcc
+%dir %{_gcclibdir}/gcc/i386-rtems4.9
+%dir %{_gcclibdir}/gcc/i386-rtems4.9/%{gcc_version}
+%dir %{_gcclibdir}/gcc/i386-rtems4.9/%{gcc_version}/include
 
-%dir %{gcclib}/i386-rtems4.9/%{gcc_version}/include
 %if "%{gcc_version}" > "4.0.3"
 %if "i386-rtems4.9" != "bfin-rtems4.9"
 %if "i386-rtems4.9" != "avr-rtems4.9"
-%dir %{gcclib}/i386-rtems4.9/%{gcc_version}/include/ssp
+%dir %{_gcclibdir}/gcc/i386-rtems4.9/%{gcc_version}/include/ssp
 %endif
 %endif
 %endif
 
 %if "%{gcc_version}" >= "4.3.0"
-%dir %{gcclib}/i386-rtems4.9/%{gcc_version}/include-fixed
+%{_gcclibdir}/gcc/i386-rtems4.9/%{gcc_version}/include-fixed
 %endif
 
-%dir %{gccexec}
-%dir %{gccexec}/i386-rtems4.9
-%dir %{gccexec}/i386-rtems4.9/%{gcc_version}
-%{gccexec}/i386-rtems4.9/%{gcc_version}/cc1%{_exeext}
-%{gccexec}/i386-rtems4.9/%{gcc_version}/collect2%{_exeext}
-
 # ==============================================================
 # rtems-4.9-gcc-common
 # ==============================================================
@@ -484,6 +674,7 @@
 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
@@ -494,22 +685,21 @@
 
 %files -n rtems-4.9-gcc-common
 %defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_prefix}/share
+
 %dir %{_infodir}
 %ghost %{_infodir}/dir
 %{_infodir}/cpp.info*
 %{_infodir}/cppinternals.info*
 %{_infodir}/gcc.info*
 %{_infodir}/gccint.info*
-%if "%{gcc_version}" >= "3.4"
 %{_infodir}/gccinstall.info*
+%if "%{gcc_version}" >= "4.6.0"
+%{_infodir}/libquadmath.info*
 %endif
 
 %dir %{_mandir}
-%if "%{gcc_version}" < "3.4"
-%dir %{_mandir}/man1
-%{_mandir}/man1/cpp.1*
-%{_mandir}/man1/gcov.1*
-%endif
 %dir %{_mandir}/man7
 %{_mandir}/man7/fsf-funding.7*
 %{_mandir}/man7/gfdl.7*
@@ -520,9 +710,7 @@
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
-%if "%{gcc_version}" >= "3.4"
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
-%endif
 
 %preun -n rtems-4.9-gcc-common
 if [ $1 -eq 0 ]; then
@@ -530,9 +718,7 @@
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || :
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
-%if "%{gcc_version}" >= "3.4"
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
-%endif
 fi
 
 # ==============================================================
@@ -543,12 +729,11 @@
 Group:		Development/Tools
 Version:        %{gcc_rpmvers}
 License:	GPL
+Requires:       rtems-4.9-i386-rtems4.9-gcc-libstdc++ = %{gcc_rpmvers}-%{release}
 
 %if "%{_build}" != "%{_host}"
 BuildRequires:  rtems-4.9-i386-rtems4.9-gcc-c++ = %{gcc_rpmvers}
 %endif
-Provides:	rtems-4.9-i386-rtems4.9-c++ = %{gcc_rpmvers}-%{release}
-Obsoletes:	rtems-4.9-i386-rtems4.9-c++ < %{gcc_rpmvers}-%{release}
 
 Requires:       rtems-4.9-gcc-common
 Requires:       rtems-4.9-i386-rtems4.9-gcc = %{gcc_rpmvers}-%{release}
@@ -556,20 +741,46 @@
 %description -n rtems-4.9-i386-rtems4.9-gcc-c++
 GCC c++ compiler for i386-rtems4.9.
 
-%files -n rtems-4.9-i386-rtems4.9-gcc-c++ -f build/files.g++
+
+%package -n rtems-4.9-i386-rtems4.9-gcc-libstdc++
+Summary:	libstdc++ for i386-rtems4.9
+Group:		Development/Tools
+Version:        %{gcc_rpmvers}
+%{?_with_noarch_subpackages:BuildArch: noarch}
+License:	GPL
+
+%description -n rtems-4.9-i386-rtems4.9-gcc-libstdc++
+%{summary}
+
+
+%files -n rtems-4.9-i386-rtems4.9-gcc-c++
 %defattr(-,root,root)
+%dir %{_prefix}
+
+%dir %{_mandir}
+%dir %{_mandir}/man1
 %{_mandir}/man1/i386-rtems4.9-g++.1*
 
+%dir %{_bindir}
 %{_bindir}/i386-rtems4.9-c++%{_exeext}
 %{_bindir}/i386-rtems4.9-g++%{_exeext}
 
-%dir %{gccexec}
-%dir %{gccexec}/i386-rtems4.9
-%dir %{gccexec}/i386-rtems4.9/%{gcc_version}
-%{gccexec}/i386-rtems4.9/%{gcc_version}/cc1plus%{_exeext}
+%dir %{_libexecdir}
+%dir %{_libexecdir}/gcc
+%dir %{_libexecdir}/gcc/i386-rtems4.9
+%dir %{_libexecdir}/gcc/i386-rtems4.9/%{gcc_version}
+%{_libexecdir}/gcc/i386-rtems4.9/%{gcc_version}/cc1plus%{_exeext}
+
 
-%dir %{gcclib}/i386-rtems4.9/%{gcc_version}/include
-%{gcclib}/i386-rtems4.9/%{gcc_version}/include/c++
+%files -n rtems-4.9-i386-rtems4.9-gcc-libstdc++ -f build/files.g++
+%defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_gcclibdir}
+%dir %{_gcclibdir}/gcc
+%dir %{_gcclibdir}/gcc/i386-rtems4.9
+%dir %{_gcclibdir}/gcc/i386-rtems4.9/%{gcc_version}
+%dir %{_gcclibdir}/gcc/i386-rtems4.9/%{gcc_version}/include
+%{_gcclibdir}/gcc/i386-rtems4.9/%{gcc_version}/include/c++
 
 
 
@@ -581,7 +792,8 @@
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        24%{?dist}
+Release:        25%{?dist}
+%{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.9-newlib-common
 
@@ -590,7 +802,7 @@
 
 %files -n rtems-4.9-i386-rtems4.9-newlib -f build/files.newlib
 %defattr(-,root,root)
-%dir %{_prefix}
+%dir %{_exec_prefix}
 %dir %{_exec_prefix}/i386-rtems4.9
 %{_exec_prefix}/i386-rtems4.9/include
 
@@ -601,7 +813,8 @@
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        24%{?dist}
+Release:        25%{?dist}
+%{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable
 
 Requires(post): 	/sbin/install-info
@@ -612,6 +825,9 @@
 
 %files -n rtems-4.9-newlib-common
 %defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_prefix}/share
+
 %dir %{_infodir}
 %ghost %{_infodir}/dir
 %{_infodir}/libc.info*

diff -u rtems/contrib/crossrpms/rtems4.9/m68k/rtems-4.9-m68k-rtems4.9-gcc.spec:1.21.2.9 rtems/contrib/crossrpms/rtems4.9/m68k/rtems-4.9-m68k-rtems4.9-gcc.spec:1.21.2.10
--- rtems/contrib/crossrpms/rtems4.9/m68k/rtems-4.9-m68k-rtems4.9-gcc.spec:1.21.2.9	Fri Nov 27 04:31:33 2009
+++ rtems/contrib/crossrpms/rtems4.9/m68k/rtems-4.9-m68k-rtems4.9-gcc.spec	Sun Aug  7 00:23:35 2011
@@ -53,14 +53,12 @@
 %define newlib_pkgvers		1.16.0
 %define newlib_version		1.16.0
 
-%define mpfr_version	2.3.1
-
 Name:         	rtems-4.9-m68k-rtems4.9-gcc
 Summary:      	m68k-rtems4.9 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	24%{?dist}
+Release:      	25%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -69,21 +67,145 @@
 
 BuildRequires:  %{_host_rpmprefix}gcc
 
+# versions of libraries, we conditionally bundle if necessary
+%global mpc_version	0.8.1
+%global mpfr_version	2.4.2
+%global gmp_version	4.3.2
+%global libelf_version  0.8.13
+
+# versions of libraries these distros are known to ship
+%if 0%{?fc16}
+%global mpc_provided 0.8.3
+%global mpfr_provided 3.0.0
+%global gmp_provided 4.3.2
+%endif
+
+%if 0%{?fc15}
+%global mpc_provided 0.8.3
+%global mpfr_provided 3.0.0
+%global gmp_provided 4.3.2
+%endif
+
+%if 0%{?fc14}
+%global mpc_provided 0.8.1
+%global mpfr_provided 2.4.2
+%global gmp_provided 4.3.1
+%endif
+
+%if 0%{?el6}
+%global mpc_provided %{nil}
+%global mpfr_provided 2.4.1
+%global gmp_provided 4.3.1
+%endif
+
+%if 0%{?el5}
+%global mpc_provided %{nil}
+%global mpfr_provided %{nil}
+%global gmp_provided 4.1.4
+%endif
+
+%if 0%{?suse11_3}
+%global mpc_provided 0.8.1
+%global mpfr_provided 2.4.2
+%global gmp_provided 4.3.2
+%endif
+
+%if 0%{?suse11_4}
+%global mpc_provided 0.8.2
+%global mpfr_provided 3.0.0
+%global gmp_provided 5.0.1
+%endif
+
+%if 0%{?cygwin}
+%global mpc_provided 0.8
+%global mpfr_provided 2.4.1
+%global gmp_provided 4.3.1
+%endif
+
+%if 0%{?mingw32}
+%global mpc_provided 0.8.1
+%global mpfr_provided 2.4.1
+%global gmp_provided 4.3.2
+%endif
+
+%if "%{gcc_version}" >= "4.2.0"
+%endif
+
 %if "%{gcc_version}" >= "4.3.0"
-BuildRequires:  gmp-devel >= 4.1
+%define gmp_required		4.1
+%define mpfr_required		2.3.1
+%endif
+
+%if "%{gcc_version}" >= "4.3.3"
+%define cloog_required 		0.15
+%endif
+
+%if "%{gcc_version}" >= "4.4.0"
+%define mpfr_required		2.3.2
+%endif
+
+%if "%{gcc_version}" >= "4.5.0"
+%define mpc_required 		0.8
+%if %{with lto}
+%define libelf_required 	0.8.12
+%endif
+%endif
+
+%if %{defined mpc_required}
+%if "%{mpc_provided}" >= "%{mpc_required}"
+%{?fedora:BuildRequires: libmpc-devel >= %{mpc_required}}
+%{?suse:BuildRequires: mpc-devel >= %{mpc_required}}
 %if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}gmp-devel
-BuildRequires:  %{_host_rpmprefix}mpfr-devel
+BuildRequires:  %{_host_rpmprefix}mpc-devel >= %{mpc_required}
 %endif
-%if 0%{?fedora} >= 8
-BuildRequires:  mpfr-devel >= 2.3.0
+%else
+%define _build_mpc 1
+%define gmp_required 		4.2
+%endif
+%endif
+
+%if %{defined gmp_required}
+%if "%{gmp_provided}" >= "%{gmp_required}"
+BuildRequires: gmp-devel >= %{gmp_required}
+%if "%{_build}" != "%{_host}"
+BuildRequires:  %{_host_rpmprefix}gmp-devel >= %{gmp_required}
+%endif
+%else
+%define _build_gmp 1
+%endif
+%endif
+
+%if %{defined libelf_required}
+%if "%{libelf_provided}" >= "%{libelf_required}"
+BuildRequires: libelf-devel >= %{libelf_required}
+%if "%{_build}" != "%{_host}"
+BuildRequires:  %{_host_rpmprefix}libelf-devel >= %{libelf_required}
+%endif
+%else
+%define _build_libelf 1
+%endif
+%endif
+
+
+%if %{defined cloog_required}
+%{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required}
+%{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required}
+%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required}
+%{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required}
+%{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
+%{?suse11_3:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
+%endif
+
+
+%if %{defined mpfr_required}
+%if "%{mpfr_provided}" >= "%{mpfr_required}"
+BuildRequires: mpfr-devel >= %{mpfr_required}
+%if "%{_build}" != "%{_host}"
+BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
 %endif
-%if "%{?suse}" > "10.3"
-BuildRequires:  mpfr-devel >= 2.3.0
+%else
+%define _build_mpfr 1
 %endif
-# These distros ship an insufficient mpfr
-%{?el4:%define 	_build_mpfr 	1}
-%{?suse10_3:%define 	_build_mpfr 	1}
 %endif
 
 %if "%{_build}" != "%{_host}"
@@ -100,17 +222,19 @@
 
 Requires:	rtems-4.9-gcc-common
 Requires:	rtems-4.9-m68k-rtems4.9-binutils
-Requires:	rtems-4.9-m68k-rtems4.9-newlib = %{newlib_version}-24%{?dist}
+Requires:	rtems-4.9-m68k-rtems4.9-gcc-libgcc = %{gcc_rpmvers}-%{release}
+Requires:	rtems-4.9-m68k-rtems4.9-newlib = %{newlib_version}-25%{?dist}
 
-
-%if "%{gcc_version}" >= "3.4"
-%define gcclib %{_libdir}/gcc
-%define gccexec %{_libexecdir}/gcc
+%if "%{gcc_version}" >= "4.5.0"
+BuildRequires:  zlib-devel
+%if "%{_build}" != "%{_host}"
+BuildRequires:  %{_host_rpmprefix}zlib-devel
+%endif
 %else
-%define gcclib %{_libdir}/gcc-lib
-%define gccexec %{_libdir}/gcc-lib
 %endif
 
+%global _gcclibdir %{_prefix}/lib
+
 %if "%{gcc_version}" == "4.3.2"
 Source0:	ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
 Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20090825.diff
@@ -131,8 +255,20 @@
 %endif
 %{?_without_sources:NoSource:	50}
 
-%if "%{gcc_version}" >= "4.3.0"
-Source60:    http://www.mpfr.org/mpfr-current/mpfr-%{mpfr_version}.tar.bz2
+%if 0%{?_build_mpfr}
+Source60:    http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.bz2
+%endif
+
+%if 0%{?_build_mpc}
+Source61:    http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.gz
+%endif
+
+%if 0%{?_build_gmp}
+Source62:    ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2
+%endif
+
+%if 0%{?_build_libelf}
+Source63:    http://www.mr511.de/software/libelf-%{libelf_version}.tar.gz
 %endif
 
 %description
@@ -142,10 +278,14 @@
 %setup -c -T -n %{name}-%{version}
 
 %setup -q -T -D -n %{name}-%{version} -a0
-%{?PATCH0:%patch0 -p0}
+cd gcc-%{gcc_pkgvers}
+%{?PATCH0:%patch0 -p1}
+cd ..
 
 %setup -q -T -D -n %{name}-%{version} -a1
-%{?PATCH1:%patch1 -p0}
+cd gcc-%{gcc_pkgvers}
+%{?PATCH1:%patch1 -p1}
+cd ..
 
 
 
@@ -157,6 +297,9 @@
 cd ..
   # Copy the C library into gcc's source tree
   ln -s ../newlib-%{newlib_version}/newlib gcc-%{gcc_pkgvers}
+  # Make sure not to be using GPL'ed sources
+  rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/linux
+  rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/rdos
 
 %if 0%{?_build_mpfr}
 %setup -q -T -D -n %{name}-%{version} -a60
@@ -165,7 +308,28 @@
   ln -s ../mpfr-%{mpfr_version} gcc-%{gcc_pkgvers}/mpfr
 %endif
 
-echo "RTEMS gcc-%{gcc_version}-24%{?dist}\/newlib-%{newlib_version}-24%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+%if 0%{?_build_mpc}
+%setup -q -T -D -n %{name}-%{version} -a61
+%{?PATCH61:%patch61 -p1}
+  # Build mpc one-tree style
+  ln -s ../mpc-%{mpc_version} gcc-%{gcc_pkgvers}/mpc
+%endif
+
+%if 0%{?_build_gmp}
+%setup -q -T -D -n %{name}-%{version} -a62
+%{?PATCH62:%patch62 -p1}
+  # Build gmp one-tree style
+  ln -s ../gmp-%{gmp_version} gcc-%{gcc_pkgvers}/gmp
+%endif
+
+%if 0%{?_build_libelf}
+%setup -q -T -D -n %{name}-%{version} -a63
+%{?PATCH63:%patch63 -p1}
+  # Build libelf one-tree style
+  ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
+%endif
+
+echo "RTEMS gcc-%{gcc_version}-25%{?dist}\/newlib-%{newlib_version}-25%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -192,7 +356,7 @@
     --bindir=%{_bindir} \
     --exec_prefix=%{_exec_prefix} \
     --includedir=%{_includedir} \
-    --libdir=%{_libdir} \
+    --libdir=%{_gcclibdir} \
     --libexecdir=%{_libexecdir} \
     --mandir=%{_mandir} \
     --infodir=%{_infodir} \
@@ -208,7 +372,7 @@
     --enable-version-specific-runtime-libs \
     --enable-threads \
     --enable-newlib-io-c99-formats \
-    --enable-languages="$languages" $optargs
+    --enable-languages="$languages"
 
 %if "%_host" != "%_build"
   # Bug in gcc-3.2.1:
@@ -238,12 +402,19 @@
 # Misplaced header file
   if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then
     mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \
-      $RPM_BUILD_ROOT%{gcclib}/m68k-rtems4.9/%{gcc_version}/include/
+      $RPM_BUILD_ROOT%{_gcclibdir}/gcc/m68k-rtems4.9/%{gcc_version}/include/
   fi
 %endif
 
   # host library
+%if "%{gcc_version}" >= "4.2.0"
+  # libiberty doesn't honor --libdir, but always installs to a 
+  # magically guessed _libdir
   rm -f  ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a
+%else
+  # libiberty installs to --libdir=...
+  rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a
+%endif
 
   # We use the version from binutils
   rm -f $RPM_BUILD_ROOT%{_bindir}/m68k-rtems4.9-c++filt%{_exeext}
@@ -253,18 +424,16 @@
   rm -f $RPM_BUILD_ROOT%{_infodir}/dir
   touch $RPM_BUILD_ROOT%{_infodir}/dir
 
+  # We don't want libffi's man-pages
+  rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*ffi*
 
-%if "%{gcc_version}" >= "3.4"
   # Bug in gcc-3.4.0pre
   rm -f $RPM_BUILD_ROOT%{_bindir}/m68k-rtems4.9-m68k-rtems4.9-gcjh%{_exeext}
-%endif
 
-%if "%{gcc_version}" >= "3.3"
   # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs
   # the fixinclude-install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{gcclib}/m68k-rtems4.9/%{gcc_version}/install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{gccexec}/m68k-rtems4.9/%{gcc_version}/install-tools
-%endif
+  rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/m68k-rtems4.9/%{gcc_version}/install-tools
+  rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/m68k-rtems4.9/%{gcc_version}/install-tools
 
   # Bug in gcc > 4.1.0: Installs an unused, empty directory
   if test -d ${RPM_BUILD_ROOT}%{_prefix}/m68k-rtems4.9/include/bits; then
@@ -272,11 +441,11 @@
   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.9/lib"
-  for i in $f; do
+  for i in $multilibs; do
     case $i in
     \.) echo "%dir ${TGTDIR}" >> build/files.newlib
       ;;
@@ -287,19 +456,10 @@
 
   rm -f dirs ;
   echo "%defattr(-,root,root,-)" >> dirs
-  echo "%dir %{_prefix}" >> dirs
-  echo "%dir %{_libdir}" >> dirs
-%if "%{gcc_version}" >= "3.4"
-  echo "%dir %{_libexecdir}" >> dirs
-%endif
-  echo "%dir %{gcclib}" >> dirs
-  echo "%dir %{gcclib}/m68k-rtems4.9" >> dirs
-
-  TGTDIR="%{gcclib}/m68k-rtems4.9/%{gcc_version}"
-  for i in $f; do
+  TGTDIR="%{_gcclibdir}/gcc/m68k-rtems4.9/%{gcc_version}"
+  for i in $multilibs; do
     case $i in
-    \.) echo "%dir ${TGTDIR}" >> dirs
-      ;;
+    \.) ;; # ignore, handled elsewhere
     *)  echo "%dir ${TGTDIR}/$i" >> dirs
       ;;
     esac
@@ -312,7 +472,7 @@
   cp dirs build/files.gcj
   cp dirs build/files.g++
 
-  TGTDIR="%{gcclib}/m68k-rtems4.9/%{gcc_version}"
+  TGTDIR="%{_gcclibdir}/gcc/m68k-rtems4.9/%{gcc_version}"
   f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
   for i in $f; do
     case $i in
@@ -327,6 +487,8 @@
     *include/objc*) ;;
     *include/g++*);;
     *include/c++*);;
+    *include-fixed/*);;
+    *finclude/*);;
     *adainclude*);;
     *adalib*);;
     *gnat1);;
@@ -381,7 +543,7 @@
 cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
 #!/bin/sh
 grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/m68k-rtems4.9/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/m68k-rtems4.9/' | %__find_provides
+  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/m68k-rtems4.9/'} | %__find_provides
 EOF
 chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
 %define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
@@ -389,7 +551,7 @@
 cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
 #!/bin/sh
 grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/m68k-rtems4.9/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/m68k-rtems4.9/' | %__find_requires
+  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/m68k-rtems4.9/'} | %__find_requires
 EOF
 chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
 %define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
@@ -429,7 +591,7 @@
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.9-m68k-rtems4.9-binutils
-# Requires:       rtems-4.9-m68k-rtems4.9-newlib = %{newlib_version}-24%{?dist}
+# Requires:       rtems-4.9-m68k-rtems4.9-newlib = %{newlib_version}-25%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -439,44 +601,72 @@
 %description -n rtems-4.9-m68k-rtems4.9-gcc
 GNU cc compiler for m68k-rtems4.9.
 
-%files -n rtems-4.9-m68k-rtems4.9-gcc -f build/files.gcc
+# ==============================================================
+# rtems-4.9-m68k-rtems4.9-gcc-libgcc
+# ==============================================================
+%package -n rtems-4.9-m68k-rtems4.9-gcc-libgcc
+Summary:        libgcc for m68k-rtems4.9-gcc
+Group:          Development/Tools
+Version:        %{gcc_rpmvers}
+%{?_with_noarch_subpackages:BuildArch: noarch}
+Requires:       rtems-4.9-m68k-rtems4.9-newlib = %{newlib_version}-25%{?dist}
+License:	GPL
+
+%description -n rtems-4.9-m68k-rtems4.9-gcc-libgcc
+libgcc m68k-rtems4.9-gcc.
+
+
+%files -n rtems-4.9-m68k-rtems4.9-gcc
 %defattr(-,root,root)
+%dir %{_prefix}
+
 %dir %{_mandir}
 %dir %{_mandir}/man1
 %{_mandir}/man1/m68k-rtems4.9-gcc.1*
-%if "%{gcc_version}" >= "3.4"
 %{_mandir}/man1/m68k-rtems4.9-cpp.1*
 %{_mandir}/man1/m68k-rtems4.9-gcov.1*
-%endif
 
 %dir %{_bindir}
 %{_bindir}/m68k-rtems4.9-cpp%{_exeext}
 %{_bindir}/m68k-rtems4.9-gcc%{_exeext}
-%if "%{gcc_version}" >= "3.3"
 %{_bindir}/m68k-rtems4.9-gcc-%{gcc_version}%{_exeext}
-%endif
 %{_bindir}/m68k-rtems4.9-gcov%{_exeext}
+%if "%{gcc_version}" < "4.6.0"
 %{_bindir}/m68k-rtems4.9-gccbug
+%endif
+
+%dir %{_libexecdir}
+%dir %{_libexecdir}/gcc
+%dir %{_libexecdir}/gcc/m68k-rtems4.9
+%dir %{_libexecdir}/gcc/m68k-rtems4.9/%{gcc_version}
+%{_libexecdir}/gcc/m68k-rtems4.9/%{gcc_version}/cc1%{_exeext}
+%{_libexecdir}/gcc/m68k-rtems4.9/%{gcc_version}/collect2%{_exeext}
+%if "%{gcc_version}" >= "4.5.0"
+%{?with_lto:%{_libexecdir}/gcc/m68k-rtems4.9/%{gcc_version}/lto%{_exeext}}
+%{_libexecdir}/gcc/m68k-rtems4.9/%{gcc_version}/lto-wrapper%{_exeext}
+%endif
+
+%files -n rtems-4.9-m68k-rtems4.9-gcc-libgcc -f build/files.gcc
+%defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_gcclibdir}
+%dir %{_gcclibdir}/gcc
+%dir %{_gcclibdir}/gcc/m68k-rtems4.9
+%dir %{_gcclibdir}/gcc/m68k-rtems4.9/%{gcc_version}
+%dir %{_gcclibdir}/gcc/m68k-rtems4.9/%{gcc_version}/include
 
-%dir %{gcclib}/m68k-rtems4.9/%{gcc_version}/include
 %if "%{gcc_version}" > "4.0.3"
 %if "m68k-rtems4.9" != "bfin-rtems4.9"
 %if "m68k-rtems4.9" != "avr-rtems4.9"
-%dir %{gcclib}/m68k-rtems4.9/%{gcc_version}/include/ssp
+%dir %{_gcclibdir}/gcc/m68k-rtems4.9/%{gcc_version}/include/ssp
 %endif
 %endif
 %endif
 
 %if "%{gcc_version}" >= "4.3.0"
-%dir %{gcclib}/m68k-rtems4.9/%{gcc_version}/include-fixed
+%{_gcclibdir}/gcc/m68k-rtems4.9/%{gcc_version}/include-fixed
 %endif
 
-%dir %{gccexec}
-%dir %{gccexec}/m68k-rtems4.9
-%dir %{gccexec}/m68k-rtems4.9/%{gcc_version}
-%{gccexec}/m68k-rtems4.9/%{gcc_version}/cc1%{_exeext}
-%{gccexec}/m68k-rtems4.9/%{gcc_version}/collect2%{_exeext}
-
 # ==============================================================
 # rtems-4.9-gcc-common
 # ==============================================================
@@ -484,6 +674,7 @@
 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
@@ -494,22 +685,21 @@
 
 %files -n rtems-4.9-gcc-common
 %defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_prefix}/share
+
 %dir %{_infodir}
 %ghost %{_infodir}/dir
 %{_infodir}/cpp.info*
 %{_infodir}/cppinternals.info*
 %{_infodir}/gcc.info*
 %{_infodir}/gccint.info*
-%if "%{gcc_version}" >= "3.4"
 %{_infodir}/gccinstall.info*
+%if "%{gcc_version}" >= "4.6.0"
+%{_infodir}/libquadmath.info*
 %endif
 
 %dir %{_mandir}
-%if "%{gcc_version}" < "3.4"
-%dir %{_mandir}/man1
-%{_mandir}/man1/cpp.1*
-%{_mandir}/man1/gcov.1*
-%endif
 %dir %{_mandir}/man7
 %{_mandir}/man7/fsf-funding.7*
 %{_mandir}/man7/gfdl.7*
@@ -520,9 +710,7 @@
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
-%if "%{gcc_version}" >= "3.4"
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
-%endif
 
 %preun -n rtems-4.9-gcc-common
 if [ $1 -eq 0 ]; then
@@ -530,9 +718,7 @@
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || :
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
-%if "%{gcc_version}" >= "3.4"
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
-%endif
 fi
 
 # ==============================================================
@@ -543,12 +729,11 @@
 Group:		Development/Tools
 Version:        %{gcc_rpmvers}
 License:	GPL
+Requires:       rtems-4.9-m68k-rtems4.9-gcc-libstdc++ = %{gcc_rpmvers}-%{release}
 
 %if "%{_build}" != "%{_host}"
 BuildRequires:  rtems-4.9-m68k-rtems4.9-gcc-c++ = %{gcc_rpmvers}
 %endif
-Provides:	rtems-4.9-m68k-rtems4.9-c++ = %{gcc_rpmvers}-%{release}
-Obsoletes:	rtems-4.9-m68k-rtems4.9-c++ < %{gcc_rpmvers}-%{release}
 
 Requires:       rtems-4.9-gcc-common
 Requires:       rtems-4.9-m68k-rtems4.9-gcc = %{gcc_rpmvers}-%{release}
@@ -556,20 +741,46 @@
 %description -n rtems-4.9-m68k-rtems4.9-gcc-c++
 GCC c++ compiler for m68k-rtems4.9.
 
-%files -n rtems-4.9-m68k-rtems4.9-gcc-c++ -f build/files.g++
+
+%package -n rtems-4.9-m68k-rtems4.9-gcc-libstdc++
+Summary:	libstdc++ for m68k-rtems4.9
+Group:		Development/Tools
+Version:        %{gcc_rpmvers}
+%{?_with_noarch_subpackages:BuildArch: noarch}
+License:	GPL
+
+%description -n rtems-4.9-m68k-rtems4.9-gcc-libstdc++
+%{summary}
+
+
+%files -n rtems-4.9-m68k-rtems4.9-gcc-c++
 %defattr(-,root,root)
+%dir %{_prefix}
+
+%dir %{_mandir}
+%dir %{_mandir}/man1
 %{_mandir}/man1/m68k-rtems4.9-g++.1*
 
+%dir %{_bindir}
 %{_bindir}/m68k-rtems4.9-c++%{_exeext}
 %{_bindir}/m68k-rtems4.9-g++%{_exeext}
 
-%dir %{gccexec}
-%dir %{gccexec}/m68k-rtems4.9
-%dir %{gccexec}/m68k-rtems4.9/%{gcc_version}
-%{gccexec}/m68k-rtems4.9/%{gcc_version}/cc1plus%{_exeext}
+%dir %{_libexecdir}
+%dir %{_libexecdir}/gcc
+%dir %{_libexecdir}/gcc/m68k-rtems4.9
+%dir %{_libexecdir}/gcc/m68k-rtems4.9/%{gcc_version}
+%{_libexecdir}/gcc/m68k-rtems4.9/%{gcc_version}/cc1plus%{_exeext}
+
 
-%dir %{gcclib}/m68k-rtems4.9/%{gcc_version}/include
-%{gcclib}/m68k-rtems4.9/%{gcc_version}/include/c++
+%files -n rtems-4.9-m68k-rtems4.9-gcc-libstdc++ -f build/files.g++
+%defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_gcclibdir}
+%dir %{_gcclibdir}/gcc
+%dir %{_gcclibdir}/gcc/m68k-rtems4.9
+%dir %{_gcclibdir}/gcc/m68k-rtems4.9/%{gcc_version}
+%dir %{_gcclibdir}/gcc/m68k-rtems4.9/%{gcc_version}/include
+%{_gcclibdir}/gcc/m68k-rtems4.9/%{gcc_version}/include/c++
 
 
 
@@ -581,7 +792,8 @@
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        24%{?dist}
+Release:        25%{?dist}
+%{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.9-newlib-common
 
@@ -590,7 +802,7 @@
 
 %files -n rtems-4.9-m68k-rtems4.9-newlib -f build/files.newlib
 %defattr(-,root,root)
-%dir %{_prefix}
+%dir %{_exec_prefix}
 %dir %{_exec_prefix}/m68k-rtems4.9
 %{_exec_prefix}/m68k-rtems4.9/include
 
@@ -601,7 +813,8 @@
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        24%{?dist}
+Release:        25%{?dist}
+%{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable
 
 Requires(post): 	/sbin/install-info
@@ -612,6 +825,9 @@
 
 %files -n rtems-4.9-newlib-common
 %defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_prefix}/share
+
 %dir %{_infodir}
 %ghost %{_infodir}/dir
 %{_infodir}/libc.info*

diff -u rtems/contrib/crossrpms/rtems4.9/mips/rtems-4.9-mips-rtems4.9-gcc.spec:1.19.2.9 rtems/contrib/crossrpms/rtems4.9/mips/rtems-4.9-mips-rtems4.9-gcc.spec:1.19.2.10
--- rtems/contrib/crossrpms/rtems4.9/mips/rtems-4.9-mips-rtems4.9-gcc.spec:1.19.2.9	Fri Nov 27 04:31:33 2009
+++ rtems/contrib/crossrpms/rtems4.9/mips/rtems-4.9-mips-rtems4.9-gcc.spec	Sun Aug  7 00:23:35 2011
@@ -53,14 +53,12 @@
 %define newlib_pkgvers		1.16.0
 %define newlib_version		1.16.0
 
-%define mpfr_version	2.3.1
-
 Name:         	rtems-4.9-mips-rtems4.9-gcc
 Summary:      	mips-rtems4.9 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	24%{?dist}
+Release:      	25%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -69,21 +67,145 @@
 
 BuildRequires:  %{_host_rpmprefix}gcc
 
+# versions of libraries, we conditionally bundle if necessary
+%global mpc_version	0.8.1
+%global mpfr_version	2.4.2
+%global gmp_version	4.3.2
+%global libelf_version  0.8.13
+
+# versions of libraries these distros are known to ship
+%if 0%{?fc16}
+%global mpc_provided 0.8.3
+%global mpfr_provided 3.0.0
+%global gmp_provided 4.3.2
+%endif
+
+%if 0%{?fc15}
+%global mpc_provided 0.8.3
+%global mpfr_provided 3.0.0
+%global gmp_provided 4.3.2
+%endif
+
+%if 0%{?fc14}
+%global mpc_provided 0.8.1
+%global mpfr_provided 2.4.2
+%global gmp_provided 4.3.1
+%endif
+
+%if 0%{?el6}
+%global mpc_provided %{nil}
+%global mpfr_provided 2.4.1
+%global gmp_provided 4.3.1
+%endif
+
+%if 0%{?el5}
+%global mpc_provided %{nil}
+%global mpfr_provided %{nil}
+%global gmp_provided 4.1.4
+%endif
+
+%if 0%{?suse11_3}
+%global mpc_provided 0.8.1
+%global mpfr_provided 2.4.2
+%global gmp_provided 4.3.2
+%endif
+
+%if 0%{?suse11_4}
+%global mpc_provided 0.8.2
+%global mpfr_provided 3.0.0
+%global gmp_provided 5.0.1
+%endif
+
+%if 0%{?cygwin}
+%global mpc_provided 0.8
+%global mpfr_provided 2.4.1
+%global gmp_provided 4.3.1
+%endif
+
+%if 0%{?mingw32}
+%global mpc_provided 0.8.1
+%global mpfr_provided 2.4.1
+%global gmp_provided 4.3.2
+%endif
+
+%if "%{gcc_version}" >= "4.2.0"
+%endif
+
 %if "%{gcc_version}" >= "4.3.0"
-BuildRequires:  gmp-devel >= 4.1
+%define gmp_required		4.1
+%define mpfr_required		2.3.1
+%endif
+
+%if "%{gcc_version}" >= "4.3.3"
+%define cloog_required 		0.15
+%endif
+
+%if "%{gcc_version}" >= "4.4.0"
+%define mpfr_required		2.3.2
+%endif
+
+%if "%{gcc_version}" >= "4.5.0"
+%define mpc_required 		0.8
+%if %{with lto}
+%define libelf_required 	0.8.12
+%endif
+%endif
+
+%if %{defined mpc_required}
+%if "%{mpc_provided}" >= "%{mpc_required}"
+%{?fedora:BuildRequires: libmpc-devel >= %{mpc_required}}
+%{?suse:BuildRequires: mpc-devel >= %{mpc_required}}
 %if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}gmp-devel
-BuildRequires:  %{_host_rpmprefix}mpfr-devel
+BuildRequires:  %{_host_rpmprefix}mpc-devel >= %{mpc_required}
 %endif
-%if 0%{?fedora} >= 8
-BuildRequires:  mpfr-devel >= 2.3.0
+%else
+%define _build_mpc 1
+%define gmp_required 		4.2
+%endif
+%endif
+
+%if %{defined gmp_required}
+%if "%{gmp_provided}" >= "%{gmp_required}"
+BuildRequires: gmp-devel >= %{gmp_required}
+%if "%{_build}" != "%{_host}"
+BuildRequires:  %{_host_rpmprefix}gmp-devel >= %{gmp_required}
+%endif
+%else
+%define _build_gmp 1
+%endif
+%endif
+
+%if %{defined libelf_required}
+%if "%{libelf_provided}" >= "%{libelf_required}"
+BuildRequires: libelf-devel >= %{libelf_required}
+%if "%{_build}" != "%{_host}"
+BuildRequires:  %{_host_rpmprefix}libelf-devel >= %{libelf_required}
+%endif
+%else
+%define _build_libelf 1
+%endif
+%endif
+
+
+%if %{defined cloog_required}
+%{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required}
+%{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required}
+%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required}
+%{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required}
+%{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
+%{?suse11_3:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
+%endif
+
+
+%if %{defined mpfr_required}
+%if "%{mpfr_provided}" >= "%{mpfr_required}"
+BuildRequires: mpfr-devel >= %{mpfr_required}
+%if "%{_build}" != "%{_host}"
+BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
 %endif
-%if "%{?suse}" > "10.3"
-BuildRequires:  mpfr-devel >= 2.3.0
+%else
+%define _build_mpfr 1
 %endif
-# These distros ship an insufficient mpfr
-%{?el4:%define 	_build_mpfr 	1}
-%{?suse10_3:%define 	_build_mpfr 	1}
 %endif
 
 %if "%{_build}" != "%{_host}"
@@ -100,17 +222,19 @@
 
 Requires:	rtems-4.9-gcc-common
 Requires:	rtems-4.9-mips-rtems4.9-binutils
-Requires:	rtems-4.9-mips-rtems4.9-newlib = %{newlib_version}-24%{?dist}
+Requires:	rtems-4.9-mips-rtems4.9-gcc-libgcc = %{gcc_rpmvers}-%{release}
+Requires:	rtems-4.9-mips-rtems4.9-newlib = %{newlib_version}-25%{?dist}
 
-
-%if "%{gcc_version}" >= "3.4"
-%define gcclib %{_libdir}/gcc
-%define gccexec %{_libexecdir}/gcc
+%if "%{gcc_version}" >= "4.5.0"
+BuildRequires:  zlib-devel
+%if "%{_build}" != "%{_host}"
+BuildRequires:  %{_host_rpmprefix}zlib-devel
+%endif
 %else
-%define gcclib %{_libdir}/gcc-lib
-%define gccexec %{_libdir}/gcc-lib
 %endif
 
+%global _gcclibdir %{_prefix}/lib
+
 %if "%{gcc_version}" == "4.3.2"
 Source0:	ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
 Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20090825.diff
@@ -131,8 +255,20 @@
 %endif
 %{?_without_sources:NoSource:	50}
 
-%if "%{gcc_version}" >= "4.3.0"
-Source60:    http://www.mpfr.org/mpfr-current/mpfr-%{mpfr_version}.tar.bz2
+%if 0%{?_build_mpfr}
+Source60:    http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.bz2
+%endif
+
+%if 0%{?_build_mpc}
+Source61:    http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.gz
+%endif
+
+%if 0%{?_build_gmp}
+Source62:    ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2
+%endif
+
+%if 0%{?_build_libelf}
+Source63:    http://www.mr511.de/software/libelf-%{libelf_version}.tar.gz
 %endif
 
 %description
@@ -142,10 +278,14 @@
 %setup -c -T -n %{name}-%{version}
 
 %setup -q -T -D -n %{name}-%{version} -a0
-%{?PATCH0:%patch0 -p0}
+cd gcc-%{gcc_pkgvers}
+%{?PATCH0:%patch0 -p1}
+cd ..
 
 %setup -q -T -D -n %{name}-%{version} -a1
-%{?PATCH1:%patch1 -p0}
+cd gcc-%{gcc_pkgvers}
+%{?PATCH1:%patch1 -p1}
+cd ..
 
 
 
@@ -157,6 +297,9 @@
 cd ..
   # Copy the C library into gcc's source tree
   ln -s ../newlib-%{newlib_version}/newlib gcc-%{gcc_pkgvers}
+  # Make sure not to be using GPL'ed sources
+  rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/linux
+  rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/rdos
 
 %if 0%{?_build_mpfr}
 %setup -q -T -D -n %{name}-%{version} -a60
@@ -165,7 +308,28 @@
   ln -s ../mpfr-%{mpfr_version} gcc-%{gcc_pkgvers}/mpfr
 %endif
 
-echo "RTEMS gcc-%{gcc_version}-24%{?dist}\/newlib-%{newlib_version}-24%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+%if 0%{?_build_mpc}
+%setup -q -T -D -n %{name}-%{version} -a61
+%{?PATCH61:%patch61 -p1}
+  # Build mpc one-tree style
+  ln -s ../mpc-%{mpc_version} gcc-%{gcc_pkgvers}/mpc
+%endif
+
+%if 0%{?_build_gmp}
+%setup -q -T -D -n %{name}-%{version} -a62
+%{?PATCH62:%patch62 -p1}
+  # Build gmp one-tree style
+  ln -s ../gmp-%{gmp_version} gcc-%{gcc_pkgvers}/gmp
+%endif
+
+%if 0%{?_build_libelf}
+%setup -q -T -D -n %{name}-%{version} -a63
+%{?PATCH63:%patch63 -p1}
+  # Build libelf one-tree style
+  ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
+%endif
+
+echo "RTEMS gcc-%{gcc_version}-25%{?dist}\/newlib-%{newlib_version}-25%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -192,7 +356,7 @@
     --bindir=%{_bindir} \
     --exec_prefix=%{_exec_prefix} \
     --includedir=%{_includedir} \
-    --libdir=%{_libdir} \
+    --libdir=%{_gcclibdir} \
     --libexecdir=%{_libexecdir} \
     --mandir=%{_mandir} \
     --infodir=%{_infodir} \
@@ -208,7 +372,7 @@
     --enable-version-specific-runtime-libs \
     --enable-threads \
     --enable-newlib-io-c99-formats \
-    --enable-languages="$languages" $optargs
+    --enable-languages="$languages"
 
 %if "%_host" != "%_build"
   # Bug in gcc-3.2.1:
@@ -238,12 +402,19 @@
 # Misplaced header file
   if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then
     mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \
-      $RPM_BUILD_ROOT%{gcclib}/mips-rtems4.9/%{gcc_version}/include/
+      $RPM_BUILD_ROOT%{_gcclibdir}/gcc/mips-rtems4.9/%{gcc_version}/include/
   fi
 %endif
 
   # host library
+%if "%{gcc_version}" >= "4.2.0"
+  # libiberty doesn't honor --libdir, but always installs to a 
+  # magically guessed _libdir
   rm -f  ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a
+%else
+  # libiberty installs to --libdir=...
+  rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a
+%endif
 
   # We use the version from binutils
   rm -f $RPM_BUILD_ROOT%{_bindir}/mips-rtems4.9-c++filt%{_exeext}
@@ -253,18 +424,16 @@
   rm -f $RPM_BUILD_ROOT%{_infodir}/dir
   touch $RPM_BUILD_ROOT%{_infodir}/dir
 
+  # We don't want libffi's man-pages
+  rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*ffi*
 
-%if "%{gcc_version}" >= "3.4"
   # Bug in gcc-3.4.0pre
   rm -f $RPM_BUILD_ROOT%{_bindir}/mips-rtems4.9-mips-rtems4.9-gcjh%{_exeext}
-%endif
 
-%if "%{gcc_version}" >= "3.3"
   # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs
   # the fixinclude-install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{gcclib}/mips-rtems4.9/%{gcc_version}/install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{gccexec}/mips-rtems4.9/%{gcc_version}/install-tools
-%endif
+  rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/mips-rtems4.9/%{gcc_version}/install-tools
+  rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/mips-rtems4.9/%{gcc_version}/install-tools
 
   # Bug in gcc > 4.1.0: Installs an unused, empty directory
   if test -d ${RPM_BUILD_ROOT}%{_prefix}/mips-rtems4.9/include/bits; then
@@ -272,11 +441,11 @@
   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.9/lib"
-  for i in $f; do
+  for i in $multilibs; do
     case $i in
     \.) echo "%dir ${TGTDIR}" >> build/files.newlib
       ;;
@@ -287,19 +456,10 @@
 
   rm -f dirs ;
   echo "%defattr(-,root,root,-)" >> dirs
-  echo "%dir %{_prefix}" >> dirs
-  echo "%dir %{_libdir}" >> dirs
-%if "%{gcc_version}" >= "3.4"
-  echo "%dir %{_libexecdir}" >> dirs
-%endif
-  echo "%dir %{gcclib}" >> dirs
-  echo "%dir %{gcclib}/mips-rtems4.9" >> dirs
-
-  TGTDIR="%{gcclib}/mips-rtems4.9/%{gcc_version}"
-  for i in $f; do
+  TGTDIR="%{_gcclibdir}/gcc/mips-rtems4.9/%{gcc_version}"
+  for i in $multilibs; do
     case $i in
-    \.) echo "%dir ${TGTDIR}" >> dirs
-      ;;
+    \.) ;; # ignore, handled elsewhere
     *)  echo "%dir ${TGTDIR}/$i" >> dirs
       ;;
     esac
@@ -312,7 +472,7 @@
   cp dirs build/files.gcj
   cp dirs build/files.g++
 
-  TGTDIR="%{gcclib}/mips-rtems4.9/%{gcc_version}"
+  TGTDIR="%{_gcclibdir}/gcc/mips-rtems4.9/%{gcc_version}"
   f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
   for i in $f; do
     case $i in
@@ -327,6 +487,8 @@
     *include/objc*) ;;
     *include/g++*);;
     *include/c++*);;
+    *include-fixed/*);;
+    *finclude/*);;
     *adainclude*);;
     *adalib*);;
     *gnat1);;
@@ -381,7 +543,7 @@
 cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
 #!/bin/sh
 grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/mips-rtems4.9/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/mips-rtems4.9/' | %__find_provides
+  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/mips-rtems4.9/'} | %__find_provides
 EOF
 chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
 %define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
@@ -389,7 +551,7 @@
 cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
 #!/bin/sh
 grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/mips-rtems4.9/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/mips-rtems4.9/' | %__find_requires
+  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/mips-rtems4.9/'} | %__find_requires
 EOF
 chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
 %define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
@@ -429,7 +591,7 @@
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.9-mips-rtems4.9-binutils
-# Requires:       rtems-4.9-mips-rtems4.9-newlib = %{newlib_version}-24%{?dist}
+# Requires:       rtems-4.9-mips-rtems4.9-newlib = %{newlib_version}-25%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -439,44 +601,72 @@
 %description -n rtems-4.9-mips-rtems4.9-gcc
 GNU cc compiler for mips-rtems4.9.
 
-%files -n rtems-4.9-mips-rtems4.9-gcc -f build/files.gcc
+# ==============================================================
+# rtems-4.9-mips-rtems4.9-gcc-libgcc
+# ==============================================================
+%package -n rtems-4.9-mips-rtems4.9-gcc-libgcc
+Summary:        libgcc for mips-rtems4.9-gcc
+Group:          Development/Tools
+Version:        %{gcc_rpmvers}
+%{?_with_noarch_subpackages:BuildArch: noarch}
+Requires:       rtems-4.9-mips-rtems4.9-newlib = %{newlib_version}-25%{?dist}
+License:	GPL
+
+%description -n rtems-4.9-mips-rtems4.9-gcc-libgcc
+libgcc mips-rtems4.9-gcc.
+
+
+%files -n rtems-4.9-mips-rtems4.9-gcc
 %defattr(-,root,root)
+%dir %{_prefix}
+
 %dir %{_mandir}
 %dir %{_mandir}/man1
 %{_mandir}/man1/mips-rtems4.9-gcc.1*
-%if "%{gcc_version}" >= "3.4"
 %{_mandir}/man1/mips-rtems4.9-cpp.1*
 %{_mandir}/man1/mips-rtems4.9-gcov.1*
-%endif
 
 %dir %{_bindir}
 %{_bindir}/mips-rtems4.9-cpp%{_exeext}
 %{_bindir}/mips-rtems4.9-gcc%{_exeext}
-%if "%{gcc_version}" >= "3.3"
 %{_bindir}/mips-rtems4.9-gcc-%{gcc_version}%{_exeext}
-%endif
 %{_bindir}/mips-rtems4.9-gcov%{_exeext}
+%if "%{gcc_version}" < "4.6.0"
 %{_bindir}/mips-rtems4.9-gccbug
+%endif
+
+%dir %{_libexecdir}
+%dir %{_libexecdir}/gcc
+%dir %{_libexecdir}/gcc/mips-rtems4.9
+%dir %{_libexecdir}/gcc/mips-rtems4.9/%{gcc_version}
+%{_libexecdir}/gcc/mips-rtems4.9/%{gcc_version}/cc1%{_exeext}
+%{_libexecdir}/gcc/mips-rtems4.9/%{gcc_version}/collect2%{_exeext}
+%if "%{gcc_version}" >= "4.5.0"
+%{?with_lto:%{_libexecdir}/gcc/mips-rtems4.9/%{gcc_version}/lto%{_exeext}}
+%{_libexecdir}/gcc/mips-rtems4.9/%{gcc_version}/lto-wrapper%{_exeext}
+%endif
+
+%files -n rtems-4.9-mips-rtems4.9-gcc-libgcc -f build/files.gcc
+%defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_gcclibdir}
+%dir %{_gcclibdir}/gcc
+%dir %{_gcclibdir}/gcc/mips-rtems4.9
+%dir %{_gcclibdir}/gcc/mips-rtems4.9/%{gcc_version}
+%dir %{_gcclibdir}/gcc/mips-rtems4.9/%{gcc_version}/include
 
-%dir %{gcclib}/mips-rtems4.9/%{gcc_version}/include
 %if "%{gcc_version}" > "4.0.3"
 %if "mips-rtems4.9" != "bfin-rtems4.9"
 %if "mips-rtems4.9" != "avr-rtems4.9"
-%dir %{gcclib}/mips-rtems4.9/%{gcc_version}/include/ssp
+%dir %{_gcclibdir}/gcc/mips-rtems4.9/%{gcc_version}/include/ssp
 %endif
 %endif
 %endif
 
 %if "%{gcc_version}" >= "4.3.0"
-%dir %{gcclib}/mips-rtems4.9/%{gcc_version}/include-fixed
+%{_gcclibdir}/gcc/mips-rtems4.9/%{gcc_version}/include-fixed
 %endif
 
-%dir %{gccexec}
-%dir %{gccexec}/mips-rtems4.9
-%dir %{gccexec}/mips-rtems4.9/%{gcc_version}
-%{gccexec}/mips-rtems4.9/%{gcc_version}/cc1%{_exeext}
-%{gccexec}/mips-rtems4.9/%{gcc_version}/collect2%{_exeext}
-
 # ==============================================================
 # rtems-4.9-gcc-common
 # ==============================================================
@@ -484,6 +674,7 @@
 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
@@ -494,22 +685,21 @@
 
 %files -n rtems-4.9-gcc-common
 %defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_prefix}/share
+
 %dir %{_infodir}
 %ghost %{_infodir}/dir
 %{_infodir}/cpp.info*
 %{_infodir}/cppinternals.info*
 %{_infodir}/gcc.info*
 %{_infodir}/gccint.info*
-%if "%{gcc_version}" >= "3.4"
 %{_infodir}/gccinstall.info*
+%if "%{gcc_version}" >= "4.6.0"
+%{_infodir}/libquadmath.info*
 %endif
 
 %dir %{_mandir}
-%if "%{gcc_version}" < "3.4"
-%dir %{_mandir}/man1
-%{_mandir}/man1/cpp.1*
-%{_mandir}/man1/gcov.1*
-%endif
 %dir %{_mandir}/man7
 %{_mandir}/man7/fsf-funding.7*
 %{_mandir}/man7/gfdl.7*
@@ -520,9 +710,7 @@
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
-%if "%{gcc_version}" >= "3.4"
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
-%endif
 
 %preun -n rtems-4.9-gcc-common
 if [ $1 -eq 0 ]; then
@@ -530,9 +718,7 @@
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || :
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
-%if "%{gcc_version}" >= "3.4"
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
-%endif
 fi
 
 # ==============================================================
@@ -543,12 +729,11 @@
 Group:		Development/Tools
 Version:        %{gcc_rpmvers}
 License:	GPL
+Requires:       rtems-4.9-mips-rtems4.9-gcc-libstdc++ = %{gcc_rpmvers}-%{release}
 
 %if "%{_build}" != "%{_host}"
 BuildRequires:  rtems-4.9-mips-rtems4.9-gcc-c++ = %{gcc_rpmvers}
 %endif
-Provides:	rtems-4.9-mips-rtems4.9-c++ = %{gcc_rpmvers}-%{release}
-Obsoletes:	rtems-4.9-mips-rtems4.9-c++ < %{gcc_rpmvers}-%{release}
 
 Requires:       rtems-4.9-gcc-common
 Requires:       rtems-4.9-mips-rtems4.9-gcc = %{gcc_rpmvers}-%{release}
@@ -556,20 +741,46 @@
 %description -n rtems-4.9-mips-rtems4.9-gcc-c++
 GCC c++ compiler for mips-rtems4.9.
 
-%files -n rtems-4.9-mips-rtems4.9-gcc-c++ -f build/files.g++
+
+%package -n rtems-4.9-mips-rtems4.9-gcc-libstdc++
+Summary:	libstdc++ for mips-rtems4.9
+Group:		Development/Tools
+Version:        %{gcc_rpmvers}
+%{?_with_noarch_subpackages:BuildArch: noarch}
+License:	GPL
+
+%description -n rtems-4.9-mips-rtems4.9-gcc-libstdc++
+%{summary}
+
+
+%files -n rtems-4.9-mips-rtems4.9-gcc-c++
 %defattr(-,root,root)
+%dir %{_prefix}
+
+%dir %{_mandir}
+%dir %{_mandir}/man1
 %{_mandir}/man1/mips-rtems4.9-g++.1*
 
+%dir %{_bindir}
 %{_bindir}/mips-rtems4.9-c++%{_exeext}
 %{_bindir}/mips-rtems4.9-g++%{_exeext}
 
-%dir %{gccexec}
-%dir %{gccexec}/mips-rtems4.9
-%dir %{gccexec}/mips-rtems4.9/%{gcc_version}
-%{gccexec}/mips-rtems4.9/%{gcc_version}/cc1plus%{_exeext}
+%dir %{_libexecdir}
+%dir %{_libexecdir}/gcc
+%dir %{_libexecdir}/gcc/mips-rtems4.9
+%dir %{_libexecdir}/gcc/mips-rtems4.9/%{gcc_version}
+%{_libexecdir}/gcc/mips-rtems4.9/%{gcc_version}/cc1plus%{_exeext}
+
 
-%dir %{gcclib}/mips-rtems4.9/%{gcc_version}/include
-%{gcclib}/mips-rtems4.9/%{gcc_version}/include/c++
+%files -n rtems-4.9-mips-rtems4.9-gcc-libstdc++ -f build/files.g++
+%defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_gcclibdir}
+%dir %{_gcclibdir}/gcc
+%dir %{_gcclibdir}/gcc/mips-rtems4.9
+%dir %{_gcclibdir}/gcc/mips-rtems4.9/%{gcc_version}
+%dir %{_gcclibdir}/gcc/mips-rtems4.9/%{gcc_version}/include
+%{_gcclibdir}/gcc/mips-rtems4.9/%{gcc_version}/include/c++
 
 
 
@@ -581,7 +792,8 @@
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        24%{?dist}
+Release:        25%{?dist}
+%{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.9-newlib-common
 
@@ -590,7 +802,7 @@
 
 %files -n rtems-4.9-mips-rtems4.9-newlib -f build/files.newlib
 %defattr(-,root,root)
-%dir %{_prefix}
+%dir %{_exec_prefix}
 %dir %{_exec_prefix}/mips-rtems4.9
 %{_exec_prefix}/mips-rtems4.9/include
 
@@ -601,7 +813,8 @@
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        24%{?dist}
+Release:        25%{?dist}
+%{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable
 
 Requires(post): 	/sbin/install-info
@@ -612,6 +825,9 @@
 
 %files -n rtems-4.9-newlib-common
 %defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_prefix}/share
+
 %dir %{_infodir}
 %ghost %{_infodir}/dir
 %{_infodir}/libc.info*

diff -u rtems/contrib/crossrpms/rtems4.9/powerpc/rtems-4.9-powerpc-rtems4.9-gcc.spec:1.19.2.9 rtems/contrib/crossrpms/rtems4.9/powerpc/rtems-4.9-powerpc-rtems4.9-gcc.spec:1.19.2.10
--- rtems/contrib/crossrpms/rtems4.9/powerpc/rtems-4.9-powerpc-rtems4.9-gcc.spec:1.19.2.9	Fri Nov 27 04:31:33 2009
+++ rtems/contrib/crossrpms/rtems4.9/powerpc/rtems-4.9-powerpc-rtems4.9-gcc.spec	Sun Aug  7 00:23:35 2011
@@ -53,14 +53,12 @@
 %define newlib_pkgvers		1.16.0
 %define newlib_version		1.16.0
 
-%define mpfr_version	2.3.1
-
 Name:         	rtems-4.9-powerpc-rtems4.9-gcc
 Summary:      	powerpc-rtems4.9 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	24%{?dist}
+Release:      	25%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -69,21 +67,145 @@
 
 BuildRequires:  %{_host_rpmprefix}gcc
 
+# versions of libraries, we conditionally bundle if necessary
+%global mpc_version	0.8.1
+%global mpfr_version	2.4.2
+%global gmp_version	4.3.2
+%global libelf_version  0.8.13
+
+# versions of libraries these distros are known to ship
+%if 0%{?fc16}
+%global mpc_provided 0.8.3
+%global mpfr_provided 3.0.0
+%global gmp_provided 4.3.2
+%endif
+
+%if 0%{?fc15}
+%global mpc_provided 0.8.3
+%global mpfr_provided 3.0.0
+%global gmp_provided 4.3.2
+%endif
+
+%if 0%{?fc14}
+%global mpc_provided 0.8.1
+%global mpfr_provided 2.4.2
+%global gmp_provided 4.3.1
+%endif
+
+%if 0%{?el6}
+%global mpc_provided %{nil}
+%global mpfr_provided 2.4.1
+%global gmp_provided 4.3.1
+%endif
+
+%if 0%{?el5}
+%global mpc_provided %{nil}
+%global mpfr_provided %{nil}
+%global gmp_provided 4.1.4
+%endif
+
+%if 0%{?suse11_3}
+%global mpc_provided 0.8.1
+%global mpfr_provided 2.4.2
+%global gmp_provided 4.3.2
+%endif
+
+%if 0%{?suse11_4}
+%global mpc_provided 0.8.2
+%global mpfr_provided 3.0.0
+%global gmp_provided 5.0.1
+%endif
+
+%if 0%{?cygwin}
+%global mpc_provided 0.8
+%global mpfr_provided 2.4.1
+%global gmp_provided 4.3.1
+%endif
+
+%if 0%{?mingw32}
+%global mpc_provided 0.8.1
+%global mpfr_provided 2.4.1
+%global gmp_provided 4.3.2
+%endif
+
+%if "%{gcc_version}" >= "4.2.0"
+%endif
+
 %if "%{gcc_version}" >= "4.3.0"
-BuildRequires:  gmp-devel >= 4.1
+%define gmp_required		4.1
+%define mpfr_required		2.3.1
+%endif
+
+%if "%{gcc_version}" >= "4.3.3"
+%define cloog_required 		0.15
+%endif
+
+%if "%{gcc_version}" >= "4.4.0"
+%define mpfr_required		2.3.2
+%endif
+
+%if "%{gcc_version}" >= "4.5.0"
+%define mpc_required 		0.8
+%if %{with lto}
+%define libelf_required 	0.8.12
+%endif
+%endif
+
+%if %{defined mpc_required}
+%if "%{mpc_provided}" >= "%{mpc_required}"
+%{?fedora:BuildRequires: libmpc-devel >= %{mpc_required}}
+%{?suse:BuildRequires: mpc-devel >= %{mpc_required}}
 %if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}gmp-devel
-BuildRequires:  %{_host_rpmprefix}mpfr-devel
+BuildRequires:  %{_host_rpmprefix}mpc-devel >= %{mpc_required}
 %endif
-%if 0%{?fedora} >= 8
-BuildRequires:  mpfr-devel >= 2.3.0
+%else
+%define _build_mpc 1
+%define gmp_required 		4.2
+%endif
+%endif
+
+%if %{defined gmp_required}
+%if "%{gmp_provided}" >= "%{gmp_required}"
+BuildRequires: gmp-devel >= %{gmp_required}
+%if "%{_build}" != "%{_host}"
+BuildRequires:  %{_host_rpmprefix}gmp-devel >= %{gmp_required}
+%endif
+%else
+%define _build_gmp 1
+%endif
+%endif
+
+%if %{defined libelf_required}
+%if "%{libelf_provided}" >= "%{libelf_required}"
+BuildRequires: libelf-devel >= %{libelf_required}
+%if "%{_build}" != "%{_host}"
+BuildRequires:  %{_host_rpmprefix}libelf-devel >= %{libelf_required}
+%endif
+%else
+%define _build_libelf 1
+%endif
+%endif
+
+
+%if %{defined cloog_required}
+%{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required}
+%{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required}
+%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required}
+%{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required}
+%{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
+%{?suse11_3:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
+%endif
+
+
+%if %{defined mpfr_required}
+%if "%{mpfr_provided}" >= "%{mpfr_required}"
+BuildRequires: mpfr-devel >= %{mpfr_required}
+%if "%{_build}" != "%{_host}"
+BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
 %endif
-%if "%{?suse}" > "10.3"
-BuildRequires:  mpfr-devel >= 2.3.0
+%else
+%define _build_mpfr 1
 %endif
-# These distros ship an insufficient mpfr
-%{?el4:%define 	_build_mpfr 	1}
-%{?suse10_3:%define 	_build_mpfr 	1}
 %endif
 
 %if "%{_build}" != "%{_host}"
@@ -100,17 +222,19 @@
 
 Requires:	rtems-4.9-gcc-common
 Requires:	rtems-4.9-powerpc-rtems4.9-binutils
-Requires:	rtems-4.9-powerpc-rtems4.9-newlib = %{newlib_version}-24%{?dist}
+Requires:	rtems-4.9-powerpc-rtems4.9-gcc-libgcc = %{gcc_rpmvers}-%{release}
+Requires:	rtems-4.9-powerpc-rtems4.9-newlib = %{newlib_version}-25%{?dist}
 
-
-%if "%{gcc_version}" >= "3.4"
-%define gcclib %{_libdir}/gcc
-%define gccexec %{_libexecdir}/gcc
+%if "%{gcc_version}" >= "4.5.0"
+BuildRequires:  zlib-devel
+%if "%{_build}" != "%{_host}"
+BuildRequires:  %{_host_rpmprefix}zlib-devel
+%endif
 %else
-%define gcclib %{_libdir}/gcc-lib
-%define gccexec %{_libdir}/gcc-lib
 %endif
 
+%global _gcclibdir %{_prefix}/lib
+
 %if "%{gcc_version}" == "4.3.2"
 Source0:	ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
 Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20090825.diff
@@ -131,8 +255,20 @@
 %endif
 %{?_without_sources:NoSource:	50}
 
-%if "%{gcc_version}" >= "4.3.0"
-Source60:    http://www.mpfr.org/mpfr-current/mpfr-%{mpfr_version}.tar.bz2
+%if 0%{?_build_mpfr}
+Source60:    http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.bz2
+%endif
+
+%if 0%{?_build_mpc}
+Source61:    http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.gz
+%endif
+
+%if 0%{?_build_gmp}
+Source62:    ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2
+%endif
+
+%if 0%{?_build_libelf}
+Source63:    http://www.mr511.de/software/libelf-%{libelf_version}.tar.gz
 %endif
 
 %description
@@ -142,10 +278,14 @@
 %setup -c -T -n %{name}-%{version}
 
 %setup -q -T -D -n %{name}-%{version} -a0
-%{?PATCH0:%patch0 -p0}
+cd gcc-%{gcc_pkgvers}
+%{?PATCH0:%patch0 -p1}
+cd ..
 
 %setup -q -T -D -n %{name}-%{version} -a1
-%{?PATCH1:%patch1 -p0}
+cd gcc-%{gcc_pkgvers}
+%{?PATCH1:%patch1 -p1}
+cd ..
 
 
 
@@ -157,6 +297,9 @@
 cd ..
   # Copy the C library into gcc's source tree
   ln -s ../newlib-%{newlib_version}/newlib gcc-%{gcc_pkgvers}
+  # Make sure not to be using GPL'ed sources
+  rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/linux
+  rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/rdos
 
 %if 0%{?_build_mpfr}
 %setup -q -T -D -n %{name}-%{version} -a60
@@ -165,7 +308,28 @@
   ln -s ../mpfr-%{mpfr_version} gcc-%{gcc_pkgvers}/mpfr
 %endif
 
-echo "RTEMS gcc-%{gcc_version}-24%{?dist}\/newlib-%{newlib_version}-24%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+%if 0%{?_build_mpc}
+%setup -q -T -D -n %{name}-%{version} -a61
+%{?PATCH61:%patch61 -p1}
+  # Build mpc one-tree style
+  ln -s ../mpc-%{mpc_version} gcc-%{gcc_pkgvers}/mpc
+%endif
+
+%if 0%{?_build_gmp}
+%setup -q -T -D -n %{name}-%{version} -a62
+%{?PATCH62:%patch62 -p1}
+  # Build gmp one-tree style
+  ln -s ../gmp-%{gmp_version} gcc-%{gcc_pkgvers}/gmp
+%endif
+
+%if 0%{?_build_libelf}
+%setup -q -T -D -n %{name}-%{version} -a63
+%{?PATCH63:%patch63 -p1}
+  # Build libelf one-tree style
+  ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
+%endif
+
+echo "RTEMS gcc-%{gcc_version}-25%{?dist}\/newlib-%{newlib_version}-25%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -192,7 +356,7 @@
     --bindir=%{_bindir} \
     --exec_prefix=%{_exec_prefix} \
     --includedir=%{_includedir} \
-    --libdir=%{_libdir} \
+    --libdir=%{_gcclibdir} \
     --libexecdir=%{_libexecdir} \
     --mandir=%{_mandir} \
     --infodir=%{_infodir} \
@@ -208,7 +372,7 @@
     --enable-version-specific-runtime-libs \
     --enable-threads \
     --enable-newlib-io-c99-formats \
-    --enable-languages="$languages" $optargs
+    --enable-languages="$languages"
 
 %if "%_host" != "%_build"
   # Bug in gcc-3.2.1:
@@ -238,12 +402,19 @@
 # Misplaced header file
   if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then
     mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \
-      $RPM_BUILD_ROOT%{gcclib}/powerpc-rtems4.9/%{gcc_version}/include/
+      $RPM_BUILD_ROOT%{_gcclibdir}/gcc/powerpc-rtems4.9/%{gcc_version}/include/
   fi
 %endif
 
   # host library
+%if "%{gcc_version}" >= "4.2.0"
+  # libiberty doesn't honor --libdir, but always installs to a 
+  # magically guessed _libdir
   rm -f  ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a
+%else
+  # libiberty installs to --libdir=...
+  rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a
+%endif
 
   # We use the version from binutils
   rm -f $RPM_BUILD_ROOT%{_bindir}/powerpc-rtems4.9-c++filt%{_exeext}
@@ -253,18 +424,16 @@
   rm -f $RPM_BUILD_ROOT%{_infodir}/dir
   touch $RPM_BUILD_ROOT%{_infodir}/dir
 
+  # We don't want libffi's man-pages
+  rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*ffi*
 
-%if "%{gcc_version}" >= "3.4"
   # Bug in gcc-3.4.0pre
   rm -f $RPM_BUILD_ROOT%{_bindir}/powerpc-rtems4.9-powerpc-rtems4.9-gcjh%{_exeext}
-%endif
 
-%if "%{gcc_version}" >= "3.3"
   # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs
   # the fixinclude-install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{gcclib}/powerpc-rtems4.9/%{gcc_version}/install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{gccexec}/powerpc-rtems4.9/%{gcc_version}/install-tools
-%endif
+  rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/powerpc-rtems4.9/%{gcc_version}/install-tools
+  rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/powerpc-rtems4.9/%{gcc_version}/install-tools
 
   # Bug in gcc > 4.1.0: Installs an unused, empty directory
   if test -d ${RPM_BUILD_ROOT}%{_prefix}/powerpc-rtems4.9/include/bits; then
@@ -272,11 +441,11 @@
   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.9/lib"
-  for i in $f; do
+  for i in $multilibs; do
     case $i in
     \.) echo "%dir ${TGTDIR}" >> build/files.newlib
       ;;
@@ -287,19 +456,10 @@
 
   rm -f dirs ;
   echo "%defattr(-,root,root,-)" >> dirs
-  echo "%dir %{_prefix}" >> dirs
-  echo "%dir %{_libdir}" >> dirs
-%if "%{gcc_version}" >= "3.4"
-  echo "%dir %{_libexecdir}" >> dirs
-%endif
-  echo "%dir %{gcclib}" >> dirs
-  echo "%dir %{gcclib}/powerpc-rtems4.9" >> dirs
-
-  TGTDIR="%{gcclib}/powerpc-rtems4.9/%{gcc_version}"
-  for i in $f; do
+  TGTDIR="%{_gcclibdir}/gcc/powerpc-rtems4.9/%{gcc_version}"
+  for i in $multilibs; do
     case $i in
-    \.) echo "%dir ${TGTDIR}" >> dirs
-      ;;
+    \.) ;; # ignore, handled elsewhere
     *)  echo "%dir ${TGTDIR}/$i" >> dirs
       ;;
     esac
@@ -312,7 +472,7 @@
   cp dirs build/files.gcj
   cp dirs build/files.g++
 
-  TGTDIR="%{gcclib}/powerpc-rtems4.9/%{gcc_version}"
+  TGTDIR="%{_gcclibdir}/gcc/powerpc-rtems4.9/%{gcc_version}"
   f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
   for i in $f; do
     case $i in
@@ -327,6 +487,8 @@
     *include/objc*) ;;
     *include/g++*);;
     *include/c++*);;
+    *include-fixed/*);;
+    *finclude/*);;
     *adainclude*);;
     *adalib*);;
     *gnat1);;
@@ -381,7 +543,7 @@
 cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
 #!/bin/sh
 grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/powerpc-rtems4.9/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/powerpc-rtems4.9/' | %__find_provides
+  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/powerpc-rtems4.9/'} | %__find_provides
 EOF
 chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
 %define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
@@ -389,7 +551,7 @@
 cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
 #!/bin/sh
 grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/powerpc-rtems4.9/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/powerpc-rtems4.9/' | %__find_requires
+  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/powerpc-rtems4.9/'} | %__find_requires
 EOF
 chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
 %define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
@@ -429,7 +591,7 @@
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.9-powerpc-rtems4.9-binutils
-# Requires:       rtems-4.9-powerpc-rtems4.9-newlib = %{newlib_version}-24%{?dist}
+# Requires:       rtems-4.9-powerpc-rtems4.9-newlib = %{newlib_version}-25%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -439,44 +601,72 @@
 %description -n rtems-4.9-powerpc-rtems4.9-gcc
 GNU cc compiler for powerpc-rtems4.9.
 
-%files -n rtems-4.9-powerpc-rtems4.9-gcc -f build/files.gcc
+# ==============================================================
+# rtems-4.9-powerpc-rtems4.9-gcc-libgcc
+# ==============================================================
+%package -n rtems-4.9-powerpc-rtems4.9-gcc-libgcc
+Summary:        libgcc for powerpc-rtems4.9-gcc
+Group:          Development/Tools
+Version:        %{gcc_rpmvers}
+%{?_with_noarch_subpackages:BuildArch: noarch}
+Requires:       rtems-4.9-powerpc-rtems4.9-newlib = %{newlib_version}-25%{?dist}
+License:	GPL
+
+%description -n rtems-4.9-powerpc-rtems4.9-gcc-libgcc
+libgcc powerpc-rtems4.9-gcc.
+
+
+%files -n rtems-4.9-powerpc-rtems4.9-gcc
 %defattr(-,root,root)
+%dir %{_prefix}
+
 %dir %{_mandir}
 %dir %{_mandir}/man1
 %{_mandir}/man1/powerpc-rtems4.9-gcc.1*
-%if "%{gcc_version}" >= "3.4"
 %{_mandir}/man1/powerpc-rtems4.9-cpp.1*
 %{_mandir}/man1/powerpc-rtems4.9-gcov.1*
-%endif
 
 %dir %{_bindir}
 %{_bindir}/powerpc-rtems4.9-cpp%{_exeext}
 %{_bindir}/powerpc-rtems4.9-gcc%{_exeext}
-%if "%{gcc_version}" >= "3.3"
 %{_bindir}/powerpc-rtems4.9-gcc-%{gcc_version}%{_exeext}
-%endif
 %{_bindir}/powerpc-rtems4.9-gcov%{_exeext}
+%if "%{gcc_version}" < "4.6.0"
 %{_bindir}/powerpc-rtems4.9-gccbug
+%endif
+
+%dir %{_libexecdir}
+%dir %{_libexecdir}/gcc
+%dir %{_libexecdir}/gcc/powerpc-rtems4.9
+%dir %{_libexecdir}/gcc/powerpc-rtems4.9/%{gcc_version}
+%{_libexecdir}/gcc/powerpc-rtems4.9/%{gcc_version}/cc1%{_exeext}
+%{_libexecdir}/gcc/powerpc-rtems4.9/%{gcc_version}/collect2%{_exeext}
+%if "%{gcc_version}" >= "4.5.0"
+%{?with_lto:%{_libexecdir}/gcc/powerpc-rtems4.9/%{gcc_version}/lto%{_exeext}}
+%{_libexecdir}/gcc/powerpc-rtems4.9/%{gcc_version}/lto-wrapper%{_exeext}
+%endif
+
+%files -n rtems-4.9-powerpc-rtems4.9-gcc-libgcc -f build/files.gcc
+%defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_gcclibdir}
+%dir %{_gcclibdir}/gcc
+%dir %{_gcclibdir}/gcc/powerpc-rtems4.9
+%dir %{_gcclibdir}/gcc/powerpc-rtems4.9/%{gcc_version}
+%dir %{_gcclibdir}/gcc/powerpc-rtems4.9/%{gcc_version}/include
 
-%dir %{gcclib}/powerpc-rtems4.9/%{gcc_version}/include
 %if "%{gcc_version}" > "4.0.3"
 %if "powerpc-rtems4.9" != "bfin-rtems4.9"
 %if "powerpc-rtems4.9" != "avr-rtems4.9"
-%dir %{gcclib}/powerpc-rtems4.9/%{gcc_version}/include/ssp
+%dir %{_gcclibdir}/gcc/powerpc-rtems4.9/%{gcc_version}/include/ssp
 %endif
 %endif
 %endif
 
 %if "%{gcc_version}" >= "4.3.0"
-%dir %{gcclib}/powerpc-rtems4.9/%{gcc_version}/include-fixed
+%{_gcclibdir}/gcc/powerpc-rtems4.9/%{gcc_version}/include-fixed
 %endif
 
-%dir %{gccexec}
-%dir %{gccexec}/powerpc-rtems4.9
-%dir %{gccexec}/powerpc-rtems4.9/%{gcc_version}
-%{gccexec}/powerpc-rtems4.9/%{gcc_version}/cc1%{_exeext}
-%{gccexec}/powerpc-rtems4.9/%{gcc_version}/collect2%{_exeext}
-
 # ==============================================================
 # rtems-4.9-gcc-common
 # ==============================================================
@@ -484,6 +674,7 @@
 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
@@ -494,22 +685,21 @@
 
 %files -n rtems-4.9-gcc-common
 %defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_prefix}/share
+
 %dir %{_infodir}
 %ghost %{_infodir}/dir
 %{_infodir}/cpp.info*
 %{_infodir}/cppinternals.info*
 %{_infodir}/gcc.info*
 %{_infodir}/gccint.info*
-%if "%{gcc_version}" >= "3.4"
 %{_infodir}/gccinstall.info*
+%if "%{gcc_version}" >= "4.6.0"
+%{_infodir}/libquadmath.info*
 %endif
 
 %dir %{_mandir}
-%if "%{gcc_version}" < "3.4"
-%dir %{_mandir}/man1
-%{_mandir}/man1/cpp.1*
-%{_mandir}/man1/gcov.1*
-%endif
 %dir %{_mandir}/man7
 %{_mandir}/man7/fsf-funding.7*
 %{_mandir}/man7/gfdl.7*
@@ -520,9 +710,7 @@
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
-%if "%{gcc_version}" >= "3.4"
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
-%endif
 
 %preun -n rtems-4.9-gcc-common
 if [ $1 -eq 0 ]; then
@@ -530,9 +718,7 @@
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || :
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
-%if "%{gcc_version}" >= "3.4"
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
-%endif
 fi
 
 # ==============================================================
@@ -543,12 +729,11 @@
 Group:		Development/Tools
 Version:        %{gcc_rpmvers}
 License:	GPL
+Requires:       rtems-4.9-powerpc-rtems4.9-gcc-libstdc++ = %{gcc_rpmvers}-%{release}
 
 %if "%{_build}" != "%{_host}"
 BuildRequires:  rtems-4.9-powerpc-rtems4.9-gcc-c++ = %{gcc_rpmvers}
 %endif
-Provides:	rtems-4.9-powerpc-rtems4.9-c++ = %{gcc_rpmvers}-%{release}
-Obsoletes:	rtems-4.9-powerpc-rtems4.9-c++ < %{gcc_rpmvers}-%{release}
 
 Requires:       rtems-4.9-gcc-common
 Requires:       rtems-4.9-powerpc-rtems4.9-gcc = %{gcc_rpmvers}-%{release}
@@ -556,20 +741,46 @@
 %description -n rtems-4.9-powerpc-rtems4.9-gcc-c++
 GCC c++ compiler for powerpc-rtems4.9.
 
-%files -n rtems-4.9-powerpc-rtems4.9-gcc-c++ -f build/files.g++
+
+%package -n rtems-4.9-powerpc-rtems4.9-gcc-libstdc++
+Summary:	libstdc++ for powerpc-rtems4.9
+Group:		Development/Tools
+Version:        %{gcc_rpmvers}
+%{?_with_noarch_subpackages:BuildArch: noarch}
+License:	GPL
+
+%description -n rtems-4.9-powerpc-rtems4.9-gcc-libstdc++
+%{summary}
+
+
+%files -n rtems-4.9-powerpc-rtems4.9-gcc-c++
 %defattr(-,root,root)
+%dir %{_prefix}
+
+%dir %{_mandir}
+%dir %{_mandir}/man1
 %{_mandir}/man1/powerpc-rtems4.9-g++.1*
 
+%dir %{_bindir}
 %{_bindir}/powerpc-rtems4.9-c++%{_exeext}
 %{_bindir}/powerpc-rtems4.9-g++%{_exeext}
 
-%dir %{gccexec}
-%dir %{gccexec}/powerpc-rtems4.9
-%dir %{gccexec}/powerpc-rtems4.9/%{gcc_version}
-%{gccexec}/powerpc-rtems4.9/%{gcc_version}/cc1plus%{_exeext}
+%dir %{_libexecdir}
+%dir %{_libexecdir}/gcc
+%dir %{_libexecdir}/gcc/powerpc-rtems4.9
+%dir %{_libexecdir}/gcc/powerpc-rtems4.9/%{gcc_version}
+%{_libexecdir}/gcc/powerpc-rtems4.9/%{gcc_version}/cc1plus%{_exeext}
+
 
-%dir %{gcclib}/powerpc-rtems4.9/%{gcc_version}/include
-%{gcclib}/powerpc-rtems4.9/%{gcc_version}/include/c++
+%files -n rtems-4.9-powerpc-rtems4.9-gcc-libstdc++ -f build/files.g++
+%defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_gcclibdir}
+%dir %{_gcclibdir}/gcc
+%dir %{_gcclibdir}/gcc/powerpc-rtems4.9
+%dir %{_gcclibdir}/gcc/powerpc-rtems4.9/%{gcc_version}
+%dir %{_gcclibdir}/gcc/powerpc-rtems4.9/%{gcc_version}/include
+%{_gcclibdir}/gcc/powerpc-rtems4.9/%{gcc_version}/include/c++
 
 
 
@@ -581,7 +792,8 @@
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        24%{?dist}
+Release:        25%{?dist}
+%{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.9-newlib-common
 
@@ -590,7 +802,7 @@
 
 %files -n rtems-4.9-powerpc-rtems4.9-newlib -f build/files.newlib
 %defattr(-,root,root)
-%dir %{_prefix}
+%dir %{_exec_prefix}
 %dir %{_exec_prefix}/powerpc-rtems4.9
 %{_exec_prefix}/powerpc-rtems4.9/include
 
@@ -601,7 +813,8 @@
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        24%{?dist}
+Release:        25%{?dist}
+%{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable
 
 Requires(post): 	/sbin/install-info
@@ -612,6 +825,9 @@
 
 %files -n rtems-4.9-newlib-common
 %defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_prefix}/share
+
 %dir %{_infodir}
 %ghost %{_infodir}/dir
 %{_infodir}/libc.info*

diff -u rtems/contrib/crossrpms/rtems4.9/sh/rtems-4.9-sh-rtems4.9-gcc.spec:1.19.2.9 rtems/contrib/crossrpms/rtems4.9/sh/rtems-4.9-sh-rtems4.9-gcc.spec:1.19.2.10
--- rtems/contrib/crossrpms/rtems4.9/sh/rtems-4.9-sh-rtems4.9-gcc.spec:1.19.2.9	Fri Nov 27 04:31:33 2009
+++ rtems/contrib/crossrpms/rtems4.9/sh/rtems-4.9-sh-rtems4.9-gcc.spec	Sun Aug  7 00:23:35 2011
@@ -53,14 +53,12 @@
 %define newlib_pkgvers		1.16.0
 %define newlib_version		1.16.0
 
-%define mpfr_version	2.3.1
-
 Name:         	rtems-4.9-sh-rtems4.9-gcc
 Summary:      	sh-rtems4.9 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	24%{?dist}
+Release:      	25%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -69,21 +67,145 @@
 
 BuildRequires:  %{_host_rpmprefix}gcc
 
+# versions of libraries, we conditionally bundle if necessary
+%global mpc_version	0.8.1
+%global mpfr_version	2.4.2
+%global gmp_version	4.3.2
+%global libelf_version  0.8.13
+
+# versions of libraries these distros are known to ship
+%if 0%{?fc16}
+%global mpc_provided 0.8.3
+%global mpfr_provided 3.0.0
+%global gmp_provided 4.3.2
+%endif
+
+%if 0%{?fc15}
+%global mpc_provided 0.8.3
+%global mpfr_provided 3.0.0
+%global gmp_provided 4.3.2
+%endif
+
+%if 0%{?fc14}
+%global mpc_provided 0.8.1
+%global mpfr_provided 2.4.2
+%global gmp_provided 4.3.1
+%endif
+
+%if 0%{?el6}
+%global mpc_provided %{nil}
+%global mpfr_provided 2.4.1
+%global gmp_provided 4.3.1
+%endif
+
+%if 0%{?el5}
+%global mpc_provided %{nil}
+%global mpfr_provided %{nil}
+%global gmp_provided 4.1.4
+%endif
+
+%if 0%{?suse11_3}
+%global mpc_provided 0.8.1
+%global mpfr_provided 2.4.2
+%global gmp_provided 4.3.2
+%endif
+
+%if 0%{?suse11_4}
+%global mpc_provided 0.8.2
+%global mpfr_provided 3.0.0
+%global gmp_provided 5.0.1
+%endif
+
+%if 0%{?cygwin}
+%global mpc_provided 0.8
+%global mpfr_provided 2.4.1
+%global gmp_provided 4.3.1
+%endif
+
+%if 0%{?mingw32}
+%global mpc_provided 0.8.1
+%global mpfr_provided 2.4.1
+%global gmp_provided 4.3.2
+%endif
+
+%if "%{gcc_version}" >= "4.2.0"
+%endif
+
 %if "%{gcc_version}" >= "4.3.0"
-BuildRequires:  gmp-devel >= 4.1
+%define gmp_required		4.1
+%define mpfr_required		2.3.1
+%endif
+
+%if "%{gcc_version}" >= "4.3.3"
+%define cloog_required 		0.15
+%endif
+
+%if "%{gcc_version}" >= "4.4.0"
+%define mpfr_required		2.3.2
+%endif
+
+%if "%{gcc_version}" >= "4.5.0"
+%define mpc_required 		0.8
+%if %{with lto}
+%define libelf_required 	0.8.12
+%endif
+%endif
+
+%if %{defined mpc_required}
+%if "%{mpc_provided}" >= "%{mpc_required}"
+%{?fedora:BuildRequires: libmpc-devel >= %{mpc_required}}
+%{?suse:BuildRequires: mpc-devel >= %{mpc_required}}
 %if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}gmp-devel
-BuildRequires:  %{_host_rpmprefix}mpfr-devel
+BuildRequires:  %{_host_rpmprefix}mpc-devel >= %{mpc_required}
 %endif
-%if 0%{?fedora} >= 8
-BuildRequires:  mpfr-devel >= 2.3.0
+%else
+%define _build_mpc 1
+%define gmp_required 		4.2
+%endif
+%endif
+
+%if %{defined gmp_required}
+%if "%{gmp_provided}" >= "%{gmp_required}"
+BuildRequires: gmp-devel >= %{gmp_required}
+%if "%{_build}" != "%{_host}"
+BuildRequires:  %{_host_rpmprefix}gmp-devel >= %{gmp_required}
+%endif
+%else
+%define _build_gmp 1
+%endif
+%endif
+
+%if %{defined libelf_required}
+%if "%{libelf_provided}" >= "%{libelf_required}"
+BuildRequires: libelf-devel >= %{libelf_required}
+%if "%{_build}" != "%{_host}"
+BuildRequires:  %{_host_rpmprefix}libelf-devel >= %{libelf_required}
+%endif
+%else
+%define _build_libelf 1
+%endif
+%endif
+
+
+%if %{defined cloog_required}
+%{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required}
+%{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required}
+%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required}
+%{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required}
+%{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
+%{?suse11_3:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
+%endif
+
+
+%if %{defined mpfr_required}
+%if "%{mpfr_provided}" >= "%{mpfr_required}"
+BuildRequires: mpfr-devel >= %{mpfr_required}
+%if "%{_build}" != "%{_host}"
+BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
 %endif
-%if "%{?suse}" > "10.3"
-BuildRequires:  mpfr-devel >= 2.3.0
+%else
+%define _build_mpfr 1
 %endif
-# These distros ship an insufficient mpfr
-%{?el4:%define 	_build_mpfr 	1}
-%{?suse10_3:%define 	_build_mpfr 	1}
 %endif
 
 %if "%{_build}" != "%{_host}"
@@ -100,17 +222,19 @@
 
 Requires:	rtems-4.9-gcc-common
 Requires:	rtems-4.9-sh-rtems4.9-binutils
-Requires:	rtems-4.9-sh-rtems4.9-newlib = %{newlib_version}-24%{?dist}
+Requires:	rtems-4.9-sh-rtems4.9-gcc-libgcc = %{gcc_rpmvers}-%{release}
+Requires:	rtems-4.9-sh-rtems4.9-newlib = %{newlib_version}-25%{?dist}
 
-
-%if "%{gcc_version}" >= "3.4"
-%define gcclib %{_libdir}/gcc
-%define gccexec %{_libexecdir}/gcc
+%if "%{gcc_version}" >= "4.5.0"
+BuildRequires:  zlib-devel
+%if "%{_build}" != "%{_host}"
+BuildRequires:  %{_host_rpmprefix}zlib-devel
+%endif
 %else
-%define gcclib %{_libdir}/gcc-lib
-%define gccexec %{_libdir}/gcc-lib
 %endif
 
+%global _gcclibdir %{_prefix}/lib
+
 %if "%{gcc_version}" == "4.3.2"
 Source0:	ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
 Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20090825.diff
@@ -131,8 +255,20 @@
 %endif
 %{?_without_sources:NoSource:	50}
 
-%if "%{gcc_version}" >= "4.3.0"
-Source60:    http://www.mpfr.org/mpfr-current/mpfr-%{mpfr_version}.tar.bz2
+%if 0%{?_build_mpfr}
+Source60:    http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.bz2
+%endif
+
+%if 0%{?_build_mpc}
+Source61:    http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.gz
+%endif
+
+%if 0%{?_build_gmp}
+Source62:    ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2
+%endif
+
+%if 0%{?_build_libelf}
+Source63:    http://www.mr511.de/software/libelf-%{libelf_version}.tar.gz
 %endif
 
 %description
@@ -142,10 +278,14 @@
 %setup -c -T -n %{name}-%{version}
 
 %setup -q -T -D -n %{name}-%{version} -a0
-%{?PATCH0:%patch0 -p0}
+cd gcc-%{gcc_pkgvers}
+%{?PATCH0:%patch0 -p1}
+cd ..
 
 %setup -q -T -D -n %{name}-%{version} -a1
-%{?PATCH1:%patch1 -p0}
+cd gcc-%{gcc_pkgvers}
+%{?PATCH1:%patch1 -p1}
+cd ..
 
 
 
@@ -157,6 +297,9 @@
 cd ..
   # Copy the C library into gcc's source tree
   ln -s ../newlib-%{newlib_version}/newlib gcc-%{gcc_pkgvers}
+  # Make sure not to be using GPL'ed sources
+  rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/linux
+  rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/rdos
 
 %if 0%{?_build_mpfr}
 %setup -q -T -D -n %{name}-%{version} -a60
@@ -165,7 +308,28 @@
   ln -s ../mpfr-%{mpfr_version} gcc-%{gcc_pkgvers}/mpfr
 %endif
 
-echo "RTEMS gcc-%{gcc_version}-24%{?dist}\/newlib-%{newlib_version}-24%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+%if 0%{?_build_mpc}
+%setup -q -T -D -n %{name}-%{version} -a61
+%{?PATCH61:%patch61 -p1}
+  # Build mpc one-tree style
+  ln -s ../mpc-%{mpc_version} gcc-%{gcc_pkgvers}/mpc
+%endif
+
+%if 0%{?_build_gmp}
+%setup -q -T -D -n %{name}-%{version} -a62
+%{?PATCH62:%patch62 -p1}
+  # Build gmp one-tree style
+  ln -s ../gmp-%{gmp_version} gcc-%{gcc_pkgvers}/gmp
+%endif
+
+%if 0%{?_build_libelf}
+%setup -q -T -D -n %{name}-%{version} -a63
+%{?PATCH63:%patch63 -p1}
+  # Build libelf one-tree style
+  ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
+%endif
+
+echo "RTEMS gcc-%{gcc_version}-25%{?dist}\/newlib-%{newlib_version}-25%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -192,7 +356,7 @@
     --bindir=%{_bindir} \
     --exec_prefix=%{_exec_prefix} \
     --includedir=%{_includedir} \
-    --libdir=%{_libdir} \
+    --libdir=%{_gcclibdir} \
     --libexecdir=%{_libexecdir} \
     --mandir=%{_mandir} \
     --infodir=%{_infodir} \
@@ -208,7 +372,7 @@
     --enable-version-specific-runtime-libs \
     --enable-threads \
     --enable-newlib-io-c99-formats \
-    --enable-languages="$languages" $optargs
+    --enable-languages="$languages"
 
 %if "%_host" != "%_build"
   # Bug in gcc-3.2.1:
@@ -238,12 +402,19 @@
 # Misplaced header file
   if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then
     mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \
-      $RPM_BUILD_ROOT%{gcclib}/sh-rtems4.9/%{gcc_version}/include/
+      $RPM_BUILD_ROOT%{_gcclibdir}/gcc/sh-rtems4.9/%{gcc_version}/include/
   fi
 %endif
 
   # host library
+%if "%{gcc_version}" >= "4.2.0"
+  # libiberty doesn't honor --libdir, but always installs to a 
+  # magically guessed _libdir
   rm -f  ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a
+%else
+  # libiberty installs to --libdir=...
+  rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a
+%endif
 
   # We use the version from binutils
   rm -f $RPM_BUILD_ROOT%{_bindir}/sh-rtems4.9-c++filt%{_exeext}
@@ -253,18 +424,16 @@
   rm -f $RPM_BUILD_ROOT%{_infodir}/dir
   touch $RPM_BUILD_ROOT%{_infodir}/dir
 
+  # We don't want libffi's man-pages
+  rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*ffi*
 
-%if "%{gcc_version}" >= "3.4"
   # Bug in gcc-3.4.0pre
   rm -f $RPM_BUILD_ROOT%{_bindir}/sh-rtems4.9-sh-rtems4.9-gcjh%{_exeext}
-%endif
 
-%if "%{gcc_version}" >= "3.3"
   # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs
   # the fixinclude-install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{gcclib}/sh-rtems4.9/%{gcc_version}/install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{gccexec}/sh-rtems4.9/%{gcc_version}/install-tools
-%endif
+  rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/sh-rtems4.9/%{gcc_version}/install-tools
+  rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/sh-rtems4.9/%{gcc_version}/install-tools
 
   # Bug in gcc > 4.1.0: Installs an unused, empty directory
   if test -d ${RPM_BUILD_ROOT}%{_prefix}/sh-rtems4.9/include/bits; then
@@ -272,11 +441,11 @@
   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.9/lib"
-  for i in $f; do
+  for i in $multilibs; do
     case $i in
     \.) echo "%dir ${TGTDIR}" >> build/files.newlib
       ;;
@@ -287,19 +456,10 @@
 
   rm -f dirs ;
   echo "%defattr(-,root,root,-)" >> dirs
-  echo "%dir %{_prefix}" >> dirs
-  echo "%dir %{_libdir}" >> dirs
-%if "%{gcc_version}" >= "3.4"
-  echo "%dir %{_libexecdir}" >> dirs
-%endif
-  echo "%dir %{gcclib}" >> dirs
-  echo "%dir %{gcclib}/sh-rtems4.9" >> dirs
-
-  TGTDIR="%{gcclib}/sh-rtems4.9/%{gcc_version}"
-  for i in $f; do
+  TGTDIR="%{_gcclibdir}/gcc/sh-rtems4.9/%{gcc_version}"
+  for i in $multilibs; do
     case $i in
-    \.) echo "%dir ${TGTDIR}" >> dirs
-      ;;
+    \.) ;; # ignore, handled elsewhere
     *)  echo "%dir ${TGTDIR}/$i" >> dirs
       ;;
     esac
@@ -312,7 +472,7 @@
   cp dirs build/files.gcj
   cp dirs build/files.g++
 
-  TGTDIR="%{gcclib}/sh-rtems4.9/%{gcc_version}"
+  TGTDIR="%{_gcclibdir}/gcc/sh-rtems4.9/%{gcc_version}"
   f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
   for i in $f; do
     case $i in
@@ -327,6 +487,8 @@
     *include/objc*) ;;
     *include/g++*);;
     *include/c++*);;
+    *include-fixed/*);;
+    *finclude/*);;
     *adainclude*);;
     *adalib*);;
     *gnat1);;
@@ -381,7 +543,7 @@
 cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
 #!/bin/sh
 grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/sh-rtems4.9/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/sh-rtems4.9/' | %__find_provides
+  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/sh-rtems4.9/'} | %__find_provides
 EOF
 chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
 %define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
@@ -389,7 +551,7 @@
 cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
 #!/bin/sh
 grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/sh-rtems4.9/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/sh-rtems4.9/' | %__find_requires
+  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/sh-rtems4.9/'} | %__find_requires
 EOF
 chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
 %define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
@@ -429,7 +591,7 @@
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.9-sh-rtems4.9-binutils
-# Requires:       rtems-4.9-sh-rtems4.9-newlib = %{newlib_version}-24%{?dist}
+# Requires:       rtems-4.9-sh-rtems4.9-newlib = %{newlib_version}-25%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -439,44 +601,72 @@
 %description -n rtems-4.9-sh-rtems4.9-gcc
 GNU cc compiler for sh-rtems4.9.
 
-%files -n rtems-4.9-sh-rtems4.9-gcc -f build/files.gcc
+# ==============================================================
+# rtems-4.9-sh-rtems4.9-gcc-libgcc
+# ==============================================================
+%package -n rtems-4.9-sh-rtems4.9-gcc-libgcc
+Summary:        libgcc for sh-rtems4.9-gcc
+Group:          Development/Tools
+Version:        %{gcc_rpmvers}
+%{?_with_noarch_subpackages:BuildArch: noarch}
+Requires:       rtems-4.9-sh-rtems4.9-newlib = %{newlib_version}-25%{?dist}
+License:	GPL
+
+%description -n rtems-4.9-sh-rtems4.9-gcc-libgcc
+libgcc sh-rtems4.9-gcc.
+
+
+%files -n rtems-4.9-sh-rtems4.9-gcc
 %defattr(-,root,root)
+%dir %{_prefix}
+
 %dir %{_mandir}
 %dir %{_mandir}/man1
 %{_mandir}/man1/sh-rtems4.9-gcc.1*
-%if "%{gcc_version}" >= "3.4"
 %{_mandir}/man1/sh-rtems4.9-cpp.1*
 %{_mandir}/man1/sh-rtems4.9-gcov.1*
-%endif
 
 %dir %{_bindir}
 %{_bindir}/sh-rtems4.9-cpp%{_exeext}
 %{_bindir}/sh-rtems4.9-gcc%{_exeext}
-%if "%{gcc_version}" >= "3.3"
 %{_bindir}/sh-rtems4.9-gcc-%{gcc_version}%{_exeext}
-%endif
 %{_bindir}/sh-rtems4.9-gcov%{_exeext}
+%if "%{gcc_version}" < "4.6.0"
 %{_bindir}/sh-rtems4.9-gccbug
+%endif
+
+%dir %{_libexecdir}
+%dir %{_libexecdir}/gcc
+%dir %{_libexecdir}/gcc/sh-rtems4.9
+%dir %{_libexecdir}/gcc/sh-rtems4.9/%{gcc_version}
+%{_libexecdir}/gcc/sh-rtems4.9/%{gcc_version}/cc1%{_exeext}
+%{_libexecdir}/gcc/sh-rtems4.9/%{gcc_version}/collect2%{_exeext}
+%if "%{gcc_version}" >= "4.5.0"
+%{?with_lto:%{_libexecdir}/gcc/sh-rtems4.9/%{gcc_version}/lto%{_exeext}}
+%{_libexecdir}/gcc/sh-rtems4.9/%{gcc_version}/lto-wrapper%{_exeext}
+%endif
+
+%files -n rtems-4.9-sh-rtems4.9-gcc-libgcc -f build/files.gcc
+%defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_gcclibdir}
+%dir %{_gcclibdir}/gcc
+%dir %{_gcclibdir}/gcc/sh-rtems4.9
+%dir %{_gcclibdir}/gcc/sh-rtems4.9/%{gcc_version}
+%dir %{_gcclibdir}/gcc/sh-rtems4.9/%{gcc_version}/include
 
-%dir %{gcclib}/sh-rtems4.9/%{gcc_version}/include
 %if "%{gcc_version}" > "4.0.3"
 %if "sh-rtems4.9" != "bfin-rtems4.9"
 %if "sh-rtems4.9" != "avr-rtems4.9"
-%dir %{gcclib}/sh-rtems4.9/%{gcc_version}/include/ssp
+%dir %{_gcclibdir}/gcc/sh-rtems4.9/%{gcc_version}/include/ssp
 %endif
 %endif
 %endif
 
 %if "%{gcc_version}" >= "4.3.0"
-%dir %{gcclib}/sh-rtems4.9/%{gcc_version}/include-fixed
+%{_gcclibdir}/gcc/sh-rtems4.9/%{gcc_version}/include-fixed
 %endif
 
-%dir %{gccexec}
-%dir %{gccexec}/sh-rtems4.9
-%dir %{gccexec}/sh-rtems4.9/%{gcc_version}
-%{gccexec}/sh-rtems4.9/%{gcc_version}/cc1%{_exeext}
-%{gccexec}/sh-rtems4.9/%{gcc_version}/collect2%{_exeext}
-
 # ==============================================================
 # rtems-4.9-gcc-common
 # ==============================================================
@@ -484,6 +674,7 @@
 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
@@ -494,22 +685,21 @@
 
 %files -n rtems-4.9-gcc-common
 %defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_prefix}/share
+
 %dir %{_infodir}
 %ghost %{_infodir}/dir
 %{_infodir}/cpp.info*
 %{_infodir}/cppinternals.info*
 %{_infodir}/gcc.info*
 %{_infodir}/gccint.info*
-%if "%{gcc_version}" >= "3.4"
 %{_infodir}/gccinstall.info*
+%if "%{gcc_version}" >= "4.6.0"
+%{_infodir}/libquadmath.info*
 %endif
 
 %dir %{_mandir}
-%if "%{gcc_version}" < "3.4"
-%dir %{_mandir}/man1
-%{_mandir}/man1/cpp.1*
-%{_mandir}/man1/gcov.1*
-%endif
 %dir %{_mandir}/man7
 %{_mandir}/man7/fsf-funding.7*
 %{_mandir}/man7/gfdl.7*
@@ -520,9 +710,7 @@
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
-%if "%{gcc_version}" >= "3.4"
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
-%endif
 
 %preun -n rtems-4.9-gcc-common
 if [ $1 -eq 0 ]; then
@@ -530,9 +718,7 @@
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || :
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
-%if "%{gcc_version}" >= "3.4"
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
-%endif
 fi
 
 # ==============================================================
@@ -543,12 +729,11 @@
 Group:		Development/Tools
 Version:        %{gcc_rpmvers}
 License:	GPL
+Requires:       rtems-4.9-sh-rtems4.9-gcc-libstdc++ = %{gcc_rpmvers}-%{release}
 
 %if "%{_build}" != "%{_host}"
 BuildRequires:  rtems-4.9-sh-rtems4.9-gcc-c++ = %{gcc_rpmvers}
 %endif
-Provides:	rtems-4.9-sh-rtems4.9-c++ = %{gcc_rpmvers}-%{release}
-Obsoletes:	rtems-4.9-sh-rtems4.9-c++ < %{gcc_rpmvers}-%{release}
 
 Requires:       rtems-4.9-gcc-common
 Requires:       rtems-4.9-sh-rtems4.9-gcc = %{gcc_rpmvers}-%{release}
@@ -556,20 +741,46 @@
 %description -n rtems-4.9-sh-rtems4.9-gcc-c++
 GCC c++ compiler for sh-rtems4.9.
 
-%files -n rtems-4.9-sh-rtems4.9-gcc-c++ -f build/files.g++
+
+%package -n rtems-4.9-sh-rtems4.9-gcc-libstdc++
+Summary:	libstdc++ for sh-rtems4.9
+Group:		Development/Tools
+Version:        %{gcc_rpmvers}
+%{?_with_noarch_subpackages:BuildArch: noarch}
+License:	GPL
+
+%description -n rtems-4.9-sh-rtems4.9-gcc-libstdc++
+%{summary}
+
+
+%files -n rtems-4.9-sh-rtems4.9-gcc-c++
 %defattr(-,root,root)
+%dir %{_prefix}
+
+%dir %{_mandir}
+%dir %{_mandir}/man1
 %{_mandir}/man1/sh-rtems4.9-g++.1*
 
+%dir %{_bindir}
 %{_bindir}/sh-rtems4.9-c++%{_exeext}
 %{_bindir}/sh-rtems4.9-g++%{_exeext}
 
-%dir %{gccexec}
-%dir %{gccexec}/sh-rtems4.9
-%dir %{gccexec}/sh-rtems4.9/%{gcc_version}
-%{gccexec}/sh-rtems4.9/%{gcc_version}/cc1plus%{_exeext}
+%dir %{_libexecdir}
+%dir %{_libexecdir}/gcc
+%dir %{_libexecdir}/gcc/sh-rtems4.9
+%dir %{_libexecdir}/gcc/sh-rtems4.9/%{gcc_version}
+%{_libexecdir}/gcc/sh-rtems4.9/%{gcc_version}/cc1plus%{_exeext}
+
 
-%dir %{gcclib}/sh-rtems4.9/%{gcc_version}/include
-%{gcclib}/sh-rtems4.9/%{gcc_version}/include/c++
+%files -n rtems-4.9-sh-rtems4.9-gcc-libstdc++ -f build/files.g++
+%defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_gcclibdir}
+%dir %{_gcclibdir}/gcc
+%dir %{_gcclibdir}/gcc/sh-rtems4.9
+%dir %{_gcclibdir}/gcc/sh-rtems4.9/%{gcc_version}
+%dir %{_gcclibdir}/gcc/sh-rtems4.9/%{gcc_version}/include
+%{_gcclibdir}/gcc/sh-rtems4.9/%{gcc_version}/include/c++
 
 
 
@@ -581,7 +792,8 @@
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        24%{?dist}
+Release:        25%{?dist}
+%{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.9-newlib-common
 
@@ -590,7 +802,7 @@
 
 %files -n rtems-4.9-sh-rtems4.9-newlib -f build/files.newlib
 %defattr(-,root,root)
-%dir %{_prefix}
+%dir %{_exec_prefix}
 %dir %{_exec_prefix}/sh-rtems4.9
 %{_exec_prefix}/sh-rtems4.9/include
 
@@ -601,7 +813,8 @@
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        24%{?dist}
+Release:        25%{?dist}
+%{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable
 
 Requires(post): 	/sbin/install-info
@@ -612,6 +825,9 @@
 
 %files -n rtems-4.9-newlib-common
 %defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_prefix}/share
+
 %dir %{_infodir}
 %ghost %{_infodir}/dir
 %{_infodir}/libc.info*

diff -u rtems/contrib/crossrpms/rtems4.9/sparc/rtems-4.9-sparc-rtems4.9-gcc.spec:1.19.2.9 rtems/contrib/crossrpms/rtems4.9/sparc/rtems-4.9-sparc-rtems4.9-gcc.spec:1.19.2.10
--- rtems/contrib/crossrpms/rtems4.9/sparc/rtems-4.9-sparc-rtems4.9-gcc.spec:1.19.2.9	Fri Nov 27 04:31:33 2009
+++ rtems/contrib/crossrpms/rtems4.9/sparc/rtems-4.9-sparc-rtems4.9-gcc.spec	Sun Aug  7 00:23:35 2011
@@ -53,14 +53,12 @@
 %define newlib_pkgvers		1.16.0
 %define newlib_version		1.16.0
 
-%define mpfr_version	2.3.1
-
 Name:         	rtems-4.9-sparc-rtems4.9-gcc
 Summary:      	sparc-rtems4.9 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	24%{?dist}
+Release:      	25%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -69,21 +67,145 @@
 
 BuildRequires:  %{_host_rpmprefix}gcc
 
+# versions of libraries, we conditionally bundle if necessary
+%global mpc_version	0.8.1
+%global mpfr_version	2.4.2
+%global gmp_version	4.3.2
+%global libelf_version  0.8.13
+
+# versions of libraries these distros are known to ship
+%if 0%{?fc16}
+%global mpc_provided 0.8.3
+%global mpfr_provided 3.0.0
+%global gmp_provided 4.3.2
+%endif
+
+%if 0%{?fc15}
+%global mpc_provided 0.8.3
+%global mpfr_provided 3.0.0
+%global gmp_provided 4.3.2
+%endif
+
+%if 0%{?fc14}
+%global mpc_provided 0.8.1
+%global mpfr_provided 2.4.2
+%global gmp_provided 4.3.1
+%endif
+
+%if 0%{?el6}
+%global mpc_provided %{nil}
+%global mpfr_provided 2.4.1
+%global gmp_provided 4.3.1
+%endif
+
+%if 0%{?el5}
+%global mpc_provided %{nil}
+%global mpfr_provided %{nil}
+%global gmp_provided 4.1.4
+%endif
+
+%if 0%{?suse11_3}
+%global mpc_provided 0.8.1
+%global mpfr_provided 2.4.2
+%global gmp_provided 4.3.2
+%endif
+
+%if 0%{?suse11_4}
+%global mpc_provided 0.8.2
+%global mpfr_provided 3.0.0
+%global gmp_provided 5.0.1
+%endif
+
+%if 0%{?cygwin}
+%global mpc_provided 0.8
+%global mpfr_provided 2.4.1
+%global gmp_provided 4.3.1
+%endif
+
+%if 0%{?mingw32}
+%global mpc_provided 0.8.1
+%global mpfr_provided 2.4.1
+%global gmp_provided 4.3.2
+%endif
+
+%if "%{gcc_version}" >= "4.2.0"
+%endif
+
 %if "%{gcc_version}" >= "4.3.0"
-BuildRequires:  gmp-devel >= 4.1
+%define gmp_required		4.1
+%define mpfr_required		2.3.1
+%endif
+
+%if "%{gcc_version}" >= "4.3.3"
+%define cloog_required 		0.15
+%endif
+
+%if "%{gcc_version}" >= "4.4.0"
+%define mpfr_required		2.3.2
+%endif
+
+%if "%{gcc_version}" >= "4.5.0"
+%define mpc_required 		0.8
+%if %{with lto}
+%define libelf_required 	0.8.12
+%endif
+%endif
+
+%if %{defined mpc_required}
+%if "%{mpc_provided}" >= "%{mpc_required}"
+%{?fedora:BuildRequires: libmpc-devel >= %{mpc_required}}
+%{?suse:BuildRequires: mpc-devel >= %{mpc_required}}
 %if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}gmp-devel
-BuildRequires:  %{_host_rpmprefix}mpfr-devel
+BuildRequires:  %{_host_rpmprefix}mpc-devel >= %{mpc_required}
 %endif
-%if 0%{?fedora} >= 8
-BuildRequires:  mpfr-devel >= 2.3.0
+%else
+%define _build_mpc 1
+%define gmp_required 		4.2
+%endif
+%endif
+
+%if %{defined gmp_required}
+%if "%{gmp_provided}" >= "%{gmp_required}"
+BuildRequires: gmp-devel >= %{gmp_required}
+%if "%{_build}" != "%{_host}"
+BuildRequires:  %{_host_rpmprefix}gmp-devel >= %{gmp_required}
+%endif
+%else
+%define _build_gmp 1
+%endif
+%endif
+
+%if %{defined libelf_required}
+%if "%{libelf_provided}" >= "%{libelf_required}"
+BuildRequires: libelf-devel >= %{libelf_required}
+%if "%{_build}" != "%{_host}"
+BuildRequires:  %{_host_rpmprefix}libelf-devel >= %{libelf_required}
+%endif
+%else
+%define _build_libelf 1
+%endif
+%endif
+
+
+%if %{defined cloog_required}
+%{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required}
+%{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required}
+%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required}
+%{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required}
+%{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
+%{?suse11_3:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
+%endif
+
+
+%if %{defined mpfr_required}
+%if "%{mpfr_provided}" >= "%{mpfr_required}"
+BuildRequires: mpfr-devel >= %{mpfr_required}
+%if "%{_build}" != "%{_host}"
+BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
 %endif
-%if "%{?suse}" > "10.3"
-BuildRequires:  mpfr-devel >= 2.3.0
+%else
+%define _build_mpfr 1
 %endif
-# These distros ship an insufficient mpfr
-%{?el4:%define 	_build_mpfr 	1}
-%{?suse10_3:%define 	_build_mpfr 	1}
 %endif
 
 %if "%{_build}" != "%{_host}"
@@ -100,17 +222,19 @@
 
 Requires:	rtems-4.9-gcc-common
 Requires:	rtems-4.9-sparc-rtems4.9-binutils
-Requires:	rtems-4.9-sparc-rtems4.9-newlib = %{newlib_version}-24%{?dist}
+Requires:	rtems-4.9-sparc-rtems4.9-gcc-libgcc = %{gcc_rpmvers}-%{release}
+Requires:	rtems-4.9-sparc-rtems4.9-newlib = %{newlib_version}-25%{?dist}
 
-
-%if "%{gcc_version}" >= "3.4"
-%define gcclib %{_libdir}/gcc
-%define gccexec %{_libexecdir}/gcc
+%if "%{gcc_version}" >= "4.5.0"
+BuildRequires:  zlib-devel
+%if "%{_build}" != "%{_host}"
+BuildRequires:  %{_host_rpmprefix}zlib-devel
+%endif
 %else
-%define gcclib %{_libdir}/gcc-lib
-%define gccexec %{_libdir}/gcc-lib
 %endif
 
+%global _gcclibdir %{_prefix}/lib
+
 %if "%{gcc_version}" == "4.3.2"
 Source0:	ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
 Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20090825.diff
@@ -131,8 +255,20 @@
 %endif
 %{?_without_sources:NoSource:	50}
 
-%if "%{gcc_version}" >= "4.3.0"
-Source60:    http://www.mpfr.org/mpfr-current/mpfr-%{mpfr_version}.tar.bz2
+%if 0%{?_build_mpfr}
+Source60:    http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.bz2
+%endif
+
+%if 0%{?_build_mpc}
+Source61:    http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.gz
+%endif
+
+%if 0%{?_build_gmp}
+Source62:    ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2
+%endif
+
+%if 0%{?_build_libelf}
+Source63:    http://www.mr511.de/software/libelf-%{libelf_version}.tar.gz
 %endif
 
 %description
@@ -142,10 +278,14 @@
 %setup -c -T -n %{name}-%{version}
 
 %setup -q -T -D -n %{name}-%{version} -a0
-%{?PATCH0:%patch0 -p0}
+cd gcc-%{gcc_pkgvers}
+%{?PATCH0:%patch0 -p1}
+cd ..
 
 %setup -q -T -D -n %{name}-%{version} -a1
-%{?PATCH1:%patch1 -p0}
+cd gcc-%{gcc_pkgvers}
+%{?PATCH1:%patch1 -p1}
+cd ..
 
 
 
@@ -157,6 +297,9 @@
 cd ..
   # Copy the C library into gcc's source tree
   ln -s ../newlib-%{newlib_version}/newlib gcc-%{gcc_pkgvers}
+  # Make sure not to be using GPL'ed sources
+  rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/linux
+  rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/rdos
 
 %if 0%{?_build_mpfr}
 %setup -q -T -D -n %{name}-%{version} -a60
@@ -165,7 +308,28 @@
   ln -s ../mpfr-%{mpfr_version} gcc-%{gcc_pkgvers}/mpfr
 %endif
 
-echo "RTEMS gcc-%{gcc_version}-24%{?dist}\/newlib-%{newlib_version}-24%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+%if 0%{?_build_mpc}
+%setup -q -T -D -n %{name}-%{version} -a61
+%{?PATCH61:%patch61 -p1}
+  # Build mpc one-tree style
+  ln -s ../mpc-%{mpc_version} gcc-%{gcc_pkgvers}/mpc
+%endif
+
+%if 0%{?_build_gmp}
+%setup -q -T -D -n %{name}-%{version} -a62
+%{?PATCH62:%patch62 -p1}
+  # Build gmp one-tree style
+  ln -s ../gmp-%{gmp_version} gcc-%{gcc_pkgvers}/gmp
+%endif
+
+%if 0%{?_build_libelf}
+%setup -q -T -D -n %{name}-%{version} -a63
+%{?PATCH63:%patch63 -p1}
+  # Build libelf one-tree style
+  ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
+%endif
+
+echo "RTEMS gcc-%{gcc_version}-25%{?dist}\/newlib-%{newlib_version}-25%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -192,7 +356,7 @@
     --bindir=%{_bindir} \
     --exec_prefix=%{_exec_prefix} \
     --includedir=%{_includedir} \
-    --libdir=%{_libdir} \
+    --libdir=%{_gcclibdir} \
     --libexecdir=%{_libexecdir} \
     --mandir=%{_mandir} \
     --infodir=%{_infodir} \
@@ -208,7 +372,7 @@
     --enable-version-specific-runtime-libs \
     --enable-threads \
     --enable-newlib-io-c99-formats \
-    --enable-languages="$languages" $optargs
+    --enable-languages="$languages"
 
 %if "%_host" != "%_build"
   # Bug in gcc-3.2.1:
@@ -238,12 +402,19 @@
 # Misplaced header file
   if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then
     mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \
-      $RPM_BUILD_ROOT%{gcclib}/sparc-rtems4.9/%{gcc_version}/include/
+      $RPM_BUILD_ROOT%{_gcclibdir}/gcc/sparc-rtems4.9/%{gcc_version}/include/
   fi
 %endif
 
   # host library
+%if "%{gcc_version}" >= "4.2.0"
+  # libiberty doesn't honor --libdir, but always installs to a 
+  # magically guessed _libdir
   rm -f  ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a
+%else
+  # libiberty installs to --libdir=...
+  rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a
+%endif
 
   # We use the version from binutils
   rm -f $RPM_BUILD_ROOT%{_bindir}/sparc-rtems4.9-c++filt%{_exeext}
@@ -253,18 +424,16 @@
   rm -f $RPM_BUILD_ROOT%{_infodir}/dir
   touch $RPM_BUILD_ROOT%{_infodir}/dir
 
+  # We don't want libffi's man-pages
+  rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*ffi*
 
-%if "%{gcc_version}" >= "3.4"
   # Bug in gcc-3.4.0pre
   rm -f $RPM_BUILD_ROOT%{_bindir}/sparc-rtems4.9-sparc-rtems4.9-gcjh%{_exeext}
-%endif
 
-%if "%{gcc_version}" >= "3.3"
   # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs
   # the fixinclude-install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{gcclib}/sparc-rtems4.9/%{gcc_version}/install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{gccexec}/sparc-rtems4.9/%{gcc_version}/install-tools
-%endif
+  rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/sparc-rtems4.9/%{gcc_version}/install-tools
+  rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/sparc-rtems4.9/%{gcc_version}/install-tools
 
   # Bug in gcc > 4.1.0: Installs an unused, empty directory
   if test -d ${RPM_BUILD_ROOT}%{_prefix}/sparc-rtems4.9/include/bits; then
@@ -272,11 +441,11 @@
   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.9/lib"
-  for i in $f; do
+  for i in $multilibs; do
     case $i in
     \.) echo "%dir ${TGTDIR}" >> build/files.newlib
       ;;
@@ -287,19 +456,10 @@
 
   rm -f dirs ;
   echo "%defattr(-,root,root,-)" >> dirs
-  echo "%dir %{_prefix}" >> dirs
-  echo "%dir %{_libdir}" >> dirs
-%if "%{gcc_version}" >= "3.4"
-  echo "%dir %{_libexecdir}" >> dirs
-%endif
-  echo "%dir %{gcclib}" >> dirs
-  echo "%dir %{gcclib}/sparc-rtems4.9" >> dirs
-
-  TGTDIR="%{gcclib}/sparc-rtems4.9/%{gcc_version}"
-  for i in $f; do
+  TGTDIR="%{_gcclibdir}/gcc/sparc-rtems4.9/%{gcc_version}"
+  for i in $multilibs; do
     case $i in
-    \.) echo "%dir ${TGTDIR}" >> dirs
-      ;;
+    \.) ;; # ignore, handled elsewhere
     *)  echo "%dir ${TGTDIR}/$i" >> dirs
       ;;
     esac
@@ -312,7 +472,7 @@
   cp dirs build/files.gcj
   cp dirs build/files.g++
 
-  TGTDIR="%{gcclib}/sparc-rtems4.9/%{gcc_version}"
+  TGTDIR="%{_gcclibdir}/gcc/sparc-rtems4.9/%{gcc_version}"
   f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
   for i in $f; do
     case $i in
@@ -327,6 +487,8 @@
     *include/objc*) ;;
     *include/g++*);;
     *include/c++*);;
+    *include-fixed/*);;
+    *finclude/*);;
     *adainclude*);;
     *adalib*);;
     *gnat1);;
@@ -381,7 +543,7 @@
 cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
 #!/bin/sh
 grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/sparc-rtems4.9/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/sparc-rtems4.9/' | %__find_provides
+  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/sparc-rtems4.9/'} | %__find_provides
 EOF
 chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
 %define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
@@ -389,7 +551,7 @@
 cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
 #!/bin/sh
 grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/sparc-rtems4.9/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/sparc-rtems4.9/' | %__find_requires
+  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/sparc-rtems4.9/'} | %__find_requires
 EOF
 chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
 %define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
@@ -429,7 +591,7 @@
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.9-sparc-rtems4.9-binutils
-# Requires:       rtems-4.9-sparc-rtems4.9-newlib = %{newlib_version}-24%{?dist}
+# Requires:       rtems-4.9-sparc-rtems4.9-newlib = %{newlib_version}-25%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -439,44 +601,72 @@
 %description -n rtems-4.9-sparc-rtems4.9-gcc
 GNU cc compiler for sparc-rtems4.9.
 
-%files -n rtems-4.9-sparc-rtems4.9-gcc -f build/files.gcc
+# ==============================================================
+# rtems-4.9-sparc-rtems4.9-gcc-libgcc
+# ==============================================================
+%package -n rtems-4.9-sparc-rtems4.9-gcc-libgcc
+Summary:        libgcc for sparc-rtems4.9-gcc
+Group:          Development/Tools
+Version:        %{gcc_rpmvers}
+%{?_with_noarch_subpackages:BuildArch: noarch}
+Requires:       rtems-4.9-sparc-rtems4.9-newlib = %{newlib_version}-25%{?dist}
+License:	GPL
+
+%description -n rtems-4.9-sparc-rtems4.9-gcc-libgcc
+libgcc sparc-rtems4.9-gcc.
+
+
+%files -n rtems-4.9-sparc-rtems4.9-gcc
 %defattr(-,root,root)
+%dir %{_prefix}
+
 %dir %{_mandir}
 %dir %{_mandir}/man1
 %{_mandir}/man1/sparc-rtems4.9-gcc.1*
-%if "%{gcc_version}" >= "3.4"
 %{_mandir}/man1/sparc-rtems4.9-cpp.1*
 %{_mandir}/man1/sparc-rtems4.9-gcov.1*
-%endif
 
 %dir %{_bindir}
 %{_bindir}/sparc-rtems4.9-cpp%{_exeext}
 %{_bindir}/sparc-rtems4.9-gcc%{_exeext}
-%if "%{gcc_version}" >= "3.3"
 %{_bindir}/sparc-rtems4.9-gcc-%{gcc_version}%{_exeext}
-%endif
 %{_bindir}/sparc-rtems4.9-gcov%{_exeext}
+%if "%{gcc_version}" < "4.6.0"
 %{_bindir}/sparc-rtems4.9-gccbug
+%endif
+
+%dir %{_libexecdir}
+%dir %{_libexecdir}/gcc
+%dir %{_libexecdir}/gcc/sparc-rtems4.9
+%dir %{_libexecdir}/gcc/sparc-rtems4.9/%{gcc_version}
+%{_libexecdir}/gcc/sparc-rtems4.9/%{gcc_version}/cc1%{_exeext}
+%{_libexecdir}/gcc/sparc-rtems4.9/%{gcc_version}/collect2%{_exeext}
+%if "%{gcc_version}" >= "4.5.0"
+%{?with_lto:%{_libexecdir}/gcc/sparc-rtems4.9/%{gcc_version}/lto%{_exeext}}
+%{_libexecdir}/gcc/sparc-rtems4.9/%{gcc_version}/lto-wrapper%{_exeext}
+%endif
+
+%files -n rtems-4.9-sparc-rtems4.9-gcc-libgcc -f build/files.gcc
+%defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_gcclibdir}
+%dir %{_gcclibdir}/gcc
+%dir %{_gcclibdir}/gcc/sparc-rtems4.9
+%dir %{_gcclibdir}/gcc/sparc-rtems4.9/%{gcc_version}
+%dir %{_gcclibdir}/gcc/sparc-rtems4.9/%{gcc_version}/include
 
-%dir %{gcclib}/sparc-rtems4.9/%{gcc_version}/include
 %if "%{gcc_version}" > "4.0.3"
 %if "sparc-rtems4.9" != "bfin-rtems4.9"
 %if "sparc-rtems4.9" != "avr-rtems4.9"
-%dir %{gcclib}/sparc-rtems4.9/%{gcc_version}/include/ssp
+%dir %{_gcclibdir}/gcc/sparc-rtems4.9/%{gcc_version}/include/ssp
 %endif
 %endif
 %endif
 
 %if "%{gcc_version}" >= "4.3.0"
-%dir %{gcclib}/sparc-rtems4.9/%{gcc_version}/include-fixed
+%{_gcclibdir}/gcc/sparc-rtems4.9/%{gcc_version}/include-fixed
 %endif
 
-%dir %{gccexec}
-%dir %{gccexec}/sparc-rtems4.9
-%dir %{gccexec}/sparc-rtems4.9/%{gcc_version}
-%{gccexec}/sparc-rtems4.9/%{gcc_version}/cc1%{_exeext}
-%{gccexec}/sparc-rtems4.9/%{gcc_version}/collect2%{_exeext}
-
 # ==============================================================
 # rtems-4.9-gcc-common
 # ==============================================================
@@ -484,6 +674,7 @@
 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
@@ -494,22 +685,21 @@
 
 %files -n rtems-4.9-gcc-common
 %defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_prefix}/share
+
 %dir %{_infodir}
 %ghost %{_infodir}/dir
 %{_infodir}/cpp.info*
 %{_infodir}/cppinternals.info*
 %{_infodir}/gcc.info*
 %{_infodir}/gccint.info*
-%if "%{gcc_version}" >= "3.4"
 %{_infodir}/gccinstall.info*
+%if "%{gcc_version}" >= "4.6.0"
+%{_infodir}/libquadmath.info*
 %endif
 
 %dir %{_mandir}
-%if "%{gcc_version}" < "3.4"
-%dir %{_mandir}/man1
-%{_mandir}/man1/cpp.1*
-%{_mandir}/man1/gcov.1*
-%endif
 %dir %{_mandir}/man7
 %{_mandir}/man7/fsf-funding.7*
 %{_mandir}/man7/gfdl.7*
@@ -520,9 +710,7 @@
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
-%if "%{gcc_version}" >= "3.4"
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
-%endif
 
 %preun -n rtems-4.9-gcc-common
 if [ $1 -eq 0 ]; then
@@ -530,9 +718,7 @@
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || :
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
-%if "%{gcc_version}" >= "3.4"
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
-%endif
 fi
 
 # ==============================================================
@@ -543,12 +729,11 @@
 Group:		Development/Tools
 Version:        %{gcc_rpmvers}
 License:	GPL
+Requires:       rtems-4.9-sparc-rtems4.9-gcc-libstdc++ = %{gcc_rpmvers}-%{release}
 
 %if "%{_build}" != "%{_host}"
 BuildRequires:  rtems-4.9-sparc-rtems4.9-gcc-c++ = %{gcc_rpmvers}
 %endif
-Provides:	rtems-4.9-sparc-rtems4.9-c++ = %{gcc_rpmvers}-%{release}
-Obsoletes:	rtems-4.9-sparc-rtems4.9-c++ < %{gcc_rpmvers}-%{release}
 
 Requires:       rtems-4.9-gcc-common
 Requires:       rtems-4.9-sparc-rtems4.9-gcc = %{gcc_rpmvers}-%{release}
@@ -556,20 +741,46 @@
 %description -n rtems-4.9-sparc-rtems4.9-gcc-c++
 GCC c++ compiler for sparc-rtems4.9.
 
-%files -n rtems-4.9-sparc-rtems4.9-gcc-c++ -f build/files.g++
+
+%package -n rtems-4.9-sparc-rtems4.9-gcc-libstdc++
+Summary:	libstdc++ for sparc-rtems4.9
+Group:		Development/Tools
+Version:        %{gcc_rpmvers}
+%{?_with_noarch_subpackages:BuildArch: noarch}
+License:	GPL
+
+%description -n rtems-4.9-sparc-rtems4.9-gcc-libstdc++
+%{summary}
+
+
+%files -n rtems-4.9-sparc-rtems4.9-gcc-c++
 %defattr(-,root,root)
+%dir %{_prefix}
+
+%dir %{_mandir}
+%dir %{_mandir}/man1
 %{_mandir}/man1/sparc-rtems4.9-g++.1*
 
+%dir %{_bindir}
 %{_bindir}/sparc-rtems4.9-c++%{_exeext}
 %{_bindir}/sparc-rtems4.9-g++%{_exeext}
 
-%dir %{gccexec}
-%dir %{gccexec}/sparc-rtems4.9
-%dir %{gccexec}/sparc-rtems4.9/%{gcc_version}
-%{gccexec}/sparc-rtems4.9/%{gcc_version}/cc1plus%{_exeext}
+%dir %{_libexecdir}
+%dir %{_libexecdir}/gcc
+%dir %{_libexecdir}/gcc/sparc-rtems4.9
+%dir %{_libexecdir}/gcc/sparc-rtems4.9/%{gcc_version}
+%{_libexecdir}/gcc/sparc-rtems4.9/%{gcc_version}/cc1plus%{_exeext}
+
 
-%dir %{gcclib}/sparc-rtems4.9/%{gcc_version}/include
-%{gcclib}/sparc-rtems4.9/%{gcc_version}/include/c++
+%files -n rtems-4.9-sparc-rtems4.9-gcc-libstdc++ -f build/files.g++
+%defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_gcclibdir}
+%dir %{_gcclibdir}/gcc
+%dir %{_gcclibdir}/gcc/sparc-rtems4.9
+%dir %{_gcclibdir}/gcc/sparc-rtems4.9/%{gcc_version}
+%dir %{_gcclibdir}/gcc/sparc-rtems4.9/%{gcc_version}/include
+%{_gcclibdir}/gcc/sparc-rtems4.9/%{gcc_version}/include/c++
 
 
 
@@ -581,7 +792,8 @@
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        24%{?dist}
+Release:        25%{?dist}
+%{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.9-newlib-common
 
@@ -590,7 +802,7 @@
 
 %files -n rtems-4.9-sparc-rtems4.9-newlib -f build/files.newlib
 %defattr(-,root,root)
-%dir %{_prefix}
+%dir %{_exec_prefix}
 %dir %{_exec_prefix}/sparc-rtems4.9
 %{_exec_prefix}/sparc-rtems4.9/include
 
@@ -601,7 +813,8 @@
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        24%{?dist}
+Release:        25%{?dist}
+%{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable
 
 Requires(post): 	/sbin/install-info
@@ -612,6 +825,9 @@
 
 %files -n rtems-4.9-newlib-common
 %defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_prefix}/share
+
 %dir %{_infodir}
 %ghost %{_infodir}/dir
 %{_infodir}/libc.info*


 *ralf* (on branch rtems-4-9-branch):
Remove (unused).

R 1.1.2.1  contrib/crossrpms/patches/gcc-core-4.3.2-rtems4.9-20081214.diff
R    1.1  contrib/crossrpms/patches/newlib-1.16.0-rtems4.9-20080430.diff
R    1.1  contrib/crossrpms/patches/newlib-1.16.0-rtems4.9-20080827.diff
R 1.1.2.1  contrib/crossrpms/patches/newlib-1.16.0-rtems4.9-20081203.diff
R 1.1.2.1  contrib/crossrpms/patches/newlib-1.16.0-rtems4.9-20090207.diff


--

Generated by Deluxe Loginfo [http://www.codewiz.org/projects/index.html#loginfo] 2.122 by Bernardo Innocenti <bernie at develer.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/vc/attachments/20110807/d3ceee91/attachment.html>


More information about the vc mailing list