diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2010-08-18 10:31:17 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2010-08-18 10:31:17 +0000 |
commit | d7c4e1d445679640f929e10b0ba62da7a273ec46 (patch) | |
tree | fcf696bf7646480ff6524ae337b6bd4cba177527 | |
parent | Add bcond_with gcc_stdint. (diff) | |
download | rtems-d7c4e1d445679640f929e10b0ba62da7a273ec46.tar.bz2 |
Regenerate.
14 files changed, 266 insertions, 112 deletions
diff --git a/contrib/crossrpms/rtems4.11/arm/rtems-4.11-arm-rtems4.11-gcc.spec b/contrib/crossrpms/rtems4.11/arm/rtems-4.11-arm-rtems4.11-gcc.spec index 321cdbe1e5..0305cf3114 100644 --- a/contrib/crossrpms/rtems4.11/arm/rtems-4.11-arm-rtems4.11-gcc.spec +++ b/contrib/crossrpms/rtems4.11/arm/rtems-4.11-arm-rtems4.11-gcc.spec @@ -58,7 +58,7 @@ Summary: arm-rtems4.11 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 4%{?dist} +Release: 5%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -78,6 +78,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 @@ -254,7 +258,7 @@ BuildRequires: rtems-4.11-arm-rtems4.11-binutils Requires: rtems-4.11-gcc-common Requires: rtems-4.11-arm-rtems4.11-binutils Requires: rtems-4.11-arm-rtems4.11-gcc-libgcc = %{gcc_rpmvers}-%{release} -Requires: rtems-4.11-arm-rtems4.11-newlib = %{newlib_version}-19%{?dist} +Requires: rtems-4.11-arm-rtems4.11-newlib = %{newlib_version}-20%{?dist} %if "%{gcc_version}" >= "4.5.0" BuildRequires: zlib-devel @@ -268,7 +272,7 @@ BuildRequires: %{_host_rpmprefix}zlib-devel %if "%{gcc_version}" == "4.5.1" Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.1-rtems4.11-20100726.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.1-rtems4.11-20100818.diff %endif %if "%{gcc_version}" == "4.5.0" Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 @@ -326,12 +330,19 @@ cd .. +%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 + %setup -q -T -D -n %{name}-%{version} -a50 cd newlib-%{newlib_version} %{?PATCH50:%patch50 -p1} 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 %if 0%{?_build_mpfr} %setup -q -T -D -n %{name}-%{version} -a60 @@ -361,7 +372,7 @@ cd .. ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf %endif -echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-19%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE +echo "RTEMS gcc-%{gcc_version}-5%{?dist}/newlib-%{newlib_version}-20%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE # Fix timestamps @@ -631,7 +642,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.11-arm-rtems4.11-binutils -# Requires: rtems-4.11-arm-rtems4.11-newlib = %{newlib_version}-19%{?dist} +# Requires: rtems-4.11-arm-rtems4.11-newlib = %{newlib_version}-20%{?dist} # License: GPL # %if %build_infos @@ -649,7 +660,7 @@ Summary: libgcc for arm-rtems4.11-gcc Group: Development/Tools Version: %{gcc_rpmvers} %{?_with_noarch_subpackages:BuildArch: noarch} -Requires: rtems-4.11-arm-rtems4.11-newlib = %{newlib_version}-19%{?dist} +Requires: rtems-4.11-arm-rtems4.11-newlib = %{newlib_version}-20%{?dist} License: GPL %description -n rtems-4.11-arm-rtems4.11-gcc-libgcc @@ -823,7 +834,7 @@ Summary: C Library (newlib) for arm-rtems4.11 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 19%{?dist} +Release: 20%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} Requires: rtems-4.11-newlib-common @@ -844,7 +855,7 @@ Newlib C Library for arm-rtems4.11. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 19%{?dist} +Release: 20%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} License: Distributable diff --git a/contrib/crossrpms/rtems4.11/avr/rtems-4.11-avr-rtems4.11-gcc.spec b/contrib/crossrpms/rtems4.11/avr/rtems-4.11-avr-rtems4.11-gcc.spec index 52892d4d83..a29c07a041 100644 --- a/contrib/crossrpms/rtems4.11/avr/rtems-4.11-avr-rtems4.11-gcc.spec +++ b/contrib/crossrpms/rtems4.11/avr/rtems-4.11-avr-rtems4.11-gcc.spec @@ -58,7 +58,7 @@ Summary: avr-rtems4.11 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 4%{?dist} +Release: 5%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -78,6 +78,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 @@ -254,7 +258,7 @@ BuildRequires: rtems-4.11-avr-rtems4.11-binutils Requires: rtems-4.11-gcc-common Requires: rtems-4.11-avr-rtems4.11-binutils Requires: rtems-4.11-avr-rtems4.11-gcc-libgcc = %{gcc_rpmvers}-%{release} -Requires: rtems-4.11-avr-rtems4.11-newlib = %{newlib_version}-19%{?dist} +Requires: rtems-4.11-avr-rtems4.11-newlib = %{newlib_version}-20%{?dist} %if "%{gcc_version}" >= "4.5.0" BuildRequires: zlib-devel @@ -268,7 +272,7 @@ BuildRequires: %{_host_rpmprefix}zlib-devel %if "%{gcc_version}" == "4.5.1" Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.1-rtems4.11-20100726.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.1-rtems4.11-20100818.diff %endif %if "%{gcc_version}" == "4.5.0" Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 @@ -314,12 +318,19 @@ cd .. +%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 + %setup -q -T -D -n %{name}-%{version} -a50 cd newlib-%{newlib_version} %{?PATCH50:%patch50 -p1} 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 %if 0%{?_build_mpfr} %setup -q -T -D -n %{name}-%{version} -a60 @@ -349,7 +360,7 @@ cd .. ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf %endif -echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-19%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE +echo "RTEMS gcc-%{gcc_version}-5%{?dist}/newlib-%{newlib_version}-20%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE # Fix timestamps @@ -618,7 +629,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.11-avr-rtems4.11-binutils -# Requires: rtems-4.11-avr-rtems4.11-newlib = %{newlib_version}-19%{?dist} +# Requires: rtems-4.11-avr-rtems4.11-newlib = %{newlib_version}-20%{?dist} # License: GPL # %if %build_infos @@ -636,7 +647,7 @@ Summary: libgcc for avr-rtems4.11-gcc Group: Development/Tools Version: %{gcc_rpmvers} %{?_with_noarch_subpackages:BuildArch: noarch} -Requires: rtems-4.11-avr-rtems4.11-newlib = %{newlib_version}-19%{?dist} +Requires: rtems-4.11-avr-rtems4.11-newlib = %{newlib_version}-20%{?dist} License: GPL %description -n rtems-4.11-avr-rtems4.11-gcc-libgcc @@ -749,7 +760,7 @@ Summary: C Library (newlib) for avr-rtems4.11 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 19%{?dist} +Release: 20%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} Requires: rtems-4.11-newlib-common @@ -770,7 +781,7 @@ Newlib C Library for avr-rtems4.11. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 19%{?dist} +Release: 20%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} License: Distributable diff --git a/contrib/crossrpms/rtems4.11/bfin/rtems-4.11-bfin-rtems4.11-gcc.spec b/contrib/crossrpms/rtems4.11/bfin/rtems-4.11-bfin-rtems4.11-gcc.spec index f9940ff7c7..3fdcb7a0bc 100644 --- a/contrib/crossrpms/rtems4.11/bfin/rtems-4.11-bfin-rtems4.11-gcc.spec +++ b/contrib/crossrpms/rtems4.11/bfin/rtems-4.11-bfin-rtems4.11-gcc.spec @@ -58,7 +58,7 @@ Summary: bfin-rtems4.11 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 4%{?dist} +Release: 5%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -78,6 +78,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 @@ -254,7 +258,7 @@ BuildRequires: rtems-4.11-bfin-rtems4.11-binutils Requires: rtems-4.11-gcc-common Requires: rtems-4.11-bfin-rtems4.11-binutils Requires: rtems-4.11-bfin-rtems4.11-gcc-libgcc = %{gcc_rpmvers}-%{release} -Requires: rtems-4.11-bfin-rtems4.11-newlib = %{newlib_version}-19%{?dist} +Requires: rtems-4.11-bfin-rtems4.11-newlib = %{newlib_version}-20%{?dist} %if "%{gcc_version}" >= "4.5.0" BuildRequires: zlib-devel @@ -268,7 +272,7 @@ BuildRequires: %{_host_rpmprefix}zlib-devel %if "%{gcc_version}" == "4.5.1" Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.1-rtems4.11-20100726.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.1-rtems4.11-20100818.diff %endif %if "%{gcc_version}" == "4.5.0" Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 @@ -326,12 +330,19 @@ cd .. +%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 + %setup -q -T -D -n %{name}-%{version} -a50 cd newlib-%{newlib_version} %{?PATCH50:%patch50 -p1} 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 %if 0%{?_build_mpfr} %setup -q -T -D -n %{name}-%{version} -a60 @@ -361,7 +372,7 @@ cd .. ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf %endif -echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-19%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE +echo "RTEMS gcc-%{gcc_version}-5%{?dist}/newlib-%{newlib_version}-20%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE # Fix timestamps @@ -631,7 +642,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.11-bfin-rtems4.11-binutils -# Requires: rtems-4.11-bfin-rtems4.11-newlib = %{newlib_version}-19%{?dist} +# Requires: rtems-4.11-bfin-rtems4.11-newlib = %{newlib_version}-20%{?dist} # License: GPL # %if %build_infos @@ -649,7 +660,7 @@ Summary: libgcc for bfin-rtems4.11-gcc Group: Development/Tools Version: %{gcc_rpmvers} %{?_with_noarch_subpackages:BuildArch: noarch} -Requires: rtems-4.11-bfin-rtems4.11-newlib = %{newlib_version}-19%{?dist} +Requires: rtems-4.11-bfin-rtems4.11-newlib = %{newlib_version}-20%{?dist} License: GPL %description -n rtems-4.11-bfin-rtems4.11-gcc-libgcc @@ -823,7 +834,7 @@ Summary: C Library (newlib) for bfin-rtems4.11 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 19%{?dist} +Release: 20%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} Requires: rtems-4.11-newlib-common @@ -844,7 +855,7 @@ Newlib C Library for bfin-rtems4.11. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 19%{?dist} +Release: 20%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} License: Distributable diff --git a/contrib/crossrpms/rtems4.11/h8300/rtems-4.11-h8300-rtems4.11-gcc.spec b/contrib/crossrpms/rtems4.11/h8300/rtems-4.11-h8300-rtems4.11-gcc.spec index 381a67eb1a..94ce00330f 100644 --- a/contrib/crossrpms/rtems4.11/h8300/rtems-4.11-h8300-rtems4.11-gcc.spec +++ b/contrib/crossrpms/rtems4.11/h8300/rtems-4.11-h8300-rtems4.11-gcc.spec @@ -58,7 +58,7 @@ Summary: h8300-rtems4.11 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 4%{?dist} +Release: 5%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -78,6 +78,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 @@ -254,7 +258,7 @@ BuildRequires: rtems-4.11-h8300-rtems4.11-binutils Requires: rtems-4.11-gcc-common Requires: rtems-4.11-h8300-rtems4.11-binutils Requires: rtems-4.11-h8300-rtems4.11-gcc-libgcc = %{gcc_rpmvers}-%{release} -Requires: rtems-4.11-h8300-rtems4.11-newlib = %{newlib_version}-19%{?dist} +Requires: rtems-4.11-h8300-rtems4.11-newlib = %{newlib_version}-20%{?dist} %if "%{gcc_version}" >= "4.5.0" BuildRequires: zlib-devel @@ -268,7 +272,7 @@ BuildRequires: %{_host_rpmprefix}zlib-devel %if "%{gcc_version}" == "4.5.1" Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.1-rtems4.11-20100726.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.1-rtems4.11-20100818.diff %endif %if "%{gcc_version}" == "4.5.0" Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 @@ -326,12 +330,19 @@ cd .. +%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 + %setup -q -T -D -n %{name}-%{version} -a50 cd newlib-%{newlib_version} %{?PATCH50:%patch50 -p1} 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 %if 0%{?_build_mpfr} %setup -q -T -D -n %{name}-%{version} -a60 @@ -361,7 +372,7 @@ cd .. ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf %endif -echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-19%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE +echo "RTEMS gcc-%{gcc_version}-5%{?dist}/newlib-%{newlib_version}-20%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE # Fix timestamps @@ -631,7 +642,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.11-h8300-rtems4.11-binutils -# Requires: rtems-4.11-h8300-rtems4.11-newlib = %{newlib_version}-19%{?dist} +# Requires: rtems-4.11-h8300-rtems4.11-newlib = %{newlib_version}-20%{?dist} # License: GPL # %if %build_infos @@ -649,7 +660,7 @@ Summary: libgcc for h8300-rtems4.11-gcc Group: Development/Tools Version: %{gcc_rpmvers} %{?_with_noarch_subpackages:BuildArch: noarch} -Requires: rtems-4.11-h8300-rtems4.11-newlib = %{newlib_version}-19%{?dist} +Requires: rtems-4.11-h8300-rtems4.11-newlib = %{newlib_version}-20%{?dist} License: GPL %description -n rtems-4.11-h8300-rtems4.11-gcc-libgcc @@ -823,7 +834,7 @@ Summary: C Library (newlib) for h8300-rtems4.11 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 19%{?dist} +Release: 20%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} Requires: rtems-4.11-newlib-common @@ -844,7 +855,7 @@ Newlib C Library for h8300-rtems4.11. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 19%{?dist} +Release: 20%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} License: Distributable diff --git a/contrib/crossrpms/rtems4.11/i386/rtems-4.11-i386-rtems4.11-gcc.spec b/contrib/crossrpms/rtems4.11/i386/rtems-4.11-i386-rtems4.11-gcc.spec index 396c759db3..2811368d7c 100644 --- a/contrib/crossrpms/rtems4.11/i386/rtems-4.11-i386-rtems4.11-gcc.spec +++ b/contrib/crossrpms/rtems4.11/i386/rtems-4.11-i386-rtems4.11-gcc.spec @@ -58,7 +58,7 @@ Summary: i386-rtems4.11 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 4%{?dist} +Release: 5%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -78,6 +78,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 @@ -254,7 +258,7 @@ BuildRequires: rtems-4.11-i386-rtems4.11-binutils Requires: rtems-4.11-gcc-common Requires: rtems-4.11-i386-rtems4.11-binutils Requires: rtems-4.11-i386-rtems4.11-gcc-libgcc = %{gcc_rpmvers}-%{release} -Requires: rtems-4.11-i386-rtems4.11-newlib = %{newlib_version}-19%{?dist} +Requires: rtems-4.11-i386-rtems4.11-newlib = %{newlib_version}-20%{?dist} %if "%{gcc_version}" >= "4.5.0" BuildRequires: zlib-devel @@ -268,7 +272,7 @@ BuildRequires: %{_host_rpmprefix}zlib-devel %if "%{gcc_version}" == "4.5.1" Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.1-rtems4.11-20100726.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.1-rtems4.11-20100818.diff %endif %if "%{gcc_version}" == "4.5.0" Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 @@ -326,12 +330,19 @@ cd .. +%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 + %setup -q -T -D -n %{name}-%{version} -a50 cd newlib-%{newlib_version} %{?PATCH50:%patch50 -p1} 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 %if 0%{?_build_mpfr} %setup -q -T -D -n %{name}-%{version} -a60 @@ -361,7 +372,7 @@ cd .. ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf %endif -echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-19%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE +echo "RTEMS gcc-%{gcc_version}-5%{?dist}/newlib-%{newlib_version}-20%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE # Fix timestamps @@ -631,7 +642,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.11-i386-rtems4.11-binutils -# Requires: rtems-4.11-i386-rtems4.11-newlib = %{newlib_version}-19%{?dist} +# Requires: rtems-4.11-i386-rtems4.11-newlib = %{newlib_version}-20%{?dist} # License: GPL # %if %build_infos @@ -649,7 +660,7 @@ Summary: libgcc for i386-rtems4.11-gcc Group: Development/Tools Version: %{gcc_rpmvers} %{?_with_noarch_subpackages:BuildArch: noarch} -Requires: rtems-4.11-i386-rtems4.11-newlib = %{newlib_version}-19%{?dist} +Requires: rtems-4.11-i386-rtems4.11-newlib = %{newlib_version}-20%{?dist} License: GPL %description -n rtems-4.11-i386-rtems4.11-gcc-libgcc @@ -823,7 +834,7 @@ Summary: C Library (newlib) for i386-rtems4.11 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 19%{?dist} +Release: 20%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} Requires: rtems-4.11-newlib-common @@ -844,7 +855,7 @@ Newlib C Library for i386-rtems4.11. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 19%{?dist} +Release: 20%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} License: Distributable diff --git a/contrib/crossrpms/rtems4.11/lm32/rtems-4.11-lm32-rtems4.11-gcc.spec b/contrib/crossrpms/rtems4.11/lm32/rtems-4.11-lm32-rtems4.11-gcc.spec index b45d49bd73..58f92696f4 100644 --- a/contrib/crossrpms/rtems4.11/lm32/rtems-4.11-lm32-rtems4.11-gcc.spec +++ b/contrib/crossrpms/rtems4.11/lm32/rtems-4.11-lm32-rtems4.11-gcc.spec @@ -58,7 +58,7 @@ Summary: lm32-rtems4.11 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 4%{?dist} +Release: 5%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -78,6 +78,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 @@ -254,7 +258,7 @@ BuildRequires: rtems-4.11-lm32-rtems4.11-binutils Requires: rtems-4.11-gcc-common Requires: rtems-4.11-lm32-rtems4.11-binutils Requires: rtems-4.11-lm32-rtems4.11-gcc-libgcc = %{gcc_rpmvers}-%{release} -Requires: rtems-4.11-lm32-rtems4.11-newlib = %{newlib_version}-19%{?dist} +Requires: rtems-4.11-lm32-rtems4.11-newlib = %{newlib_version}-20%{?dist} %if "%{gcc_version}" >= "4.5.0" BuildRequires: zlib-devel @@ -268,7 +272,7 @@ BuildRequires: %{_host_rpmprefix}zlib-devel %if "%{gcc_version}" == "4.5.1" Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.1-rtems4.11-20100726.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.1-rtems4.11-20100818.diff %endif %if "%{gcc_version}" == "4.5.0" Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 @@ -326,12 +330,19 @@ cd .. +%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 + %setup -q -T -D -n %{name}-%{version} -a50 cd newlib-%{newlib_version} %{?PATCH50:%patch50 -p1} 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 %if 0%{?_build_mpfr} %setup -q -T -D -n %{name}-%{version} -a60 @@ -361,7 +372,7 @@ cd .. ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf %endif -echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-19%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE +echo "RTEMS gcc-%{gcc_version}-5%{?dist}/newlib-%{newlib_version}-20%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE # Fix timestamps @@ -631,7 +642,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.11-lm32-rtems4.11-binutils -# Requires: rtems-4.11-lm32-rtems4.11-newlib = %{newlib_version}-19%{?dist} +# Requires: rtems-4.11-lm32-rtems4.11-newlib = %{newlib_version}-20%{?dist} # License: GPL # %if %build_infos @@ -649,7 +660,7 @@ Summary: libgcc for lm32-rtems4.11-gcc Group: Development/Tools Version: %{gcc_rpmvers} %{?_with_noarch_subpackages:BuildArch: noarch} -Requires: rtems-4.11-lm32-rtems4.11-newlib = %{newlib_version}-19%{?dist} +Requires: rtems-4.11-lm32-rtems4.11-newlib = %{newlib_version}-20%{?dist} License: GPL %description -n rtems-4.11-lm32-rtems4.11-gcc-libgcc @@ -823,7 +834,7 @@ Summary: C Library (newlib) for lm32-rtems4.11 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 19%{?dist} +Release: 20%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} Requires: rtems-4.11-newlib-common @@ -844,7 +855,7 @@ Newlib C Library for lm32-rtems4.11. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 19%{?dist} +Release: 20%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} License: Distributable diff --git a/contrib/crossrpms/rtems4.11/m32c/rtems-4.11-m32c-rtems4.11-gcc.spec b/contrib/crossrpms/rtems4.11/m32c/rtems-4.11-m32c-rtems4.11-gcc.spec index 3ab2274066..4decd9da43 100644 --- a/contrib/crossrpms/rtems4.11/m32c/rtems-4.11-m32c-rtems4.11-gcc.spec +++ b/contrib/crossrpms/rtems4.11/m32c/rtems-4.11-m32c-rtems4.11-gcc.spec @@ -58,7 +58,7 @@ Summary: m32c-rtems4.11 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 4%{?dist} +Release: 5%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -78,6 +78,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 @@ -254,7 +258,7 @@ BuildRequires: rtems-4.11-m32c-rtems4.11-binutils Requires: rtems-4.11-gcc-common Requires: rtems-4.11-m32c-rtems4.11-binutils Requires: rtems-4.11-m32c-rtems4.11-gcc-libgcc = %{gcc_rpmvers}-%{release} -Requires: rtems-4.11-m32c-rtems4.11-newlib = %{newlib_version}-19%{?dist} +Requires: rtems-4.11-m32c-rtems4.11-newlib = %{newlib_version}-20%{?dist} %if "%{gcc_version}" >= "4.5.0" BuildRequires: zlib-devel @@ -268,7 +272,7 @@ BuildRequires: %{_host_rpmprefix}zlib-devel %if "%{gcc_version}" == "4.5.1" Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.1-rtems4.11-20100726.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.1-rtems4.11-20100818.diff %endif %if "%{gcc_version}" == "4.5.0" Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 @@ -314,12 +318,19 @@ cd .. +%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 + %setup -q -T -D -n %{name}-%{version} -a50 cd newlib-%{newlib_version} %{?PATCH50:%patch50 -p1} 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 %if 0%{?_build_mpfr} %setup -q -T -D -n %{name}-%{version} -a60 @@ -349,7 +360,7 @@ cd .. ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf %endif -echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-19%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE +echo "RTEMS gcc-%{gcc_version}-5%{?dist}/newlib-%{newlib_version}-20%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE # Fix timestamps @@ -618,7 +629,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.11-m32c-rtems4.11-binutils -# Requires: rtems-4.11-m32c-rtems4.11-newlib = %{newlib_version}-19%{?dist} +# Requires: rtems-4.11-m32c-rtems4.11-newlib = %{newlib_version}-20%{?dist} # License: GPL # %if %build_infos @@ -636,7 +647,7 @@ Summary: libgcc for m32c-rtems4.11-gcc Group: Development/Tools Version: %{gcc_rpmvers} %{?_with_noarch_subpackages:BuildArch: noarch} -Requires: rtems-4.11-m32c-rtems4.11-newlib = %{newlib_version}-19%{?dist} +Requires: rtems-4.11-m32c-rtems4.11-newlib = %{newlib_version}-20%{?dist} License: GPL %description -n rtems-4.11-m32c-rtems4.11-gcc-libgcc @@ -750,7 +761,7 @@ Summary: C Library (newlib) for m32c-rtems4.11 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 19%{?dist} +Release: 20%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} Requires: rtems-4.11-newlib-common @@ -771,7 +782,7 @@ Newlib C Library for m32c-rtems4.11. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 19%{?dist} +Release: 20%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} License: Distributable diff --git a/contrib/crossrpms/rtems4.11/m32r/rtems-4.11-m32r-rtems4.11-gcc.spec b/contrib/crossrpms/rtems4.11/m32r/rtems-4.11-m32r-rtems4.11-gcc.spec index 39e5a4a88f..eee780ba1a 100644 --- a/contrib/crossrpms/rtems4.11/m32r/rtems-4.11-m32r-rtems4.11-gcc.spec +++ b/contrib/crossrpms/rtems4.11/m32r/rtems-4.11-m32r-rtems4.11-gcc.spec @@ -58,7 +58,7 @@ Summary: m32r-rtems4.11 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 4%{?dist} +Release: 5%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -78,6 +78,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 @@ -254,7 +258,7 @@ BuildRequires: rtems-4.11-m32r-rtems4.11-binutils Requires: rtems-4.11-gcc-common Requires: rtems-4.11-m32r-rtems4.11-binutils Requires: rtems-4.11-m32r-rtems4.11-gcc-libgcc = %{gcc_rpmvers}-%{release} -Requires: rtems-4.11-m32r-rtems4.11-newlib = %{newlib_version}-19%{?dist} +Requires: rtems-4.11-m32r-rtems4.11-newlib = %{newlib_version}-20%{?dist} %if "%{gcc_version}" >= "4.5.0" BuildRequires: zlib-devel @@ -268,7 +272,7 @@ BuildRequires: %{_host_rpmprefix}zlib-devel %if "%{gcc_version}" == "4.5.1" Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.1-rtems4.11-20100726.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.1-rtems4.11-20100818.diff %endif %if "%{gcc_version}" == "4.5.0" Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 @@ -314,12 +318,19 @@ cd .. +%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 + %setup -q -T -D -n %{name}-%{version} -a50 cd newlib-%{newlib_version} %{?PATCH50:%patch50 -p1} 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 %if 0%{?_build_mpfr} %setup -q -T -D -n %{name}-%{version} -a60 @@ -349,7 +360,7 @@ cd .. ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf %endif -echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-19%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE +echo "RTEMS gcc-%{gcc_version}-5%{?dist}/newlib-%{newlib_version}-20%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE # Fix timestamps @@ -618,7 +629,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.11-m32r-rtems4.11-binutils -# Requires: rtems-4.11-m32r-rtems4.11-newlib = %{newlib_version}-19%{?dist} +# Requires: rtems-4.11-m32r-rtems4.11-newlib = %{newlib_version}-20%{?dist} # License: GPL # %if %build_infos @@ -636,7 +647,7 @@ Summary: libgcc for m32r-rtems4.11-gcc Group: Development/Tools Version: %{gcc_rpmvers} %{?_with_noarch_subpackages:BuildArch: noarch} -Requires: rtems-4.11-m32r-rtems4.11-newlib = %{newlib_version}-19%{?dist} +Requires: rtems-4.11-m32r-rtems4.11-newlib = %{newlib_version}-20%{?dist} License: GPL %description -n rtems-4.11-m32r-rtems4.11-gcc-libgcc @@ -750,7 +761,7 @@ Summary: C Library (newlib) for m32r-rtems4.11 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 19%{?dist} +Release: 20%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} Requires: rtems-4.11-newlib-common @@ -771,7 +782,7 @@ Newlib C Library for m32r-rtems4.11. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 19%{?dist} +Release: 20%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} License: Distributable diff --git a/contrib/crossrpms/rtems4.11/m68k/rtems-4.11-m68k-rtems4.11-gcc.spec b/contrib/crossrpms/rtems4.11/m68k/rtems-4.11-m68k-rtems4.11-gcc.spec index 73d98bee40..40b421f73c 100644 --- a/contrib/crossrpms/rtems4.11/m68k/rtems-4.11-m68k-rtems4.11-gcc.spec +++ b/contrib/crossrpms/rtems4.11/m68k/rtems-4.11-m68k-rtems4.11-gcc.spec @@ -58,7 +58,7 @@ Summary: m68k-rtems4.11 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 4%{?dist} +Release: 5%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -78,6 +78,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 @@ -254,7 +258,7 @@ BuildRequires: rtems-4.11-m68k-rtems4.11-binutils Requires: rtems-4.11-gcc-common Requires: rtems-4.11-m68k-rtems4.11-binutils Requires: rtems-4.11-m68k-rtems4.11-gcc-libgcc = %{gcc_rpmvers}-%{release} -Requires: rtems-4.11-m68k-rtems4.11-newlib = %{newlib_version}-19%{?dist} +Requires: rtems-4.11-m68k-rtems4.11-newlib = %{newlib_version}-20%{?dist} %if "%{gcc_version}" >= "4.5.0" BuildRequires: zlib-devel @@ -268,7 +272,7 @@ BuildRequires: %{_host_rpmprefix}zlib-devel %if "%{gcc_version}" == "4.5.1" Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.1-rtems4.11-20100726.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.1-rtems4.11-20100818.diff %endif %if "%{gcc_version}" == "4.5.0" Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 @@ -326,12 +330,19 @@ cd .. +%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 + %setup -q -T -D -n %{name}-%{version} -a50 cd newlib-%{newlib_version} %{?PATCH50:%patch50 -p1} 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 %if 0%{?_build_mpfr} %setup -q -T -D -n %{name}-%{version} -a60 @@ -361,7 +372,7 @@ cd .. ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf %endif -echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-19%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE +echo "RTEMS gcc-%{gcc_version}-5%{?dist}/newlib-%{newlib_version}-20%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE # Fix timestamps @@ -631,7 +642,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.11-m68k-rtems4.11-binutils -# Requires: rtems-4.11-m68k-rtems4.11-newlib = %{newlib_version}-19%{?dist} +# Requires: rtems-4.11-m68k-rtems4.11-newlib = %{newlib_version}-20%{?dist} # License: GPL # %if %build_infos @@ -649,7 +660,7 @@ Summary: libgcc for m68k-rtems4.11-gcc Group: Development/Tools Version: %{gcc_rpmvers} %{?_with_noarch_subpackages:BuildArch: noarch} -Requires: rtems-4.11-m68k-rtems4.11-newlib = %{newlib_version}-19%{?dist} +Requires: rtems-4.11-m68k-rtems4.11-newlib = %{newlib_version}-20%{?dist} License: GPL %description -n rtems-4.11-m68k-rtems4.11-gcc-libgcc @@ -823,7 +834,7 @@ Summary: C Library (newlib) for m68k-rtems4.11 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 19%{?dist} +Release: 20%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} Requires: rtems-4.11-newlib-common @@ -844,7 +855,7 @@ Newlib C Library for m68k-rtems4.11. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 19%{?dist} +Release: 20%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} License: Distributable diff --git a/contrib/crossrpms/rtems4.11/mips/rtems-4.11-mips-rtems4.11-gcc.spec b/contrib/crossrpms/rtems4.11/mips/rtems-4.11-mips-rtems4.11-gcc.spec index fafc12ed03..fa9b3e7615 100644 --- a/contrib/crossrpms/rtems4.11/mips/rtems-4.11-mips-rtems4.11-gcc.spec +++ b/contrib/crossrpms/rtems4.11/mips/rtems-4.11-mips-rtems4.11-gcc.spec @@ -58,7 +58,7 @@ Summary: mips-rtems4.11 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 4%{?dist} +Release: 5%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -78,6 +78,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 @@ -254,7 +258,7 @@ BuildRequires: rtems-4.11-mips-rtems4.11-binutils Requires: rtems-4.11-gcc-common Requires: rtems-4.11-mips-rtems4.11-binutils Requires: rtems-4.11-mips-rtems4.11-gcc-libgcc = %{gcc_rpmvers}-%{release} -Requires: rtems-4.11-mips-rtems4.11-newlib = %{newlib_version}-19%{?dist} +Requires: rtems-4.11-mips-rtems4.11-newlib = %{newlib_version}-20%{?dist} %if "%{gcc_version}" >= "4.5.0" BuildRequires: zlib-devel @@ -268,7 +272,7 @@ BuildRequires: %{_host_rpmprefix}zlib-devel %if "%{gcc_version}" == "4.5.1" Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.1-rtems4.11-20100726.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.1-rtems4.11-20100818.diff %endif %if "%{gcc_version}" == "4.5.0" Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 @@ -326,12 +330,19 @@ cd .. +%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 + %setup -q -T -D -n %{name}-%{version} -a50 cd newlib-%{newlib_version} %{?PATCH50:%patch50 -p1} 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 %if 0%{?_build_mpfr} %setup -q -T -D -n %{name}-%{version} -a60 @@ -361,7 +372,7 @@ cd .. ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf %endif -echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-19%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE +echo "RTEMS gcc-%{gcc_version}-5%{?dist}/newlib-%{newlib_version}-20%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE # Fix timestamps @@ -631,7 +642,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.11-mips-rtems4.11-binutils -# Requires: rtems-4.11-mips-rtems4.11-newlib = %{newlib_version}-19%{?dist} +# Requires: rtems-4.11-mips-rtems4.11-newlib = %{newlib_version}-20%{?dist} # License: GPL # %if %build_infos @@ -649,7 +660,7 @@ Summary: libgcc for mips-rtems4.11-gcc Group: Development/Tools Version: %{gcc_rpmvers} %{?_with_noarch_subpackages:BuildArch: noarch} -Requires: rtems-4.11-mips-rtems4.11-newlib = %{newlib_version}-19%{?dist} +Requires: rtems-4.11-mips-rtems4.11-newlib = %{newlib_version}-20%{?dist} License: GPL %description -n rtems-4.11-mips-rtems4.11-gcc-libgcc @@ -823,7 +834,7 @@ Summary: C Library (newlib) for mips-rtems4.11 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 19%{?dist} +Release: 20%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} Requires: rtems-4.11-newlib-common @@ -844,7 +855,7 @@ Newlib C Library for mips-rtems4.11. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 19%{?dist} +Release: 20%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} License: Distributable diff --git a/contrib/crossrpms/rtems4.11/powerpc/rtems-4.11-powerpc-rtems4.11-gcc.spec b/contrib/crossrpms/rtems4.11/powerpc/rtems-4.11-powerpc-rtems4.11-gcc.spec index 1052741552..7041cb964e 100644 --- a/contrib/crossrpms/rtems4.11/powerpc/rtems-4.11-powerpc-rtems4.11-gcc.spec +++ b/contrib/crossrpms/rtems4.11/powerpc/rtems-4.11-powerpc-rtems4.11-gcc.spec @@ -58,7 +58,7 @@ Summary: powerpc-rtems4.11 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 4%{?dist} +Release: 5%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -78,6 +78,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 @@ -254,7 +258,7 @@ BuildRequires: rtems-4.11-powerpc-rtems4.11-binutils Requires: rtems-4.11-gcc-common Requires: rtems-4.11-powerpc-rtems4.11-binutils Requires: rtems-4.11-powerpc-rtems4.11-gcc-libgcc = %{gcc_rpmvers}-%{release} -Requires: rtems-4.11-powerpc-rtems4.11-newlib = %{newlib_version}-19%{?dist} +Requires: rtems-4.11-powerpc-rtems4.11-newlib = %{newlib_version}-20%{?dist} %if "%{gcc_version}" >= "4.5.0" BuildRequires: zlib-devel @@ -268,7 +272,7 @@ BuildRequires: %{_host_rpmprefix}zlib-devel %if "%{gcc_version}" == "4.5.1" Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.1-rtems4.11-20100726.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.1-rtems4.11-20100818.diff %endif %if "%{gcc_version}" == "4.5.0" Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 @@ -326,12 +330,19 @@ cd .. +%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 + %setup -q -T -D -n %{name}-%{version} -a50 cd newlib-%{newlib_version} %{?PATCH50:%patch50 -p1} 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 %if 0%{?_build_mpfr} %setup -q -T -D -n %{name}-%{version} -a60 @@ -361,7 +372,7 @@ cd .. ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf %endif -echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-19%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE +echo "RTEMS gcc-%{gcc_version}-5%{?dist}/newlib-%{newlib_version}-20%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE # Fix timestamps @@ -631,7 +642,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.11-powerpc-rtems4.11-binutils -# Requires: rtems-4.11-powerpc-rtems4.11-newlib = %{newlib_version}-19%{?dist} +# Requires: rtems-4.11-powerpc-rtems4.11-newlib = %{newlib_version}-20%{?dist} # License: GPL # %if %build_infos @@ -649,7 +660,7 @@ Summary: libgcc for powerpc-rtems4.11-gcc Group: Development/Tools Version: %{gcc_rpmvers} %{?_with_noarch_subpackages:BuildArch: noarch} -Requires: rtems-4.11-powerpc-rtems4.11-newlib = %{newlib_version}-19%{?dist} +Requires: rtems-4.11-powerpc-rtems4.11-newlib = %{newlib_version}-20%{?dist} License: GPL %description -n rtems-4.11-powerpc-rtems4.11-gcc-libgcc @@ -823,7 +834,7 @@ Summary: C Library (newlib) for powerpc-rtems4.11 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 19%{?dist} +Release: 20%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} Requires: rtems-4.11-newlib-common @@ -844,7 +855,7 @@ Newlib C Library for powerpc-rtems4.11. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 19%{?dist} +Release: 20%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} License: Distributable diff --git a/contrib/crossrpms/rtems4.11/sh/rtems-4.11-sh-rtems4.11-gcc.spec b/contrib/crossrpms/rtems4.11/sh/rtems-4.11-sh-rtems4.11-gcc.spec index 26f1ab5a49..b68d0c82ae 100644 --- a/contrib/crossrpms/rtems4.11/sh/rtems-4.11-sh-rtems4.11-gcc.spec +++ b/contrib/crossrpms/rtems4.11/sh/rtems-4.11-sh-rtems4.11-gcc.spec @@ -58,7 +58,7 @@ Summary: sh-rtems4.11 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 4%{?dist} +Release: 5%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -78,6 +78,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 @@ -254,7 +258,7 @@ BuildRequires: rtems-4.11-sh-rtems4.11-binutils Requires: rtems-4.11-gcc-common Requires: rtems-4.11-sh-rtems4.11-binutils Requires: rtems-4.11-sh-rtems4.11-gcc-libgcc = %{gcc_rpmvers}-%{release} -Requires: rtems-4.11-sh-rtems4.11-newlib = %{newlib_version}-19%{?dist} +Requires: rtems-4.11-sh-rtems4.11-newlib = %{newlib_version}-20%{?dist} %if "%{gcc_version}" >= "4.5.0" BuildRequires: zlib-devel @@ -268,7 +272,7 @@ BuildRequires: %{_host_rpmprefix}zlib-devel %if "%{gcc_version}" == "4.5.1" Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.1-rtems4.11-20100726.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.1-rtems4.11-20100818.diff %endif %if "%{gcc_version}" == "4.5.0" Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 @@ -326,12 +330,19 @@ cd .. +%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 + %setup -q -T -D -n %{name}-%{version} -a50 cd newlib-%{newlib_version} %{?PATCH50:%patch50 -p1} 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 %if 0%{?_build_mpfr} %setup -q -T -D -n %{name}-%{version} -a60 @@ -361,7 +372,7 @@ cd .. ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf %endif -echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-19%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE +echo "RTEMS gcc-%{gcc_version}-5%{?dist}/newlib-%{newlib_version}-20%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE # Fix timestamps @@ -631,7 +642,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.11-sh-rtems4.11-binutils -# Requires: rtems-4.11-sh-rtems4.11-newlib = %{newlib_version}-19%{?dist} +# Requires: rtems-4.11-sh-rtems4.11-newlib = %{newlib_version}-20%{?dist} # License: GPL # %if %build_infos @@ -649,7 +660,7 @@ Summary: libgcc for sh-rtems4.11-gcc Group: Development/Tools Version: %{gcc_rpmvers} %{?_with_noarch_subpackages:BuildArch: noarch} -Requires: rtems-4.11-sh-rtems4.11-newlib = %{newlib_version}-19%{?dist} +Requires: rtems-4.11-sh-rtems4.11-newlib = %{newlib_version}-20%{?dist} License: GPL %description -n rtems-4.11-sh-rtems4.11-gcc-libgcc @@ -823,7 +834,7 @@ Summary: C Library (newlib) for sh-rtems4.11 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 19%{?dist} +Release: 20%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} Requires: rtems-4.11-newlib-common @@ -844,7 +855,7 @@ Newlib C Library for sh-rtems4.11. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 19%{?dist} +Release: 20%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} License: Distributable diff --git a/contrib/crossrpms/rtems4.11/sparc/rtems-4.11-sparc-rtems4.11-gcc.spec b/contrib/crossrpms/rtems4.11/sparc/rtems-4.11-sparc-rtems4.11-gcc.spec index 4e58e3a33d..08e71f6c52 100644 --- a/contrib/crossrpms/rtems4.11/sparc/rtems-4.11-sparc-rtems4.11-gcc.spec +++ b/contrib/crossrpms/rtems4.11/sparc/rtems-4.11-sparc-rtems4.11-gcc.spec @@ -58,7 +58,7 @@ Summary: sparc-rtems4.11 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 4%{?dist} +Release: 5%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -78,6 +78,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 @@ -254,7 +258,7 @@ BuildRequires: rtems-4.11-sparc-rtems4.11-binutils Requires: rtems-4.11-gcc-common Requires: rtems-4.11-sparc-rtems4.11-binutils Requires: rtems-4.11-sparc-rtems4.11-gcc-libgcc = %{gcc_rpmvers}-%{release} -Requires: rtems-4.11-sparc-rtems4.11-newlib = %{newlib_version}-19%{?dist} +Requires: rtems-4.11-sparc-rtems4.11-newlib = %{newlib_version}-20%{?dist} %if "%{gcc_version}" >= "4.5.0" BuildRequires: zlib-devel @@ -268,7 +272,7 @@ BuildRequires: %{_host_rpmprefix}zlib-devel %if "%{gcc_version}" == "4.5.1" Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.1-rtems4.11-20100726.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.1-rtems4.11-20100818.diff %endif %if "%{gcc_version}" == "4.5.0" Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 @@ -326,12 +330,19 @@ cd .. +%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 + %setup -q -T -D -n %{name}-%{version} -a50 cd newlib-%{newlib_version} %{?PATCH50:%patch50 -p1} 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 %if 0%{?_build_mpfr} %setup -q -T -D -n %{name}-%{version} -a60 @@ -361,7 +372,7 @@ cd .. ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf %endif -echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-19%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE +echo "RTEMS gcc-%{gcc_version}-5%{?dist}/newlib-%{newlib_version}-20%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE # Fix timestamps @@ -631,7 +642,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.11-sparc-rtems4.11-binutils -# Requires: rtems-4.11-sparc-rtems4.11-newlib = %{newlib_version}-19%{?dist} +# Requires: rtems-4.11-sparc-rtems4.11-newlib = %{newlib_version}-20%{?dist} # License: GPL # %if %build_infos @@ -649,7 +660,7 @@ Summary: libgcc for sparc-rtems4.11-gcc Group: Development/Tools Version: %{gcc_rpmvers} %{?_with_noarch_subpackages:BuildArch: noarch} -Requires: rtems-4.11-sparc-rtems4.11-newlib = %{newlib_version}-19%{?dist} +Requires: rtems-4.11-sparc-rtems4.11-newlib = %{newlib_version}-20%{?dist} License: GPL %description -n rtems-4.11-sparc-rtems4.11-gcc-libgcc @@ -823,7 +834,7 @@ Summary: C Library (newlib) for sparc-rtems4.11 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 19%{?dist} +Release: 20%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} Requires: rtems-4.11-newlib-common @@ -844,7 +855,7 @@ Newlib C Library for sparc-rtems4.11. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 19%{?dist} +Release: 20%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} License: Distributable diff --git a/contrib/crossrpms/rtems4.11/sparc64/rtems-4.11-sparc64-rtems4.11-gcc.spec b/contrib/crossrpms/rtems4.11/sparc64/rtems-4.11-sparc64-rtems4.11-gcc.spec index 6148d83d0a..da14f887e2 100644 --- a/contrib/crossrpms/rtems4.11/sparc64/rtems-4.11-sparc64-rtems4.11-gcc.spec +++ b/contrib/crossrpms/rtems4.11/sparc64/rtems-4.11-sparc64-rtems4.11-gcc.spec @@ -58,7 +58,7 @@ Summary: sparc64-rtems4.11 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 4%{?dist} +Release: 5%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -78,6 +78,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 @@ -254,7 +258,7 @@ BuildRequires: rtems-4.11-sparc64-rtems4.11-binutils Requires: rtems-4.11-gcc-common Requires: rtems-4.11-sparc64-rtems4.11-binutils Requires: rtems-4.11-sparc64-rtems4.11-gcc-libgcc = %{gcc_rpmvers}-%{release} -Requires: rtems-4.11-sparc64-rtems4.11-newlib = %{newlib_version}-19%{?dist} +Requires: rtems-4.11-sparc64-rtems4.11-newlib = %{newlib_version}-20%{?dist} %if "%{gcc_version}" >= "4.5.0" BuildRequires: zlib-devel @@ -268,7 +272,7 @@ BuildRequires: %{_host_rpmprefix}zlib-devel %if "%{gcc_version}" == "4.5.1" Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.1-rtems4.11-20100726.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.1-rtems4.11-20100818.diff %endif %if "%{gcc_version}" == "4.5.0" Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 @@ -326,12 +330,19 @@ cd .. +%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 + %setup -q -T -D -n %{name}-%{version} -a50 cd newlib-%{newlib_version} %{?PATCH50:%patch50 -p1} 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 %if 0%{?_build_mpfr} %setup -q -T -D -n %{name}-%{version} -a60 @@ -361,7 +372,7 @@ cd .. ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf %endif -echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-19%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE +echo "RTEMS gcc-%{gcc_version}-5%{?dist}/newlib-%{newlib_version}-20%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE # Fix timestamps @@ -631,7 +642,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.11-sparc64-rtems4.11-binutils -# Requires: rtems-4.11-sparc64-rtems4.11-newlib = %{newlib_version}-19%{?dist} +# Requires: rtems-4.11-sparc64-rtems4.11-newlib = %{newlib_version}-20%{?dist} # License: GPL # %if %build_infos @@ -649,7 +660,7 @@ Summary: libgcc for sparc64-rtems4.11-gcc Group: Development/Tools Version: %{gcc_rpmvers} %{?_with_noarch_subpackages:BuildArch: noarch} -Requires: rtems-4.11-sparc64-rtems4.11-newlib = %{newlib_version}-19%{?dist} +Requires: rtems-4.11-sparc64-rtems4.11-newlib = %{newlib_version}-20%{?dist} License: GPL %description -n rtems-4.11-sparc64-rtems4.11-gcc-libgcc @@ -823,7 +834,7 @@ Summary: C Library (newlib) for sparc64-rtems4.11 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 19%{?dist} +Release: 20%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} Requires: rtems-4.11-newlib-common @@ -844,7 +855,7 @@ Newlib C Library for sparc64-rtems4.11. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 19%{?dist} +Release: 20%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} License: Distributable |