diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2011-01-10 08:51:10 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2011-01-10 08:51:10 +0000 |
| commit | e9d1334d6852874782b5d6b317e95a0e7f8f45ae (patch) | |
| tree | 59047a46e0a31231f5e7d45471075d124be6780e | |
| parent | 9ef6024965b9ef21be67d8deaf26320abef30583 (diff) | |
Sync with rtems-4.11.
| -rw-r--r-- | contrib/crossrpms/gcc/gccnewlib.add | 16 | ||||
| -rw-r--r-- | contrib/crossrpms/gcc/prep.add | 7 |
2 files changed, 17 insertions, 6 deletions
diff --git a/contrib/crossrpms/gcc/gccnewlib.add b/contrib/crossrpms/gcc/gccnewlib.add index 69631dd5e4..f0e2ecde71 100644 --- a/contrib/crossrpms/gcc/gccnewlib.add +++ b/contrib/crossrpms/gcc/gccnewlib.add @@ -33,6 +33,10 @@ BuildRequires: %{_host_rpmprefix}gcc # Bug in gcc-4.5-20100318, doesn't build them on x86_84 hosts. %bcond_with plugin +# EXPERIMENTAL: Use gcc's stdint.h instead of newlib's +# Should be applicable to gcc >= 4.5.0 +%bcond_with gcc_stdint + # versions of libraries, we conditionally bundle if necessary %global mpc_version 0.8.1 %global mpfr_version 2.4.2 @@ -40,6 +44,12 @@ BuildRequires: %{_host_rpmprefix}gcc %global libelf_version 0.8.13 # versions of libraries these distros are known to ship +%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 @@ -52,12 +62,6 @@ BuildRequires: %{_host_rpmprefix}gcc %global gmp_provided 4.3.1 %endif -%if 0%{?fc12} -%global mpc_provided 0.8 -%global mpfr_provided 2.4.1 -%global gmp_provided 4.3.1 -%endif - %if 0%{?el6} %global mpc_provided %{nil} %global mpfr_provided 2.4.1 diff --git a/contrib/crossrpms/gcc/prep.add b/contrib/crossrpms/gcc/prep.add index 4c6fcce64c..2aa7a7756e 100644 --- a/contrib/crossrpms/gcc/prep.add +++ b/contrib/crossrpms/gcc/prep.add @@ -33,6 +33,10 @@ cd .. %{?PATCH5:%patch5 -p0} %endif +%if %{with gcc_stdint} +sed -i -e '/thread_file=.*rtems/,/use_gcc_stdint=wrap/ { s/use_gcc_stdint=wrap/use_gcc_stdint=provide/}' gcc-%{gcc_pkgvers}/gcc/config.gcc +%endif + %if %build_newlib %setup -q -T -D -n %{name}-%{version} -a50 cd newlib-%{newlib_version} @@ -40,6 +44,9 @@ cd newlib-%{newlib_version} cd .. # Copy the C library into gcc's source tree ln -s ../newlib-%{newlib_version}/newlib gcc-%{gcc_pkgvers} +%if %{with gcc_stdint} +rm newlib-%{newlib_version}/newlib/libc/include/stdint.h +%endif %endif %if 0%{?_build_mpfr} |