[rtems-crossrpms commit] Partial merger from master.

[Ralf Corsepius]

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

Author:    Ralf Corsépius <ralf.corsepius at rtems.org>
Date:      Wed Mar 14 17:50:55 2012 +0100

Partial merger from master.

---

 gcc/gccnewlib.add  |   11 +++++++++++
 gcc/target-gcc.add |    6 ++++++
 2 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/gcc/gccnewlib.add b/gcc/gccnewlib.add
index fa35964..2d8a465 100644
--- a/gcc/gccnewlib.add
+++ b/gcc/gccnewlib.add
@@ -47,6 +47,12 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global libelf_version  0.8.13
 
 # versions of libraries these distros are known to ship
+%if 0%{?fc18}
+%global mpc_provided 0.9
+%global mpfr_provided 3.1.0
+%global gmp_provided 5.0.2
+%endif
+
 %if 0%{?fc17}
 %global mpc_provided 0.9
 %global mpfr_provided 3.1.0
@@ -128,6 +134,10 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %endif
 %endif
 
+%if "%{gcc_version}" >= "4.7.0"
+%define gmp_required            4.2
+%endif
+
 %if %{defined mpc_required}
 %if "%{mpc_provided}" >= "%{mpc_required}"
 %{?fedora:BuildRequires: libmpc-devel >= %{mpc_required}}
@@ -165,6 +175,7 @@ BuildRequires:  %{_host_rpmprefix}libelf-devel >= %{libelf_required}
 
 
 %if %{defined cloog_required}
+%{?fc18:BuildRequires: cloog-ppl-devel >= %cloog_required}
 %{?fc17:BuildRequires: cloog-ppl-devel >= %cloog_required}
 %{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required}
 %{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required}
diff --git a/gcc/target-gcc.add b/gcc/target-gcc.add
index afd3379..ff7cf12 100644
--- a/gcc/target-gcc.add
+++ b/gcc/target-gcc.add
@@ -49,6 +49,12 @@ libgcc @tool_target at -gcc.
 %if "%{gcc_version}" < "4.6.0"
 %{_bindir}/@tool_target at -gccbug
 %endif
+%if "%{gcc_version}" >= "4.7.0"
+# FIXME: To ship or not to ship?
+%{_bindir}/@tool_target at -gcc-ar%{_exeext}
+%{_bindir}/@tool_target at -gcc-nm%{_exeext}
+%{_bindir}/@tool_target at -gcc-ranlib%{_exeext}
+%endif
 
 %sysdir %{_libexecdir}
 %dir %{_libexecdir}/gcc