summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2011-01-10 08:52:20 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2011-01-10 08:52:20 +0000
commitdcbe86c64021673347ce4fa4314d10d1fc1dbd95 (patch)
tree5ab59f1652c427d169e3a6a231a67bef0b04ef10
parente9d1334d6852874782b5d6b317e95a0e7f8f45ae (diff)
Regenerate.
-rw-r--r--contrib/crossrpms/rtems4.10/arm/rtems-4.10-arm-rtems4.10-gcc.spec39
-rw-r--r--contrib/crossrpms/rtems4.10/avr/rtems-4.10-avr-rtems4.10-gcc.spec39
-rw-r--r--contrib/crossrpms/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-gcc.spec39
-rw-r--r--contrib/crossrpms/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-gcc.spec39
-rw-r--r--contrib/crossrpms/rtems4.10/i386/rtems-4.10-i386-rtems4.10-gcc.spec39
-rw-r--r--contrib/crossrpms/rtems4.10/lm32/rtems-4.10-lm32-rtems4.10-gcc.spec39
-rw-r--r--contrib/crossrpms/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-gcc.spec39
-rw-r--r--contrib/crossrpms/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-gcc.spec39
-rw-r--r--contrib/crossrpms/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-gcc.spec39
-rw-r--r--contrib/crossrpms/rtems4.10/mips/rtems-4.10-mips-rtems4.10-gcc.spec39
-rw-r--r--contrib/crossrpms/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-gcc.spec39
-rw-r--r--contrib/crossrpms/rtems4.10/sh/rtems-4.10-sh-rtems4.10-gcc.spec39
-rw-r--r--contrib/crossrpms/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-gcc.spec39
13 files changed, 325 insertions, 182 deletions
diff --git a/contrib/crossrpms/rtems4.10/arm/rtems-4.10-arm-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/arm/rtems-4.10-arm-rtems4.10-gcc.spec
index ab938b590d..96bcbe542b 100644
--- a/contrib/crossrpms/rtems4.10/arm/rtems-4.10-arm-rtems4.10-gcc.spec
+++ b/contrib/crossrpms/rtems4.10/arm/rtems-4.10-arm-rtems4.10-gcc.spec
@@ -58,7 +58,7 @@ Summary: arm-rtems4.10 gcc
Group: Development/Tools
Version: %{gcc_rpmvers}
-Release: 2%{?dist}
+Release: 3%{?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
@@ -85,6 +89,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
@@ -97,12 +107,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
@@ -248,7 +252,7 @@ BuildRequires: rtems-4.10-arm-rtems4.10-binutils
Requires: rtems-4.10-gcc-common
Requires: rtems-4.10-arm-rtems4.10-binutils
Requires: rtems-4.10-arm-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires: rtems-4.10-arm-rtems4.10-newlib = %{newlib_version}-17%{?dist}
+Requires: rtems-4.10-arm-rtems4.10-newlib = %{newlib_version}-18%{?dist}
%if "%{gcc_version}" >= "4.5.0"
BuildRequires: zlib-devel
@@ -280,7 +284,7 @@ Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar
%if "%{newlib_version}" == "1.18.0"
Source50: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_pkgvers}.tar.gz
-Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/newlib-1.18.0-rtems4.10-20101006.diff
+Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/newlib-1.18.0-rtems4.10-20110110.diff
%endif
%{?_without_sources:NoSource: 50}
@@ -320,12 +324,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
@@ -355,7 +366,7 @@ cd ..
ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
%endif
-echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-17%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-3%{?dist}/newlib-%{newlib_version}-18%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
# Fix timestamps
@@ -625,7 +636,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
# Group: Development/Tools
# Version: %{gcc_rpmvers}
# Requires: rtems-4.10-arm-rtems4.10-binutils
-# Requires: rtems-4.10-arm-rtems4.10-newlib = %{newlib_version}-17%{?dist}
+# Requires: rtems-4.10-arm-rtems4.10-newlib = %{newlib_version}-18%{?dist}
# License: GPL
# %if %build_infos
@@ -643,7 +654,7 @@ Summary: libgcc for arm-rtems4.10-gcc
Group: Development/Tools
Version: %{gcc_rpmvers}
%{?_with_noarch_subpackages:BuildArch: noarch}
-Requires: rtems-4.10-arm-rtems4.10-newlib = %{newlib_version}-17%{?dist}
+Requires: rtems-4.10-arm-rtems4.10-newlib = %{newlib_version}-18%{?dist}
License: GPL
%description -n rtems-4.10-arm-rtems4.10-gcc-libgcc
@@ -817,7 +828,7 @@ Summary: C Library (newlib) for arm-rtems4.10
Group: Development/Tools
License: Distributable
Version: %{newlib_version}
-Release: 17%{?dist}
+Release: 18%{?dist}
%{?_with_noarch_subpackages:BuildArch: noarch}
Requires: rtems-4.10-newlib-common
@@ -838,7 +849,7 @@ Newlib C Library for arm-rtems4.10.
Summary: Base package for RTEMS newlib C Library
Group: Development/Tools
Version: %{newlib_version}
-Release: 17%{?dist}
+Release: 18%{?dist}
%{?_with_noarch_subpackages:BuildArch: noarch}
License: Distributable
diff --git a/contrib/crossrpms/rtems4.10/avr/rtems-4.10-avr-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/avr/rtems-4.10-avr-rtems4.10-gcc.spec
index 3a1f43010d..566729911d 100644
--- a/contrib/crossrpms/rtems4.10/avr/rtems-4.10-avr-rtems4.10-gcc.spec
+++ b/contrib/crossrpms/rtems4.10/avr/rtems-4.10-avr-rtems4.10-gcc.spec
@@ -58,7 +58,7 @@ Summary: avr-rtems4.10 gcc
Group: Development/Tools
Version: %{gcc_rpmvers}
-Release: 2%{?dist}
+Release: 3%{?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
@@ -85,6 +89,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
@@ -97,12 +107,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
@@ -248,7 +252,7 @@ BuildRequires: rtems-4.10-avr-rtems4.10-binutils
Requires: rtems-4.10-gcc-common
Requires: rtems-4.10-avr-rtems4.10-binutils
Requires: rtems-4.10-avr-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires: rtems-4.10-avr-rtems4.10-newlib = %{newlib_version}-17%{?dist}
+Requires: rtems-4.10-avr-rtems4.10-newlib = %{newlib_version}-18%{?dist}
%if "%{gcc_version}" >= "4.5.0"
BuildRequires: zlib-devel
@@ -272,7 +276,7 @@ Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.4-rtems4.10-201
%if "%{newlib_version}" == "1.18.0"
Source50: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_pkgvers}.tar.gz
-Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/newlib-1.18.0-rtems4.10-20101006.diff
+Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/newlib-1.18.0-rtems4.10-20110110.diff
%endif
%{?_without_sources:NoSource: 50}
@@ -308,12 +312,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
@@ -343,7 +354,7 @@ cd ..
ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
%endif
-echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-17%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-3%{?dist}/newlib-%{newlib_version}-18%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
# Fix timestamps
@@ -612,7 +623,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
# Group: Development/Tools
# Version: %{gcc_rpmvers}
# Requires: rtems-4.10-avr-rtems4.10-binutils
-# Requires: rtems-4.10-avr-rtems4.10-newlib = %{newlib_version}-17%{?dist}
+# Requires: rtems-4.10-avr-rtems4.10-newlib = %{newlib_version}-18%{?dist}
# License: GPL
# %if %build_infos
@@ -630,7 +641,7 @@ Summary: libgcc for avr-rtems4.10-gcc
Group: Development/Tools
Version: %{gcc_rpmvers}
%{?_with_noarch_subpackages:BuildArch: noarch}
-Requires: rtems-4.10-avr-rtems4.10-newlib = %{newlib_version}-17%{?dist}
+Requires: rtems-4.10-avr-rtems4.10-newlib = %{newlib_version}-18%{?dist}
License: GPL
%description -n rtems-4.10-avr-rtems4.10-gcc-libgcc
@@ -743,7 +754,7 @@ Summary: C Library (newlib) for avr-rtems4.10
Group: Development/Tools
License: Distributable
Version: %{newlib_version}
-Release: 17%{?dist}
+Release: 18%{?dist}
%{?_with_noarch_subpackages:BuildArch: noarch}
Requires: rtems-4.10-newlib-common
@@ -764,7 +775,7 @@ Newlib C Library for avr-rtems4.10.
Summary: Base package for RTEMS newlib C Library
Group: Development/Tools
Version: %{newlib_version}
-Release: 17%{?dist}
+Release: 18%{?dist}
%{?_with_noarch_subpackages:BuildArch: noarch}
License: Distributable
diff --git a/contrib/crossrpms/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-gcc.spec
index 0cb1647128..b16110baf4 100644
--- a/contrib/crossrpms/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-gcc.spec
+++ b/contrib/crossrpms/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-gcc.spec
@@ -58,7 +58,7 @@ Summary: bfin-rtems4.10 gcc
Group: Development/Tools
Version: %{gcc_rpmvers}
-Release: 2%{?dist}
+Release: 3%{?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
@@ -85,6 +89,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
@@ -97,12 +107,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
@@ -248,7 +252,7 @@ BuildRequires: rtems-4.10-bfin-rtems4.10-binutils
Requires: rtems-4.10-gcc-common
Requires: rtems-4.10-bfin-rtems4.10-binutils
Requires: rtems-4.10-bfin-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires: rtems-4.10-bfin-rtems4.10-newlib = %{newlib_version}-17%{?dist}
+Requires: rtems-4.10-bfin-rtems4.10-newlib = %{newlib_version}-18%{?dist}
%if "%{gcc_version}" >= "4.5.0"
BuildRequires: zlib-devel
@@ -280,7 +284,7 @@ Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar
%if "%{newlib_version}" == "1.18.0"
Source50: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_pkgvers}.tar.gz
-Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/newlib-1.18.0-rtems4.10-20101006.diff
+Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/newlib-1.18.0-rtems4.10-20110110.diff
%endif
%{?_without_sources:NoSource: 50}
@@ -320,12 +324,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
@@ -355,7 +366,7 @@ cd ..
ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
%endif
-echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-17%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-3%{?dist}/newlib-%{newlib_version}-18%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
# Fix timestamps
@@ -625,7 +636,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
# Group: Development/Tools
# Version: %{gcc_rpmvers}
# Requires: rtems-4.10-bfin-rtems4.10-binutils
-# Requires: rtems-4.10-bfin-rtems4.10-newlib = %{newlib_version}-17%{?dist}
+# Requires: rtems-4.10-bfin-rtems4.10-newlib = %{newlib_version}-18%{?dist}
# License: GPL
# %if %build_infos
@@ -643,7 +654,7 @@ Summary: libgcc for bfin-rtems4.10-gcc
Group: Development/Tools
Version: %{gcc_rpmvers}
%{?_with_noarch_subpackages:BuildArch: noarch}
-Requires: rtems-4.10-bfin-rtems4.10-newlib = %{newlib_version}-17%{?dist}
+Requires: rtems-4.10-bfin-rtems4.10-newlib = %{newlib_version}-18%{?dist}
License: GPL
%description -n rtems-4.10-bfin-rtems4.10-gcc-libgcc
@@ -817,7 +828,7 @@ Summary: C Library (newlib) for bfin-rtems4.10
Group: Development/Tools
License: Distributable
Version: %{newlib_version}
-Release: 17%{?dist}
+Release: 18%{?dist}
%{?_with_noarch_subpackages:BuildArch: noarch}
Requires: rtems-4.10-newlib-common
@@ -838,7 +849,7 @@ Newlib C Library for bfin-rtems4.10.
Summary: Base package for RTEMS newlib C Library
Group: Development/Tools
Version: %{newlib_version}
-Release: 17%{?dist}
+Release: 18%{?dist}
%{?_with_noarch_subpackages:BuildArch: noarch}
License: Distributable
diff --git a/contrib/crossrpms/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-gcc.spec
index 0add943cce..55c2dbe96f 100644
--- a/contrib/crossrpms/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-gcc.spec
+++ b/contrib/crossrpms/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-gcc.spec
@@ -58,7 +58,7 @@ Summary: h8300-rtems4.10 gcc
Group: Development/Tools
Version: %{gcc_rpmvers}
-Release: 2%{?dist}
+Release: 3%{?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
@@ -85,6 +89,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
@@ -97,12 +107,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
@@ -248,7 +252,7 @@ BuildRequires: rtems-4.10-h8300-rtems4.10-binutils
Requires: rtems-4.10-gcc-common
Requires: rtems-4.10-h8300-rtems4.10-binutils
Requires: rtems-4.10-h8300-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires: rtems-4.10-h8300-rtems4.10-newlib = %{newlib_version}-17%{?dist}
+Requires: rtems-4.10-h8300-rtems4.10-newlib = %{newlib_version}-18%{?dist}
%if "%{gcc_version}" >= "4.5.0"
BuildRequires: zlib-devel
@@ -280,7 +284,7 @@ Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar
%if "%{newlib_version}" == "1.18.0"
Source50: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_pkgvers}.tar.gz
-Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/newlib-1.18.0-rtems4.10-20101006.diff
+Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/newlib-1.18.0-rtems4.10-20110110.diff
%endif
%{?_without_sources:NoSource: 50}
@@ -320,12 +324,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
@@ -355,7 +366,7 @@ cd ..
ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
%endif
-echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-17%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-3%{?dist}/newlib-%{newlib_version}-18%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
# Fix timestamps
@@ -625,7 +636,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
# Group: Development/Tools
# Version: %{gcc_rpmvers}
# Requires: rtems-4.10-h8300-rtems4.10-binutils
-# Requires: rtems-4.10-h8300-rtems4.10-newlib = %{newlib_version}-17%{?dist}
+# Requires: rtems-4.10-h8300-rtems4.10-newlib = %{newlib_version}-18%{?dist}
# License: GPL
# %if %build_infos
@@ -643,7 +654,7 @@ Summary: libgcc for h8300-rtems4.10-gcc
Group: Development/Tools
Version: %{gcc_rpmvers}
%{?_with_noarch_subpackages:BuildArch: noarch}
-Requires: rtems-4.10-h8300-rtems4.10-newlib = %{newlib_version}-17%{?dist}
+Requires: rtems-4.10-h8300-rtems4.10-newlib = %{newlib_version}-18%{?dist}
License: GPL
%description -n rtems-4.10-h8300-rtems4.10-gcc-libgcc
@@ -817,7 +828,7 @@ Summary: C Library (newlib) for h8300-rtems4.10
Group: Development/Tools
License: Distributable
Version: %{newlib_version}
-Release: 17%{?dist}
+Release: 18%{?dist}
%{?_with_noarch_subpackages:BuildArch: noarch}
Requires: rtems-4.10-newlib-common
@@ -838,7 +849,7 @@ Newlib C Library for h8300-rtems4.10.
Summary: Base package for RTEMS newlib C Library
Group: Development/Tools
Version: %{newlib_version}
-Release: 17%{?dist}
+Release: 18%{?dist}
%{?_with_noarch_subpackages:BuildArch: noarch}
License: Distributable
diff --git a/contrib/crossrpms/rtems4.10/i386/rtems-4.10-i386-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/i386/rtems-4.10-i386-rtems4.10-gcc.spec
index 831382f20d..d4856f3b86 100644
--- a/contrib/crossrpms/rtems4.10/i386/rtems-4.10-i386-rtems4.10-gcc.spec
+++ b/contrib/crossrpms/rtems4.10/i386/rtems-4.10-i386-rtems4.10-gcc.spec
@@ -58,7 +58,7 @@ Summary: i386-rtems4.10 gcc
Group: Development/Tools
Version: %{gcc_rpmvers}
-Release: 2%{?dist}
+Release: 3%{?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
@@ -85,6 +89,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
@@ -97,12 +107,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
@@ -248,7 +252,7 @@ BuildRequires: rtems-4.10-i386-rtems4.10-binutils
Requires: rtems-4.10-gcc-common
Requires: rtems-4.10-i386-rtems4.10-binutils
Requires: rtems-4.10-i386-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires: rtems-4.10-i386-rtems4.10-newlib = %{newlib_version}-17%{?dist}
+Requires: rtems-4.10-i386-rtems4.10-newlib = %{newlib_version}-18%{?dist}
%if "%{gcc_version}" >= "4.5.0"
BuildRequires: zlib-devel
@@ -280,7 +284,7 @@ Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar
%if "%{newlib_version}" == "1.18.0"
Source50: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_pkgvers}.tar.gz
-Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/newlib-1.18.0-rtems4.10-20101006.diff
+Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/newlib-1.18.0-rtems4.10-20110110.diff
%endif
%{?_without_sources:NoSource: 50}
@@ -320,12 +324,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
@@ -355,7 +366,7 @@ cd ..
ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
%endif
-echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-17%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-3%{?dist}/newlib-%{newlib_version}-18%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
# Fix timestamps
@@ -625,7 +636,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
# Group: Development/Tools
# Version: %{gcc_rpmvers}
# Requires: rtems-4.10-i386-rtems4.10-binutils
-# Requires: rtems-4.10-i386-rtems4.10-newlib = %{newlib_version}-17%{?dist}
+# Requires: rtems-4.10-i386-rtems4.10-newlib = %{newlib_version}-18%{?dist}
# License: GPL
# %if %build_infos
@@ -643,7 +654,7 @@ Summary: libgcc for i386-rtems4.10-gcc
Group: Development/Tools
Version: %{gcc_rpmvers}
%{?_with_noarch_subpackages:BuildArch: noarch}
-Requires: rtems-4.10-i386-rtems4.10-newlib = %{newlib_version}-17%{?dist}
+Requires: rtems-4.10-i386-rtems4.10-newlib = %{newlib_version}-18%{?dist}
License: GPL
%description -n rtems-4.10-i386-rtems4.10-gcc-libgcc
@@ -817,7 +828,7 @@ Summary: C Library (newlib) for i386-rtems4.10
Group: Development/Tools
License: Distributable
Version: %{newlib_version}
-Release: 17%{?dist}
+Release: 18%{?dist}
%{?_with_noarch_subpackages:BuildArch: noarch}
Requires: rtems-4.10-newlib-common
@@ -838,7 +849,7 @@ Newlib C Library for i386-rtems4.10.
Summary: Base package for RTEMS newlib C Library
Group: Development/Tools
Version: %{newlib_version}
-Release: 17%{?dist}
+Release: 18%{?dist}
%{?_with_noarch_subpackages:BuildArch: noarch}
License: Distributable
diff --git a/contrib/crossrpms/rtems4.10/lm32/rtems-4.10-lm32-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/lm32/rtems-4.10-lm32-rtems4.10-gcc.spec
index 8e5e38a3f4..3ef928bd07 100644
--- a/contrib/crossrpms/rtems4.10/lm32/rtems-4.10-lm32-rtems4.10-gcc.spec
+++ b/contrib/crossrpms/rtems4.10/lm32/rtems-4.10-lm32-rtems4.10-gcc.spec
@@ -58,7 +58,7 @@ Summary: lm32-rtems4.10 gcc
Group: Development/Tools
Version: %{gcc_rpmvers}
-Release: 2%{?dist}
+Release: 3%{?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
@@ -85,6 +89,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
@@ -97,12 +107,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
@@ -248,7 +252,7 @@ BuildRequires: rtems-4.10-lm32-rtems4.10-binutils
Requires: rtems-4.10-gcc-common
Requires: rtems-4.10-lm32-rtems4.10-binutils
Requires: rtems-4.10-lm32-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires: rtems-4.10-lm32-rtems4.10-newlib = %{newlib_version}-17%{?dist}
+Requires: rtems-4.10-lm32-rtems4.10-newlib = %{newlib_version}-18%{?dist}
%if "%{gcc_version}" >= "4.5.0"
BuildRequires: zlib-devel
@@ -280,7 +284,7 @@ Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar
%if "%{newlib_version}" == "1.18.0"
Source50: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_pkgvers}.tar.gz
-Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/newlib-1.18.0-rtems4.10-20101006.diff
+Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/newlib-1.18.0-rtems4.10-20110110.diff
%endif
%{?_without_sources:NoSource: 50}
@@ -320,12 +324,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
@@ -355,7 +366,7 @@ cd ..
ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
%endif
-echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-17%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-3%{?dist}/newlib-%{newlib_version}-18%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
# Fix timestamps
@@ -625,7 +636,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
# Group: Development/Tools
# Version: %{gcc_rpmvers}
# Requires: rtems-4.10-lm32-rtems4.10-binutils
-# Requires: rtems-4.10-lm32-rtems4.10-newlib = %{newlib_version}-17%{?dist}
+# Requires: rtems-4.10-lm32-rtems4.10-newlib = %{newlib_version}-18%{?dist}
# License: GPL
# %if %build_infos
@@ -643,7 +654,7 @@ Summary: libgcc for lm32-rtems4.10-gcc
Group: Development/Tools
Version: %{gcc_rpmvers}
%{?_with_noarch_subpackages:BuildArch: noarch}
-Requires: rtems-4.10-lm32-rtems4.10-newlib = %{newlib_version}-17%{?dist}
+Requires: rtems-4.10-lm32-rtems4.10-newlib = %{newlib_version}-18%{?dist}
License: GPL
%description -n rtems-4.10-lm32-rtems4.10-gcc-libgcc
@@ -817,7 +828,7 @@ Summary: C Library (newlib) for lm32-rtems4.10
Group: Development/Tools
License: Distributable
Version: %{newlib_version}
-Release: 17%{?dist}
+Release: 18%{?dist}
%{?_with_noarch_subpackages:BuildArch: noarch}
Requires: rtems-4.10-newlib-common
@@ -838,7 +849,7 @@ Newlib C Library for lm32-rtems4.10.
Summary: Base package for RTEMS newlib C Library
Group: Development/Tools
Version: %{newlib_version}
-Release: 17%{?dist}
+Release: 18%{?dist}
%{?_with_noarch_subpackages:BuildArch: noarch}
License: Distributable
diff --git a/contrib/crossrpms/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-gcc.spec
index 5d347b05d3..9196fef77b 100644
--- a/contrib/crossrpms/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-gcc.spec
+++ b/contrib/crossrpms/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-gcc.spec
@@ -58,7 +58,7 @@ Summary: m32c-rtems4.10 gcc
Group: Development/Tools
Version: %{gcc_rpmvers}
-Release: 2%{?dist}
+Release: 3%{?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
@@ -85,6 +89,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
@@ -97,12 +107,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
@@ -248,7 +252,7 @@ BuildRequires: rtems-4.10-m32c-rtems4.10-binutils
Requires: rtems-4.10-gcc-common
Requires: rtems-4.10-m32c-rtems4.10-binutils
Requires: rtems-4.10-m32c-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires: rtems-4.10-m32c-rtems4.10-newlib = %{newlib_version}-17%{?dist}
+Requires: rtems-4.10-m32c-rtems4.10-newlib = %{newlib_version}-18%{?dist}
%if "%{gcc_version}" >= "4.5.0"
BuildRequires: zlib-devel
@@ -272,7 +276,7 @@ Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.4-rtems4.10-201
%if "%{newlib_version}" == "1.18.0"
Source50: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_pkgvers}.tar.gz
-Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/newlib-1.18.0-rtems4.10-20101006.diff
+Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/newlib-1.18.0-rtems4.10-20110110.diff
%endif
%{?_without_sources:NoSource: 50}
@@ -308,12 +312,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
@@ -343,7 +354,7 @@ cd ..
ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
%endif
-echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-17%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-3%{?dist}/newlib-%{newlib_version}-18%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
# Fix timestamps
@@ -612,7 +623,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
# Group: Development/Tools
# Version: %{gcc_rpmvers}
# Requires: rtems-4.10-m32c-rtems4.10-binutils
-# Requires: rtems-4.10-m32c-rtems4.10-newlib = %{newlib_version}-17%{?dist}
+# Requires: rtems-4.10-m32c-rtems4.10-newlib = %{newlib_version}-18%{?dist}
# License: GPL
# %if %build_infos
@@ -630,7 +641,7 @@ Summary: libgcc for m32c-rtems4.10-gcc
Group: Development/Tools
Version: %{gcc_rpmvers}
%{?_with_noarch_subpackages:BuildArch: noarch}
-Requires: rtems-4.10-m32c-rtems4.10-newlib = %{newlib_version}-17%{?dist}
+Requires: rtems-4.10-m32c-rtems4.10-newlib = %{newlib_version}-18%{?dist}
License: GPL
%description -n rtems-4.10-m32c-rtems4.10-gcc-libgcc
@@ -744,7 +755,7 @@ Summary: C Library (newlib) for m32c-rtems4.10
Group: Development/Tools
License: Distributable
Version: %{newlib_version}
-Release: 17%{?dist}
+Release: 18%{?dist}
%{?_with_noarch_subpackages:BuildArch: noarch}
Requires: rtems-4.10-newlib-common
@@ -765,7 +776,7 @@ Newlib C Library for m32c-rtems4.10.
Summary: Base package for RTEMS newlib C Library
Group: Development/Tools
Version: %{newlib_version}
-Release: 17%{?dist}
+Release: 18%{?dist}
%{?_with_noarch_subpackages:BuildArch: noarch}
License: Distributable
diff --git a/contrib/crossrpms/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-gcc.spec
index 7b3cf72838..f47a0f1f6d 100644
--- a/contrib/crossrpms/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-gcc.spec
+++ b/contrib/crossrpms/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-gcc.spec
@@ -58,7 +58,7 @@ Summary: m32r-rtems4.10 gcc
Group: Development/Tools
Version: %{gcc_rpmvers}
-Release: 2%{?dist}
+Release: 3%{?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
@@ -85,6 +89,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
@@ -97,12 +107,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
@@ -248,7 +252,7 @@ BuildRequires: rtems-4.10-m32r-rtems4.10-binutils
Requires: rtems-4.10-gcc-common
Requires: rtems-4.10-m32r-rtems4.10-binutils
Requires: rtems-4.10-m32r-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires: rtems-4.10-m32r-rtems4.10-newlib = %{newlib_version}-17%{?dist}
+Requires: rtems-4.10-m32r-rtems4.10-newlib = %{newlib_version}-18%{?dist}
%if "%{gcc_version}" >= "4.5.0"
BuildRequires: zlib-devel
@@ -272,7 +276,7 @@ Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.4-rtems4.10-201
%if "%{newlib_version}" == "1.18.0"
Source50: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_pkgvers}.tar.gz
-Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/newlib-1.18.0-rtems4.10-20101006.diff
+Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/newlib-1.18.0-rtems4.10-20110110.diff
%endif
%{?_without_sources:NoSource: 50}
@@ -308,12 +312,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
@@ -343,7 +354,7 @@ cd ..
ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
%endif
-echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-17%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-3%{?dist}/newlib-%{newlib_version}-18%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
# Fix timestamps
@@ -612,7 +623,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
# Group: Development/Tools
# Version: %{gcc_rpmvers}
# Requires: rtems-4.10-m32r-rtems4.10-binutils
-# Requires: rtems-4.10-m32r-rtems4.10-newlib = %{newlib_version}-17%{?dist}
+# Requires: rtems-4.10-m32r-rtems4.10-newlib = %{newlib_version}-18%{?dist}
# License: GPL
# %if %build_infos
@@ -630,7 +641,7 @@ Summary: libgcc for m32r-rtems4.10-gcc
Group: Development/Tools
Version: %{gcc_rpmvers}
%{?_with_noarch_subpackages:BuildArch: noarch}
-Requires: rtems-4.10-m32r-rtems4.10-newlib = %{newlib_version}-17%{?dist}
+Requires: rtems-4.10-m32r-rtems4.10-newlib = %{newlib_version}-18%{?dist}
License: GPL
%description -n rtems-4.10-m32r-rtems4.10-gcc-libgcc
@@ -744,7 +755,7 @@ Summary: C Library (newlib) for m32r-rtems4.10
Group: Development/Tools
License: Distributable
Version: %{newlib_version}
-Release: 17%{?dist}
+Release: 18%{?dist}
%{?_with_noarch_subpackages:BuildArch: noarch}
Requires: rtems-4.10-newlib-common
@@ -765,7 +776,7 @@ Newlib C Library for m32r-rtems4.10.
Summary: Base package for RTEMS newlib C Library
Group: Development/Tools
Version: %{newlib_version}
-Release: 17%{?dist}
+Release: 18%{?dist}
%{?_with_noarch_subpackages:BuildArch: noarch}
License: Distributable
diff --git a/contrib/crossrpms/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-gcc.spec
index 10574c35fb..ea0365cde1 100644
--- a/contrib/crossrpms/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-gcc.spec
+++ b/contrib/crossrpms/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-gcc.spec
@@ -58,7 +58,7 @@ Summary: m68k-rtems4.10 gcc
Group: Development/Tools
Version: %{gcc_rpmvers}
-Release: 2%{?dist}
+Release: 3%{?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
@@ -85,6 +89,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
@@ -97,12 +107,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
@@ -248,7 +252,7 @@ BuildRequires: rtems-4.10-m68k-rtems4.10-binutils
Requires: rtems-4.10-gcc-common
Requires: rtems-4.10-m68k-rtems4.10-binutils
Requires: rtems-4.10-m68k-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires: rtems-4.10-m68k-rtems4.10-newlib = %{newlib_version}-17%{?dist}
+Requires: rtems-4.10-m68k-rtems4.10-newlib = %{newlib_version}-18%{?dist}
%if "%{gcc_version}" >= "4.5.0"
BuildRequires: zlib-devel
@@ -280,7 +284,7 @@ Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar
%if "%{newlib_version}" == "1.18.0"
Source50: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_pkgvers}.tar.gz
-Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/newlib-1.18.0-rtems4.10-20101006.diff
+Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/newlib-1.18.0-rtems4.10-20110110.diff
%endif
%{?_without_sources:NoSource: 50}
@@ -320,12 +324,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
@@ -355,7 +366,7 @@ cd ..
ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
%endif
-echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-17%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-3%{?dist}/newlib-%{newlib_version}-18%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
# Fix timestamps
@@ -625,7 +636,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
# Group: Development/Tools
# Version: %{gcc_rpmvers}
# Requires: rtems-4.10-m68k-rtems4.10-binutils
-# Requires: rtems-4.10-m68k-rtems4.10-newlib = %{newlib_version}-17%{?dist}
+# Requires: rtems-4.10-m68k-rtems4.10-newlib = %{newlib_version}-18%{?dist}
# License: GPL
# %if %build_infos
@@ -643,7 +654,7 @@ Summary: libgcc for m68k-rtems4.10-gcc
Group: Development/Tools
Version: %{gcc_rpmvers}
%{?_with_noarch_subpackages:BuildArch: noarch}
-Requires: rtems-4.10-m68k-rtems4.10-newlib = %{newlib_version}-17%{?dist}
+Requires: rtems-4.10-m68k-rtems4.10-newlib = %{newlib_version}-18%{?dist}
License: GPL
%description -n rtems-4.10-m68k-rtems4.10-gcc-libgcc
@@ -817,7 +828,7 @@ Summary: C Library (newlib) for m68k-rtems4.10
Group: Development/Tools
License: Distributable
Version: %{newlib_version}
-Release: 17%{?dist}
+Release: 18%{?dist}
%{?_with_noarch_subpackages:BuildArch: noarch}
Requires: rtems-4.10-newlib-common
@@ -838,7 +849,7 @@ Newlib C Library for m68k-rtems4.10.
Summary: Base package for RTEMS newlib C Library
Group: Development/Tools
Version: %{newlib_version}
-Release: 17%{?dist}
+Release: 18%{?dist}
%{?_with_noarch_subpackages:BuildArch: noarch}
License: Distributable
diff --git a/contrib/crossrpms/rtems4.10/mips/rtems-4.10-mips-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/mips/rtems-4.10-mips-rtems4.10-gcc.spec
index 28ee7fc151..6a3af94d00 100644
--- a/contrib/crossrpms/rtems4.10/mips/rtems-4.10-mips-rtems4.10-gcc.spec
+++ b/contrib/crossrpms/rtems4.10/mips/rtems-4.10-mips-rtems4.10-gcc.spec
@@ -58,7 +58,7 @@ Summary: mips-rtems4.10 gcc
Group: Development/Tools
Version: %{gcc_rpmvers}
-Release: 2%{?dist}
+Release: 3%{?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
@@ -85,6 +89,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
@@ -97,12 +107,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
@@ -248,7 +252,7 @@ BuildRequires: rtems-4.10-mips-rtems4.10-binutils
Requires: rtems-4.10-gcc-common
Requires: rtems-4.10-mips-rtems4.10-binutils
Requires: rtems-4.10-mips-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires: rtems-4.10-mips-rtems4.10-newlib = %{newlib_version}-17%{?dist}
+Requires: rtems-4.10-mips-rtems4.10-newlib = %{newlib_version}-18%{?dist}
%if "%{gcc_version}" >= "4.5.0"
BuildRequires: zlib-devel
@@ -280,7 +284,7 @@ Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar
%if "%{newlib_version}" == "1.18.0"
Source50: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_pkgvers}.tar.gz
-Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/newlib-1.18.0-rtems4.10-20101006.diff
+Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/newlib-1.18.0-rtems4.10-20110110.diff
%endif
%{?_without_sources:NoSource: 50}
@@ -320,12 +324,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
@@ -355,7 +366,7 @@ cd ..
ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
%endif
-echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-17%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-3%{?dist}/newlib-%{newlib_version}-18%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
# Fix timestamps
@@ -625,7 +636,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
# Group: Development/Tools
# Version: %{gcc_rpmvers}
# Requires: rtems-4.10-mips-rtems4.10-binutils
-# Requires: rtems-4.10-mips-rtems4.10-newlib = %{newlib_version}-17%{?dist}
+# Requires: rtems-4.10-mips-rtems4.10-newlib = %{newlib_version}-18%{?dist}
# License: GPL
# %if %build_infos
@@ -643,7 +654,7 @@ Summary: libgcc for mips-rtems4.10-gcc
Group: Development/Tools
Version: %{gcc_rpmvers}
%{?_with_noarch_subpackages:BuildArch: noarch}
-Requires: rtems-4.10-mips-rtems4.10-newlib = %{newlib_version}-17%{?dist}
+Requires: rtems-4.10-mips-rtems4.10-newlib = %{newlib_version}-18%{?dist}
License: GPL
%description -n rtems-4.10-mips-rtems4.10-gcc-libgcc
@@ -817,7 +828,7 @@ Summary: C Library (newlib) for mips-rtems4.10
Group: Development/Tools
License: Distributable
Version: %{newlib_version}
-Release: 17%{?dist}
+Release: 18%{?dist}
%{?_with_noarch_subpackages:BuildArch: noarch}
Requires: rtems-4.10-newlib-common
@@ -838,7 +849,7 @@ Newlib C Library for mips-rtems4.10.
Summary: Base package for RTEMS newlib C Library
Group: Development/Tools
Version: %{newlib_version}
-Release: 17%{?dist}
+Release: 18%{?dist}
%{?_with_noarch_subpackages:BuildArch: noarch}
License: Distributable
diff --git a/contrib/crossrpms/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-gcc.spec
index 1be91aad22..7ab93fd00a 100644
--- a/contrib/crossrpms/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-gcc.spec
+++ b/contrib/crossrpms/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-gcc.spec
@@ -58,7 +58,7 @@ Summary: powerpc-rtems4.10 gcc
Group: Development/Tools
Version: %{gcc_rpmvers}
-Release: 2%{?dist}
+Release: 3%{?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
@@ -85,6 +89,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
@@ -97,12 +107,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
@@ -248,7 +252,7 @@ BuildRequires: rtems-4.10-powerpc-rtems4.10-binutils
Requires: rtems-4.10-gcc-common
Requires: rtems-4.10-powerpc-rtems4.10-binutils
Requires: rtems-4.10-powerpc-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires: rtems-4.10-powerpc-rtems4.10-newlib = %{newlib_version}-17%{?dist}
+Requires: rtems-4.10-powerpc-rtems4.10-newlib = %{newlib_version}-18%{?dist}
%if "%{gcc_version}" >= "4.5.0"
BuildRequires: zlib-devel
@@ -280,7 +284,7 @@ Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar
%if "%{newlib_version}" == "1.18.0"
Source50: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_pkgvers}.tar.gz
-Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/newlib-1.18.0-rtems4.10-20101006.diff
+Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/newlib-1.18.0-rtems4.10-20110110.diff
%endif
%{?_without_sources:NoSource: 50}
@@ -320,12 +324,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
@@ -355,7 +366,7 @@ cd ..
ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
%endif
-echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-17%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-3%{?dist}/newlib-%{newlib_version}-18%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
# Fix timestamps
@@ -625,7 +636,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
# Group: Development/Tools
# Version: %{gcc_rpmvers}
# Requires: rtems-4.10-powerpc-rtems4.10-binutils
-# Requires: rtems-4.10-powerpc-rtems4.10-newlib = %{newlib_version}-17%{?dist}
+# Requires: rtems-4.10-powerpc-rtems4.10-newlib = %{newlib_version}-18%{?dist}
# License: GPL
# %if %build_infos
@@ -643,7 +654,7 @@ Summary: libgcc for powerpc-rtems4.10-gcc
Group: Development/Tools
Version: %{gcc_rpmvers}
%{?_with_noarch_subpackages:BuildArch: noarch}
-Requires: rtems-4.10-powerpc-rtems4.10-newlib = %{newlib_version}-17%{?dist}
+Requires: rtems-4.10-powerpc-rtems4.10-newlib = %{newlib_version}-18%{?dist}
License: GPL
%description -n rtems-4.10-powerpc-rtems4.10-gcc-libgcc
@@ -817,7 +828,7 @@ Summary: C Library (newlib) for powerpc-rtems4.10
Group: Development/Tools
License: Distributable
Version: %{newlib_version}
-Release: 17%{?dist}
+Release: 18%{?dist}
%{?_with_noarch_subpackages:BuildArch: noarch}
Requires: rtems-4.10-newlib-common
@@ -838,7 +849,7 @@ Newlib C Library for powerpc-rtems4.10.
Summary: Base package for RTEMS newlib C Library
Group: Development/Tools
Version: %{newlib_version}
-Release: 17%{?dist}
+Release: 18%{?dist}
%{?_with_noarch_subpackages:BuildArch: noarch}
License: Distributable
diff --git a/contrib/crossrpms/rtems4.10/sh/rtems-4.10-sh-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/sh/rtems-4.10-sh-rtems4.10-gcc.spec
index e6eb2e4bfc..404c676620 100644
--- a/contrib/crossrpms/rtems4.10/sh/rtems-4.10-sh-rtems4.10-gcc.spec
+++ b/contrib/crossrpms/rtems4.10/sh/rtems-4.10-sh-rtems4.10-gcc.spec
@@ -58,7 +58,7 @@ Summary: sh-rtems4.10 gcc
Group: Development/Tools
Version: %{gcc_rpmvers}
-Release: 2%{?dist}
+Release: 3%{?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
@@ -85,6 +89,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
@@ -97,12 +107,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
@@ -248,7 +252,7 @@ BuildRequires: rtems-4.10-sh-rtems4.10-binutils
Requires: rtems-4.10-gcc-common
Requires: rtems-4.10-sh-rtems4.10-binutils
Requires: rtems-4.10-sh-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires: rtems-4.10-sh-rtems4.10-newlib = %{newlib_version}-17%{?dist}
+Requires: rtems-4.10-sh-rtems4.10-newlib = %{newlib_version}-18%{?dist}
%if "%{gcc_version}" >= "4.5.0"
BuildRequires: zlib-devel
@@ -280,7 +284,7 @@ Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar
%if "%{newlib_version}" == "1.18.0"
Source50: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_pkgvers}.tar.gz
-Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/newlib-1.18.0-rtems4.10-20101006.diff
+Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/newlib-1.18.0-rtems4.10-20110110.diff
%endif
%{?_without_sources:NoSource: 50}
@@ -320,12 +324,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
@@ -355,7 +366,7 @@ cd ..
ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
%endif
-echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-17%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-3%{?dist}/newlib-%{newlib_version}-18%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
# Fix timestamps
@@ -625,7 +636,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
# Group: Development/Tools
# Version: %{gcc_rpmvers}
# Requires: rtems-4.10-sh-rtems4.10-binutils
-# Requires: rtems-4.10-sh-rtems4.10-newlib = %{newlib_version}-17%{?dist}
+# Requires: rtems-4.10-sh-rtems4.10-newlib = %{newlib_version}-18%{?dist}
# License: GPL
# %if %build_infos
@@ -643,7 +654,7 @@ Summary: libgcc for sh-rtems4.10-gcc
Group: Development/Tools
Version: %{gcc_rpmvers}
%{?_with_noarch_subpackages:BuildArch: noarch}
-Requires: rtems-4.10-sh-rtems4.10-newlib = %{newlib_version}-17%{?dist}
+Requires: rtems-4.10-sh-rtems4.10-newlib = %{newlib_version}-18%{?dist}
License: GPL
%description -n rtems-4.10-sh-rtems4.10-gcc-libgcc
@@ -817,7 +828,7 @@ Summary: C Library (newlib) for sh-rtems4.10
Group: Development/Tools
License: Distributable
Version: %{newlib_version}
-Release: 17%{?dist}
+Release: 18%{?dist}
%{?_with_noarch_subpackages:BuildArch: noarch}
Requires: rtems-4.10-newlib-common
@@ -838,7 +849,7 @@ Newlib C Library for sh-rtems4.10.
Summary: Base package for RTEMS newlib C Library
Group: Development/Tools
Version: %{newlib_version}
-Release: 17%{?dist}
+Release: 18%{?dist}
%{?_with_noarch_subpackages:BuildArch: noarch}
License: Distributable
diff --git a/contrib/crossrpms/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-gcc.spec
index 5ca5886fa3..5c28c54a22 100644
--- a/contrib/crossrpms/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-gcc.spec
+++ b/contrib/crossrpms/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-gcc.spec
@@ -58,7 +58,7 @@ Summary: sparc-rtems4.10 gcc
Group: Development/Tools
Version: %{gcc_rpmvers}
-Release: 2%{?dist}
+Release: 3%{?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
@@ -85,6 +89,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
@@ -97,12 +107,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
@@ -248,7 +252,7 @@ BuildRequires: rtems-4.10-sparc-rtems4.10-binutils
Requires: rtems-4.10-gcc-common
Requires: rtems-4.10-sparc-rtems4.10-binutils
Requires: rtems-4.10-sparc-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires: rtems-4.10-sparc-rtems4.10-newlib = %{newlib_version}-17%{?dist}
+Requires: rtems-4.10-sparc-rtems4.10-newlib = %{newlib_version}-18%{?dist}
%if "%{gcc_version}" >= "4.5.0"
BuildRequires: zlib-devel
@@ -280,7 +284,7 @@ Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar
%if "%{newlib_version}" == "1.18.0"
Source50: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_pkgvers}.tar.gz
-Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/newlib-1.18.0-rtems4.10-20101006.diff
+Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/newlib-1.18.0-rtems4.10-20110110.diff
%endif
%{?_without_sources:NoSource: 50}
@@ -320,12 +324,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
@@ -355,7 +366,7 @@ cd ..
ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
%endif
-echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-17%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-3%{?dist}/newlib-%{newlib_version}-18%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
# Fix timestamps
@@ -625,7 +636,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
# Group: Development/Tools
# Version: %{gcc_rpmvers}
# Requires: rtems-4.10-sparc-rtems4.10-binutils
-# Requires: rtems-4.10-sparc-rtems4.10-newlib = %{newlib_version}-17%{?dist}
+# Requires: rtems-4.10-sparc-rtems4.10-newlib = %{newlib_version}-18%{?dist}
# License: GPL
# %if %build_infos
@@ -643,7 +654,7 @@ Summary: libgcc for sparc-rtems4.10-gcc
Group: Development/Tools
Version: %{gcc_rpmvers}
%{?_with_noarch_subpackages:BuildArch: noarch}
-Requires: rtems-4.10-sparc-rtems4.10-newlib = %{newlib_version}-17%{?dist}
+Requires: rtems-4.10-sparc-rtems4.10-newlib = %{newlib_version}-18%{?dist}
License: GPL
%description -n rtems-4.10-sparc-rtems4.10-gcc-libgcc
@@ -817,7 +828,7 @@ Summary: C Library (newlib) for sparc-rtems4.10
Group: Development/Tools
License: Distributable
Version: %{newlib_version}
-Release: 17%{?dist}
+Release: 18%{?dist}
%{?_with_noarch_subpackages:BuildArch: noarch}
Requires: rtems-4.10-newlib-common
@@ -838,7 +849,7 @@ Newlib C Library for sparc-rtems4.10.
Summary: Base package for RTEMS newlib C Library
Group: Development/Tools
Version: %{newlib_version}
-Release: 17%{?dist}
+Release: 18%{?dist}
%{?_with_noarch_subpackages:BuildArch: noarch}
License: Distributable