summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2009-01-26 07:17:37 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2009-01-26 07:17:37 +0000
commit35381baa883d616c48403a1e3f14f11c68872a9e (patch)
tree2b66710801871bf2d764f24b0c7b9fa09c382f32 /contrib
parentAbandon gccnewlib_version. (diff)
downloadrtems-35381baa883d616c48403a1e3f14f11c68872a9e.tar.bz2
BR: exact version of build host tools for Cdn-X builds.
Diffstat (limited to 'contrib')
-rw-r--r--contrib/crossrpms/autotools/rtems-4.10-autoconf.spec12
-rw-r--r--contrib/crossrpms/autotools/rtems-4.10-automake.spec12
-rw-r--r--contrib/crossrpms/configure.ac2
-rw-r--r--contrib/crossrpms/freebsd6.4/i586/Makefile.am2
-rw-r--r--contrib/crossrpms/freebsd7.0/i586/Makefile.am2
-rw-r--r--contrib/crossrpms/freebsd7.1/i586/Makefile.am2
-rw-r--r--contrib/crossrpms/gcc/gccnewlib.add2
-rw-r--r--contrib/crossrpms/gcc/target-c++.add2
-rw-r--r--contrib/crossrpms/rtems4.10/arm/rtems-4.10-arm-rtems4.10-binutils.spec12
-rw-r--r--contrib/crossrpms/rtems4.10/arm/rtems-4.10-arm-rtems4.10-cpukit.spec12
-rw-r--r--contrib/crossrpms/rtems4.10/arm/rtems-4.10-arm-rtems4.10-gcc.spec34
-rw-r--r--contrib/crossrpms/rtems4.10/avr/rtems-4.10-avr-rtems4.10-binutils.spec12
-rw-r--r--contrib/crossrpms/rtems4.10/avr/rtems-4.10-avr-rtems4.10-cpukit.spec12
-rw-r--r--contrib/crossrpms/rtems4.10/avr/rtems-4.10-avr-rtems4.10-gcc.spec28
-rw-r--r--contrib/crossrpms/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-binutils.spec12
-rw-r--r--contrib/crossrpms/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-gcc.spec34
-rw-r--r--contrib/crossrpms/rtems4.10/gcc.am1
-rw-r--r--contrib/crossrpms/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-binutils.spec12
-rw-r--r--contrib/crossrpms/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-cpukit.spec12
-rw-r--r--contrib/crossrpms/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-gcc.spec34
-rw-r--r--contrib/crossrpms/rtems4.10/i386/rtems-4.10-i386-rtems4.10-binutils.spec12
-rw-r--r--contrib/crossrpms/rtems4.10/i386/rtems-4.10-i386-rtems4.10-cpukit.spec12
-rw-r--r--contrib/crossrpms/rtems4.10/i386/rtems-4.10-i386-rtems4.10-gcc.spec34
-rw-r--r--contrib/crossrpms/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-binutils.spec12
-rw-r--r--contrib/crossrpms/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-gcc.spec27
-rw-r--r--contrib/crossrpms/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-binutils.spec12
-rw-r--r--contrib/crossrpms/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-gcc.spec27
-rw-r--r--contrib/crossrpms/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-binutils.spec12
-rw-r--r--contrib/crossrpms/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-cpukit.spec12
-rw-r--r--contrib/crossrpms/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-gcc.spec34
-rw-r--r--contrib/crossrpms/rtems4.10/mips/rtems-4.10-mips-rtems4.10-binutils.spec12
-rw-r--r--contrib/crossrpms/rtems4.10/mips/rtems-4.10-mips-rtems4.10-cpukit.spec12
-rw-r--r--contrib/crossrpms/rtems4.10/mips/rtems-4.10-mips-rtems4.10-gcc.spec34
-rw-r--r--contrib/crossrpms/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-binutils.spec12
-rw-r--r--contrib/crossrpms/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-cpukit.spec12
-rw-r--r--contrib/crossrpms/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-gcc.spec34
-rw-r--r--contrib/crossrpms/rtems4.10/sh/rtems-4.10-sh-rtems4.10-binutils.spec12
-rw-r--r--contrib/crossrpms/rtems4.10/sh/rtems-4.10-sh-rtems4.10-cpukit.spec12
-rw-r--r--contrib/crossrpms/rtems4.10/sh/rtems-4.10-sh-rtems4.10-gcc.spec34
-rw-r--r--contrib/crossrpms/rtems4.10/sparc/Makefile.am6
-rw-r--r--contrib/crossrpms/rtems4.10/sparc/gcc-sources.add4
-rw-r--r--contrib/crossrpms/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-binutils.spec12
-rw-r--r--contrib/crossrpms/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-cpukit.spec12
-rw-r--r--contrib/crossrpms/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-gcc.spec47
-rw-r--r--contrib/crossrpms/solaris2.7/sparc/Makefile.am2
45 files changed, 466 insertions, 236 deletions
diff --git a/contrib/crossrpms/autotools/rtems-4.10-autoconf.spec b/contrib/crossrpms/autotools/rtems-4.10-autoconf.spec
index cef2cd114d..9de5dd2610 100644
--- a/contrib/crossrpms/autotools/rtems-4.10-autoconf.spec
+++ b/contrib/crossrpms/autotools/rtems-4.10-autoconf.spec
@@ -21,14 +21,22 @@
%ifos cygwin cygwin32 mingw mingw32
%define _exeext .exe
+%define debug_package %{nil}
+%define _libdir %{_exec_prefix}/lib
%else
%define _exeext %{nil}
%endif
%ifos cygwin cygwin32
%define optflags -O3 -pipe -march=i486 -funroll-loops
-%define _libdir %{_exec_prefix}/lib
-%define debug_package %{nil}
+%endif
+
+%ifos mingw mingw32
+%if %{defined _mingw32_cflags}
+%define optflags %{_mingw32_cflags}
+%else
+%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
+%endif
%endif
%if "%{_build}" != "%{_host}"
diff --git a/contrib/crossrpms/autotools/rtems-4.10-automake.spec b/contrib/crossrpms/autotools/rtems-4.10-automake.spec
index 71f286d252..12b70eaf92 100644
--- a/contrib/crossrpms/autotools/rtems-4.10-automake.spec
+++ b/contrib/crossrpms/autotools/rtems-4.10-automake.spec
@@ -21,14 +21,22 @@
%ifos cygwin cygwin32 mingw mingw32
%define _exeext .exe
+%define debug_package %{nil}
+%define _libdir %{_exec_prefix}/lib
%else
%define _exeext %{nil}
%endif
%ifos cygwin cygwin32
%define optflags -O3 -pipe -march=i486 -funroll-loops
-%define _libdir %{_exec_prefix}/lib
-%define debug_package %{nil}
+%endif
+
+%ifos mingw mingw32
+%if %{defined _mingw32_cflags}
+%define optflags %{_mingw32_cflags}
+%else
+%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
+%endif
%endif
%if "%{_build}" != "%{_host}"
diff --git a/contrib/crossrpms/configure.ac b/contrib/crossrpms/configure.ac
index cf558e8573..7bd5469aff 100644
--- a/contrib/crossrpms/configure.ac
+++ b/contrib/crossrpms/configure.ac
@@ -3,7 +3,7 @@
m4_define([RTEMS_API],[4.10])
AC_PREREQ(2.61)
-AC_INIT([crossrpms],[0.20090117.1],[http://www.rtems.org/bugzilla])
+AC_INIT([crossrpms],[0.20090125.1],[http://www.rtems.org/bugzilla])
AC_CONFIG_SRCDIR([binutils/binutils.add])
AC_CONFIG_AUX_DIR(.)
diff --git a/contrib/crossrpms/freebsd6.4/i586/Makefile.am b/contrib/crossrpms/freebsd6.4/i586/Makefile.am
index 768c3b941c..2c2acd470b 100644
--- a/contrib/crossrpms/freebsd6.4/i586/Makefile.am
+++ b/contrib/crossrpms/freebsd6.4/i586/Makefile.am
@@ -35,7 +35,7 @@ BINUTILS_RPMREL = @VERSION@%{?dist}
include ../binutils.am
BINUTILS_OPTS +=
-GCC_VERS = 4.3.2
+GCC_VERS = 4.3.3
GCC_PKGVERS = $(GCC_VERS)
GCC_RPMREL = @VERSION@%{?dist}
include ../gcc.am
diff --git a/contrib/crossrpms/freebsd7.0/i586/Makefile.am b/contrib/crossrpms/freebsd7.0/i586/Makefile.am
index bc4bc93e2f..b6092aae0d 100644
--- a/contrib/crossrpms/freebsd7.0/i586/Makefile.am
+++ b/contrib/crossrpms/freebsd7.0/i586/Makefile.am
@@ -35,7 +35,7 @@ BINUTILS_RPMREL = @VERSION@%{?dist}
include ../binutils.am
BINUTILS_OPTS +=
-GCC_VERS = 4.3.2
+GCC_VERS = 4.3.3
GCC_PKGVERS = $(GCC_VERS)
GCC_RPMREL = @VERSION@%{?dist}
include ../gcc.am
diff --git a/contrib/crossrpms/freebsd7.1/i586/Makefile.am b/contrib/crossrpms/freebsd7.1/i586/Makefile.am
index 152c2bf0b8..839562d4c6 100644
--- a/contrib/crossrpms/freebsd7.1/i586/Makefile.am
+++ b/contrib/crossrpms/freebsd7.1/i586/Makefile.am
@@ -35,7 +35,7 @@ BINUTILS_RPMREL = @VERSION@%{?dist}
include ../binutils.am
BINUTILS_OPTS +=
-GCC_VERS = 4.3.2
+GCC_VERS = 4.3.3
GCC_PKGVERS = $(GCC_VERS)
GCC_RPMREL = @VERSION@%{?dist}
include ../gcc.am
diff --git a/contrib/crossrpms/gcc/gccnewlib.add b/contrib/crossrpms/gcc/gccnewlib.add
index 8d0a4081e2..c781b33fe8 100644
--- a/contrib/crossrpms/gcc/gccnewlib.add
+++ b/contrib/crossrpms/gcc/gccnewlib.add
@@ -43,7 +43,7 @@ BuildRequires: mpfr-devel >= 2.3.0
%endif
%if "%{_build}" != "%{_host}"
-BuildRequires: @rpmprefix@@tool_target@-gcc
+BuildRequires: @rpmprefix@@tool_target@-gcc = %{gcc_rpmvers}
%endif
%if "%{gcc_version}" >= "4.2.0"
diff --git a/contrib/crossrpms/gcc/target-c++.add b/contrib/crossrpms/gcc/target-c++.add
index e63e45b37d..38900f4ff5 100644
--- a/contrib/crossrpms/gcc/target-c++.add
+++ b/contrib/crossrpms/gcc/target-c++.add
@@ -9,7 +9,7 @@ Version: %{gcc_rpmvers}
License: GPL
%if "%{_build}" != "%{_host}"
-BuildRequires: @rpmprefix@@tool_target@-gcc-c++
+BuildRequires: @rpmprefix@@tool_target@-gcc-c++ = %{gcc_rpmvers}
%endif
Provides: @rpmprefix@@tool_target@-c++ = %{gcc_rpmvers}-%{release}
Obsoletes: @rpmprefix@@tool_target@-c++ < %{gcc_rpmvers}-%{release}
diff --git a/contrib/crossrpms/rtems4.10/arm/rtems-4.10-arm-rtems4.10-binutils.spec b/contrib/crossrpms/rtems4.10/arm/rtems-4.10-arm-rtems4.10-binutils.spec
index 670a3cb768..dba193e248 100644
--- a/contrib/crossrpms/rtems4.10/arm/rtems-4.10-arm-rtems4.10-binutils.spec
+++ b/contrib/crossrpms/rtems4.10/arm/rtems-4.10-arm-rtems4.10-binutils.spec
@@ -21,14 +21,22 @@
%ifos cygwin cygwin32 mingw mingw32
%define _exeext .exe
-%define debug_package %{nil}
+%define debug_package %{nil}
+%define _libdir %{_exec_prefix}/lib
%else
%define _exeext %{nil}
%endif
%ifos cygwin cygwin32
%define optflags -O3 -pipe -march=i486 -funroll-loops
-%define _libdir %{_exec_prefix}/lib
+%endif
+
+%ifos mingw mingw32
+%if %{defined _mingw32_cflags}
+%define optflags %{_mingw32_cflags}
+%else
+%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
+%endif
%endif
%if "%{_build}" != "%{_host}"
diff --git a/contrib/crossrpms/rtems4.10/arm/rtems-4.10-arm-rtems4.10-cpukit.spec b/contrib/crossrpms/rtems4.10/arm/rtems-4.10-arm-rtems4.10-cpukit.spec
index e1dfc60e88..831686f8a9 100644
--- a/contrib/crossrpms/rtems4.10/arm/rtems-4.10-arm-rtems4.10-cpukit.spec
+++ b/contrib/crossrpms/rtems4.10/arm/rtems-4.10-arm-rtems4.10-cpukit.spec
@@ -21,14 +21,22 @@
%ifos cygwin cygwin32 mingw mingw32
%define _exeext .exe
-%define debug_package %{nil}
+%define debug_package %{nil}
+%define _libdir %{_exec_prefix}/lib
%else
%define _exeext %{nil}
%endif
%ifos cygwin cygwin32
%define optflags -O3 -pipe -march=i486 -funroll-loops
-%define _libdir %{_exec_prefix}/lib
+%endif
+
+%ifos mingw mingw32
+%if %{defined _mingw32_cflags}
+%define optflags %{_mingw32_cflags}
+%else
+%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
+%endif
%endif
%if "%{_build}" != "%{_host}"
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 e478b130c6..2a0a3621a8 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
@@ -21,14 +21,22 @@
%ifos cygwin cygwin32 mingw mingw32
%define _exeext .exe
-%define debug_package %{nil}
+%define debug_package %{nil}
+%define _libdir %{_exec_prefix}/lib
%else
%define _exeext %{nil}
%endif
%ifos cygwin cygwin32
%define optflags -O3 -pipe -march=i486 -funroll-loops
-%define _libdir %{_exec_prefix}/lib
+%endif
+
+%ifos mingw mingw32
+%if %{defined _mingw32_cflags}
+%define optflags %{_mingw32_cflags}
+%else
+%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
+%endif
%endif
%if "%{_build}" != "%{_host}"
@@ -44,7 +52,7 @@
%define newlib_pkgvers 1.17.0
%define newlib_version 1.17.0
-%define gccnewlib_version gcc%{gcc_version}newlib%{newlib_version}
+%define newlib_release 21%{?dist}
%define mpfr_version 2.3.1
@@ -53,7 +61,7 @@ Summary: arm-rtems4.10 gcc
Group: Development/Tools
Version: %{gcc_rpmvers}
-Release: 20%{?dist}
+Release: 21%{?dist}
License: GPL
URL: http://gcc.gnu.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -76,12 +84,11 @@ BuildRequires: mpfr-devel >= 2.3.0
%endif
# These distros ship an insufficient mpfr
%{?el4:%define _build_mpfr 1}
-%{?suse10_2:%define _build_mpfr 1}
%{?suse10_3:%define _build_mpfr 1}
%endif
%if "%{_build}" != "%{_host}"
-BuildRequires: rtems-4.10-arm-rtems4.10-gcc
+BuildRequires: rtems-4.10-arm-rtems4.10-gcc = %{gcc_rpmvers}
%endif
%if "%{gcc_version}" >= "4.2.0"
@@ -94,7 +101,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-newlib = %{newlib_version}-%{release}
+Requires: rtems-4.10-arm-rtems4.10-newlib = %{newlib_version}-%{newlib_release}
%if "%{gcc_version}" >= "3.4"
@@ -423,7 +430,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}-%{release}
+# Requires: rtems-4.10-arm-rtems4.10-newlib = %{newlib_version}-%{newlib_release}
# License: GPL
# %if %build_infos
@@ -539,7 +546,7 @@ Version: %{gcc_rpmvers}
License: GPL
%if "%{_build}" != "%{_host}"
-BuildRequires: rtems-4.10-arm-rtems4.10-gcc-c++
+BuildRequires: rtems-4.10-arm-rtems4.10-gcc-c++ = %{gcc_rpmvers}
%endif
Provides: rtems-4.10-arm-rtems4.10-c++ = %{gcc_rpmvers}-%{release}
Obsoletes: rtems-4.10-arm-rtems4.10-c++ < %{gcc_rpmvers}-%{release}
@@ -563,11 +570,7 @@ GCC c++ compiler for arm-rtems4.10.
%{gccexec}/arm-rtems4.10/%{gcc_version}/cc1plus%{_exeext}
%dir %{gcclib}/arm-rtems4.10/%{gcc_version}/include
-%if "%{gcc_version}" >= "3.2"
%{gcclib}/arm-rtems4.10/%{gcc_version}/include/c++
-%else
-%{gcclib}/arm-rtems4.10/%{gcc_version}/include/g++
-%endif
@@ -579,9 +582,7 @@ Summary: C Library (newlib) for arm-rtems4.10
Group: Development/Tools
License: Distributable
Version: %{newlib_version}
-
-Provides: rtems-4.10-arm-rtems4.10-libc = %{newlib_version}-%{release}
-Obsoletes: rtems-4.10-arm-rtems4.10-libc < %{newlib_version}-%{release}
+Release: %{newlib_release}
Requires: rtems-4.10-newlib-common
@@ -601,6 +602,7 @@ Newlib C Library for arm-rtems4.10.
Summary: Base package for RTEMS newlib C Library
Group: Development/Tools
Version: %{newlib_version}
+Release: %{newlib_release}
License: Distributable
Requires(post): /sbin/install-info
diff --git a/contrib/crossrpms/rtems4.10/avr/rtems-4.10-avr-rtems4.10-binutils.spec b/contrib/crossrpms/rtems4.10/avr/rtems-4.10-avr-rtems4.10-binutils.spec
index f72af175b7..189f61ca13 100644
--- a/contrib/crossrpms/rtems4.10/avr/rtems-4.10-avr-rtems4.10-binutils.spec
+++ b/contrib/crossrpms/rtems4.10/avr/rtems-4.10-avr-rtems4.10-binutils.spec
@@ -21,14 +21,22 @@
%ifos cygwin cygwin32 mingw mingw32
%define _exeext .exe
-%define debug_package %{nil}
+%define debug_package %{nil}
+%define _libdir %{_exec_prefix}/lib
%else
%define _exeext %{nil}
%endif
%ifos cygwin cygwin32
%define optflags -O3 -pipe -march=i486 -funroll-loops
-%define _libdir %{_exec_prefix}/lib
+%endif
+
+%ifos mingw mingw32
+%if %{defined _mingw32_cflags}
+%define optflags %{_mingw32_cflags}
+%else
+%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
+%endif
%endif
%if "%{_build}" != "%{_host}"
diff --git a/contrib/crossrpms/rtems4.10/avr/rtems-4.10-avr-rtems4.10-cpukit.spec b/contrib/crossrpms/rtems4.10/avr/rtems-4.10-avr-rtems4.10-cpukit.spec
index 3451463af4..649f639a4b 100644
--- a/contrib/crossrpms/rtems4.10/avr/rtems-4.10-avr-rtems4.10-cpukit.spec
+++ b/contrib/crossrpms/rtems4.10/avr/rtems-4.10-avr-rtems4.10-cpukit.spec
@@ -21,14 +21,22 @@
%ifos cygwin cygwin32 mingw mingw32
%define _exeext .exe
-%define debug_package %{nil}
+%define debug_package %{nil}
+%define _libdir %{_exec_prefix}/lib
%else
%define _exeext %{nil}
%endif
%ifos cygwin cygwin32
%define optflags -O3 -pipe -march=i486 -funroll-loops
-%define _libdir %{_exec_prefix}/lib
+%endif
+
+%ifos mingw mingw32
+%if %{defined _mingw32_cflags}
+%define optflags %{_mingw32_cflags}
+%else
+%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
+%endif
%endif
%if "%{_build}" != "%{_host}"
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 daf09499b7..8614cce47e 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
@@ -21,14 +21,22 @@
%ifos cygwin cygwin32 mingw mingw32
%define _exeext .exe
-%define debug_package %{nil}
+%define debug_package %{nil}
+%define _libdir %{_exec_prefix}/lib
%else
%define _exeext %{nil}
%endif
%ifos cygwin cygwin32
%define optflags -O3 -pipe -march=i486 -funroll-loops
-%define _libdir %{_exec_prefix}/lib
+%endif
+
+%ifos mingw mingw32
+%if %{defined _mingw32_cflags}
+%define optflags %{_mingw32_cflags}
+%else
+%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
+%endif
%endif
%if "%{_build}" != "%{_host}"
@@ -44,7 +52,7 @@
%define newlib_pkgvers 1.17.0
%define newlib_version 1.17.0
-%define gccnewlib_version gcc%{gcc_version}newlib%{newlib_version}
+%define newlib_release 21%{?dist}
%define mpfr_version 2.3.1
@@ -53,7 +61,7 @@ Summary: avr-rtems4.10 gcc
Group: Development/Tools
Version: %{gcc_rpmvers}
-Release: 20%{?dist}
+Release: 21%{?dist}
License: GPL
URL: http://gcc.gnu.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -76,12 +84,11 @@ BuildRequires: mpfr-devel >= 2.3.0
%endif
# These distros ship an insufficient mpfr
%{?el4:%define _build_mpfr 1}
-%{?suse10_2:%define _build_mpfr 1}
%{?suse10_3:%define _build_mpfr 1}
%endif
%if "%{_build}" != "%{_host}"
-BuildRequires: rtems-4.10-avr-rtems4.10-gcc
+BuildRequires: rtems-4.10-avr-rtems4.10-gcc = %{gcc_rpmvers}
%endif
%if "%{gcc_version}" >= "4.2.0"
@@ -94,7 +101,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-newlib = %{newlib_version}-%{release}
+Requires: rtems-4.10-avr-rtems4.10-newlib = %{newlib_version}-%{newlib_release}
%if "%{gcc_version}" >= "3.4"
@@ -415,7 +422,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}-%{release}
+# Requires: rtems-4.10-avr-rtems4.10-newlib = %{newlib_version}-%{newlib_release}
# License: GPL
# %if %build_infos
@@ -532,9 +539,7 @@ Summary: C Library (newlib) for avr-rtems4.10
Group: Development/Tools
License: Distributable
Version: %{newlib_version}
-
-Provides: rtems-4.10-avr-rtems4.10-libc = %{newlib_version}-%{release}
-Obsoletes: rtems-4.10-avr-rtems4.10-libc < %{newlib_version}-%{release}
+Release: %{newlib_release}
Requires: rtems-4.10-newlib-common
@@ -554,6 +559,7 @@ Newlib C Library for avr-rtems4.10.
Summary: Base package for RTEMS newlib C Library
Group: Development/Tools
Version: %{newlib_version}
+Release: %{newlib_release}
License: Distributable
Requires(post): /sbin/install-info
diff --git a/contrib/crossrpms/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-binutils.spec b/contrib/crossrpms/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-binutils.spec
index ca11c0ee37..982e9edbd1 100644
--- a/contrib/crossrpms/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-binutils.spec
+++ b/contrib/crossrpms/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-binutils.spec
@@ -21,14 +21,22 @@
%ifos cygwin cygwin32 mingw mingw32
%define _exeext .exe
-%define debug_package %{nil}
+%define debug_package %{nil}
+%define _libdir %{_exec_prefix}/lib
%else
%define _exeext %{nil}
%endif
%ifos cygwin cygwin32
%define optflags -O3 -pipe -march=i486 -funroll-loops
-%define _libdir %{_exec_prefix}/lib
+%endif
+
+%ifos mingw mingw32
+%if %{defined _mingw32_cflags}
+%define optflags %{_mingw32_cflags}
+%else
+%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
+%endif
%endif
%if "%{_build}" != "%{_host}"
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 8954d2540d..5ff4d72200 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
@@ -21,14 +21,22 @@
%ifos cygwin cygwin32 mingw mingw32
%define _exeext .exe
-%define debug_package %{nil}
+%define debug_package %{nil}
+%define _libdir %{_exec_prefix}/lib
%else
%define _exeext %{nil}
%endif
%ifos cygwin cygwin32
%define optflags -O3 -pipe -march=i486 -funroll-loops
-%define _libdir %{_exec_prefix}/lib
+%endif
+
+%ifos mingw mingw32
+%if %{defined _mingw32_cflags}
+%define optflags %{_mingw32_cflags}
+%else
+%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
+%endif
%endif
%if "%{_build}" != "%{_host}"
@@ -44,7 +52,7 @@
%define newlib_pkgvers 1.17.0
%define newlib_version 1.17.0
-%define gccnewlib_version gcc%{gcc_version}newlib%{newlib_version}
+%define newlib_release 21%{?dist}
%define mpfr_version 2.3.1
@@ -53,7 +61,7 @@ Summary: bfin-rtems4.10 gcc
Group: Development/Tools
Version: %{gcc_rpmvers}
-Release: 20%{?dist}
+Release: 21%{?dist}
License: GPL
URL: http://gcc.gnu.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -76,12 +84,11 @@ BuildRequires: mpfr-devel >= 2.3.0
%endif
# These distros ship an insufficient mpfr
%{?el4:%define _build_mpfr 1}
-%{?suse10_2:%define _build_mpfr 1}
%{?suse10_3:%define _build_mpfr 1}
%endif
%if "%{_build}" != "%{_host}"
-BuildRequires: rtems-4.10-bfin-rtems4.10-gcc
+BuildRequires: rtems-4.10-bfin-rtems4.10-gcc = %{gcc_rpmvers}
%endif
%if "%{gcc_version}" >= "4.2.0"
@@ -94,7 +101,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-newlib = %{newlib_version}-%{release}
+Requires: rtems-4.10-bfin-rtems4.10-newlib = %{newlib_version}-%{newlib_release}
%if "%{gcc_version}" >= "3.4"
@@ -423,7 +430,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}-%{release}
+# Requires: rtems-4.10-bfin-rtems4.10-newlib = %{newlib_version}-%{newlib_release}
# License: GPL
# %if %build_infos
@@ -539,7 +546,7 @@ Version: %{gcc_rpmvers}
License: GPL
%if "%{_build}" != "%{_host}"
-BuildRequires: rtems-4.10-bfin-rtems4.10-gcc-c++
+BuildRequires: rtems-4.10-bfin-rtems4.10-gcc-c++ = %{gcc_rpmvers}
%endif
Provides: rtems-4.10-bfin-rtems4.10-c++ = %{gcc_rpmvers}-%{release}
Obsoletes: rtems-4.10-bfin-rtems4.10-c++ < %{gcc_rpmvers}-%{release}
@@ -563,11 +570,7 @@ GCC c++ compiler for bfin-rtems4.10.
%{gccexec}/bfin-rtems4.10/%{gcc_version}/cc1plus%{_exeext}
%dir %{gcclib}/bfin-rtems4.10/%{gcc_version}/include
-%if "%{gcc_version}" >= "3.2"
%{gcclib}/bfin-rtems4.10/%{gcc_version}/include/c++
-%else
-%{gcclib}/bfin-rtems4.10/%{gcc_version}/include/g++
-%endif
@@ -579,9 +582,7 @@ Summary: C Library (newlib) for bfin-rtems4.10
Group: Development/Tools
License: Distributable
Version: %{newlib_version}
-
-Provides: rtems-4.10-bfin-rtems4.10-libc = %{newlib_version}-%{release}
-Obsoletes: rtems-4.10-bfin-rtems4.10-libc < %{newlib_version}-%{release}
+Release: %{newlib_release}
Requires: rtems-4.10-newlib-common
@@ -601,6 +602,7 @@ Newlib C Library for bfin-rtems4.10.
Summary: Base package for RTEMS newlib C Library
Group: Development/Tools
Version: %{newlib_version}
+Release: %{newlib_release}
License: Distributable
Requires(post): /sbin/install-info
diff --git a/contrib/crossrpms/rtems4.10/gcc.am b/contrib/crossrpms/rtems4.10/gcc.am
index 2ff5831e22..dff86e18e4 100644
--- a/contrib/crossrpms/rtems4.10/gcc.am
+++ b/contrib/crossrpms/rtems4.10/gcc.am
@@ -30,6 +30,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add
-e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)/g" \
-e "s/[@]NEWLIB_VERS[@]/$(NEWLIB_VERS)/g" \
-e "s/[@]NEWLIB_PKGVERS[@]/$(NEWLIB_PKGVERS)/g" \
+ -e "s/[@]NEWLIB_RPMREL[@]/$(NEWLIB_RPMREL)/g" \
-e "/--with-sysroot/d" \
-e "/[@]tool_target[@]-sys-root/d" \
-e "/[@]tool_target[@]-w32api-sys-root/d" \
diff --git a/contrib/crossrpms/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-binutils.spec b/contrib/crossrpms/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-binutils.spec
index 3ba8666d3a..0cf5874d35 100644
--- a/contrib/crossrpms/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-binutils.spec
+++ b/contrib/crossrpms/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-binutils.spec
@@ -21,14 +21,22 @@
%ifos cygwin cygwin32 mingw mingw32
%define _exeext .exe
-%define debug_package %{nil}
+%define debug_package %{nil}
+%define _libdir %{_exec_prefix}/lib
%else
%define _exeext %{nil}
%endif
%ifos cygwin cygwin32
%define optflags -O3 -pipe -march=i486 -funroll-loops
-%define _libdir %{_exec_prefix}/lib
+%endif
+
+%ifos mingw mingw32
+%if %{defined _mingw32_cflags}
+%define optflags %{_mingw32_cflags}
+%else
+%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
+%endif
%endif
%if "%{_build}" != "%{_host}"
diff --git a/contrib/crossrpms/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-cpukit.spec b/contrib/crossrpms/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-cpukit.spec
index b10ca8f984..a7997f102d 100644
--- a/contrib/crossrpms/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-cpukit.spec
+++ b/contrib/crossrpms/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-cpukit.spec
@@ -21,14 +21,22 @@
%ifos cygwin cygwin32 mingw mingw32
%define _exeext .exe
-%define debug_package %{nil}
+%define debug_package %{nil}
+%define _libdir %{_exec_prefix}/lib
%else
%define _exeext %{nil}
%endif
%ifos cygwin cygwin32
%define optflags -O3 -pipe -march=i486 -funroll-loops
-%define _libdir %{_exec_prefix}/lib
+%endif
+
+%ifos mingw mingw32
+%if %{defined _mingw32_cflags}
+%define optflags %{_mingw32_cflags}
+%else
+%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
+%endif
%endif
%if "%{_build}" != "%{_host}"
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 2782eaae7e..a78c1022d8 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
@@ -21,14 +21,22 @@
%ifos cygwin cygwin32 mingw mingw32
%define _exeext .exe
-%define debug_package %{nil}
+%define debug_package %{nil}
+%define _libdir %{_exec_prefix}/lib
%else
%define _exeext %{nil}
%endif
%ifos cygwin cygwin32
%define optflags -O3 -pipe -march=i486 -funroll-loops
-%define _libdir %{_exec_prefix}/lib
+%endif
+
+%ifos mingw mingw32
+%if %{defined _mingw32_cflags}
+%define optflags %{_mingw32_cflags}
+%else
+%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
+%endif
%endif
%if "%{_build}" != "%{_host}"
@@ -44,7 +52,7 @@
%define newlib_pkgvers 1.17.0
%define newlib_version 1.17.0
-%define gccnewlib_version gcc%{gcc_version}newlib%{newlib_version}
+%define newlib_release 21%{?dist}
%define mpfr_version 2.3.1
@@ -53,7 +61,7 @@ Summary: h8300-rtems4.10 gcc
Group: Development/Tools
Version: %{gcc_rpmvers}
-Release: 20%{?dist}
+Release: 21%{?dist}
License: GPL
URL: http://gcc.gnu.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -76,12 +84,11 @@ BuildRequires: mpfr-devel >= 2.3.0
%endif
# These distros ship an insufficient mpfr
%{?el4:%define _build_mpfr 1}
-%{?suse10_2:%define _build_mpfr 1}
%{?suse10_3:%define _build_mpfr 1}
%endif
%if "%{_build}" != "%{_host}"
-BuildRequires: rtems-4.10-h8300-rtems4.10-gcc
+BuildRequires: rtems-4.10-h8300-rtems4.10-gcc = %{gcc_rpmvers}
%endif
%if "%{gcc_version}" >= "4.2.0"
@@ -94,7 +101,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-newlib = %{newlib_version}-%{release}
+Requires: rtems-4.10-h8300-rtems4.10-newlib = %{newlib_version}-%{newlib_release}
%if "%{gcc_version}" >= "3.4"
@@ -423,7 +430,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}-%{release}
+# Requires: rtems-4.10-h8300-rtems4.10-newlib = %{newlib_version}-%{newlib_release}
# License: GPL
# %if %build_infos
@@ -539,7 +546,7 @@ Version: %{gcc_rpmvers}
License: GPL
%if "%{_build}" != "%{_host}"
-BuildRequires: rtems-4.10-h8300-rtems4.10-gcc-c++
+BuildRequires: rtems-4.10-h8300-rtems4.10-gcc-c++ = %{gcc_rpmvers}
%endif
Provides: rtems-4.10-h8300-rtems4.10-c++ = %{gcc_rpmvers}-%{release}
Obsoletes: rtems-4.10-h8300-rtems4.10-c++ < %{gcc_rpmvers}-%{release}
@@ -563,11 +570,7 @@ GCC c++ compiler for h8300-rtems4.10.
%{gccexec}/h8300-rtems4.10/%{gcc_version}/cc1plus%{_exeext}
%dir %{gcclib}/h8300-rtems4.10/%{gcc_version}/include
-%if "%{gcc_version}" >= "3.2"
%{gcclib}/h8300-rtems4.10/%{gcc_version}/include/c++
-%else
-%{gcclib}/h8300-rtems4.10/%{gcc_version}/include/g++
-%endif
@@ -579,9 +582,7 @@ Summary: C Library (newlib) for h8300-rtems4.10
Group: Development/Tools
License: Distributable
Version: %{newlib_version}
-
-Provides: rtems-4.10-h8300-rtems4.10-libc = %{newlib_version}-%{release}
-Obsoletes: rtems-4.10-h8300-rtems4.10-libc < %{newlib_version}-%{release}
+Release: %{newlib_release}
Requires: rtems-4.10-newlib-common
@@ -601,6 +602,7 @@ Newlib C Library for h8300-rtems4.10.
Summary: Base package for RTEMS newlib C Library
Group: Development/Tools
Version: %{newlib_version}
+Release: %{newlib_release}
License: Distributable
Requires(post): /sbin/install-info
diff --git a/contrib/crossrpms/rtems4.10/i386/rtems-4.10-i386-rtems4.10-binutils.spec b/contrib/crossrpms/rtems4.10/i386/rtems-4.10-i386-rtems4.10-binutils.spec
index bcfa061fb6..9fd4771c21 100644
--- a/contrib/crossrpms/rtems4.10/i386/rtems-4.10-i386-rtems4.10-binutils.spec
+++ b/contrib/crossrpms/rtems4.10/i386/rtems-4.10-i386-rtems4.10-binutils.spec
@@ -21,14 +21,22 @@
%ifos cygwin cygwin32 mingw mingw32
%define _exeext .exe
-%define debug_package %{nil}
+%define debug_package %{nil}
+%define _libdir %{_exec_prefix}/lib
%else
%define _exeext %{nil}
%endif
%ifos cygwin cygwin32
%define optflags -O3 -pipe -march=i486 -funroll-loops
-%define _libdir %{_exec_prefix}/lib
+%endif
+
+%ifos mingw mingw32
+%if %{defined _mingw32_cflags}
+%define optflags %{_mingw32_cflags}
+%else
+%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
+%endif
%endif
%if "%{_build}" != "%{_host}"
diff --git a/contrib/crossrpms/rtems4.10/i386/rtems-4.10-i386-rtems4.10-cpukit.spec b/contrib/crossrpms/rtems4.10/i386/rtems-4.10-i386-rtems4.10-cpukit.spec
index 86d1cd786e..118a85b31f 100644
--- a/contrib/crossrpms/rtems4.10/i386/rtems-4.10-i386-rtems4.10-cpukit.spec
+++ b/contrib/crossrpms/rtems4.10/i386/rtems-4.10-i386-rtems4.10-cpukit.spec
@@ -21,14 +21,22 @@
%ifos cygwin cygwin32 mingw mingw32
%define _exeext .exe
-%define debug_package %{nil}
+%define debug_package %{nil}
+%define _libdir %{_exec_prefix}/lib
%else
%define _exeext %{nil}
%endif
%ifos cygwin cygwin32
%define optflags -O3 -pipe -march=i486 -funroll-loops
-%define _libdir %{_exec_prefix}/lib
+%endif
+
+%ifos mingw mingw32
+%if %{defined _mingw32_cflags}
+%define optflags %{_mingw32_cflags}
+%else
+%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
+%endif
%endif
%if "%{_build}" != "%{_host}"
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 693e811fd9..94b864bff9 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
@@ -21,14 +21,22 @@
%ifos cygwin cygwin32 mingw mingw32
%define _exeext .exe
-%define debug_package %{nil}
+%define debug_package %{nil}
+%define _libdir %{_exec_prefix}/lib
%else
%define _exeext %{nil}
%endif
%ifos cygwin cygwin32
%define optflags -O3 -pipe -march=i486 -funroll-loops
-%define _libdir %{_exec_prefix}/lib
+%endif
+
+%ifos mingw mingw32
+%if %{defined _mingw32_cflags}
+%define optflags %{_mingw32_cflags}
+%else
+%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
+%endif
%endif
%if "%{_build}" != "%{_host}"
@@ -44,7 +52,7 @@
%define newlib_pkgvers 1.17.0
%define newlib_version 1.17.0
-%define gccnewlib_version gcc%{gcc_version}newlib%{newlib_version}
+%define newlib_release 21%{?dist}
%define mpfr_version 2.3.1
@@ -53,7 +61,7 @@ Summary: i386-rtems4.10 gcc
Group: Development/Tools
Version: %{gcc_rpmvers}
-Release: 20%{?dist}
+Release: 21%{?dist}
License: GPL
URL: http://gcc.gnu.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -76,12 +84,11 @@ BuildRequires: mpfr-devel >= 2.3.0
%endif
# These distros ship an insufficient mpfr
%{?el4:%define _build_mpfr 1}
-%{?suse10_2:%define _build_mpfr 1}
%{?suse10_3:%define _build_mpfr 1}
%endif
%if "%{_build}" != "%{_host}"
-BuildRequires: rtems-4.10-i386-rtems4.10-gcc
+BuildRequires: rtems-4.10-i386-rtems4.10-gcc = %{gcc_rpmvers}
%endif
%if "%{gcc_version}" >= "4.2.0"
@@ -94,7 +101,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-newlib = %{newlib_version}-%{release}
+Requires: rtems-4.10-i386-rtems4.10-newlib = %{newlib_version}-%{newlib_release}
%if "%{gcc_version}" >= "3.4"
@@ -423,7 +430,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}-%{release}
+# Requires: rtems-4.10-i386-rtems4.10-newlib = %{newlib_version}-%{newlib_release}
# License: GPL
# %if %build_infos
@@ -539,7 +546,7 @@ Version: %{gcc_rpmvers}
License: GPL
%if "%{_build}" != "%{_host}"
-BuildRequires: rtems-4.10-i386-rtems4.10-gcc-c++
+BuildRequires: rtems-4.10-i386-rtems4.10-gcc-c++ = %{gcc_rpmvers}
%endif
Provides: rtems-4.10-i386-rtems4.10-c++ = %{gcc_rpmvers}-%{release}
Obsoletes: rtems-4.10-i386-rtems4.10-c++ < %{gcc_rpmvers}-%{release}
@@ -563,11 +570,7 @@ GCC c++ compiler for i386-rtems4.10.
%{gccexec}/i386-rtems4.10/%{gcc_version}/cc1plus%{_exeext}
%dir %{gcclib}/i386-rtems4.10/%{gcc_version}/include
-%if "%{gcc_version}" >= "3.2"
%{gcclib}/i386-rtems4.10/%{gcc_version}/include/c++
-%else
-%{gcclib}/i386-rtems4.10/%{gcc_version}/include/g++
-%endif
@@ -579,9 +582,7 @@ Summary: C Library (newlib) for i386-rtems4.10
Group: Development/Tools
License: Distributable
Version: %{newlib_version}
-
-Provides: rtems-4.10-i386-rtems4.10-libc = %{newlib_version}-%{release}
-Obsoletes: rtems-4.10-i386-rtems4.10-libc < %{newlib_version}-%{release}
+Release: %{newlib_release}
Requires: rtems-4.10-newlib-common
@@ -601,6 +602,7 @@ Newlib C Library for i386-rtems4.10.
Summary: Base package for RTEMS newlib C Library
Group: Development/Tools
Version: %{newlib_version}
+Release: %{newlib_release}
License: Distributable
Requires(post): /sbin/install-info
diff --git a/contrib/crossrpms/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-binutils.spec b/contrib/crossrpms/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-binutils.spec
index 178be4570e..e9c81e0c71 100644
--- a/contrib/crossrpms/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-binutils.spec
+++ b/contrib/crossrpms/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-binutils.spec
@@ -21,14 +21,22 @@
%ifos cygwin cygwin32 mingw mingw32
%define _exeext .exe
-%define debug_package %{nil}
+%define debug_package %{nil}
+%define _libdir %{_exec_prefix}/lib
%else
%define _exeext %{nil}
%endif
%ifos cygwin cygwin32
%define optflags -O3 -pipe -march=i486 -funroll-loops
-%define _libdir %{_exec_prefix}/lib
+%endif
+
+%ifos mingw mingw32
+%if %{defined _mingw32_cflags}
+%define optflags %{_mingw32_cflags}
+%else
+%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
+%endif
%endif
%if "%{_build}" != "%{_host}"
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 ed51edfa60..1197968703 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
@@ -21,14 +21,22 @@
%ifos cygwin cygwin32 mingw mingw32
%define _exeext .exe
-%define debug_package %{nil}
+%define debug_package %{nil}
+%define _libdir %{_exec_prefix}/lib
%else
%define _exeext %{nil}
%endif
%ifos cygwin cygwin32
%define optflags -O3 -pipe -march=i486 -funroll-loops
-%define _libdir %{_exec_prefix}/lib
+%endif
+
+%ifos mingw mingw32
+%if %{defined _mingw32_cflags}
+%define optflags %{_mingw32_cflags}
+%else
+%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
+%endif
%endif
%if "%{_build}" != "%{_host}"
@@ -44,7 +52,7 @@
%define newlib_pkgvers 1.17.0
%define newlib_version 1.17.0
-%define gccnewlib_version gcc%{gcc_version}newlib%{newlib_version}
+%define newlib_release 21%{?dist}
%define mpfr_version 2.3.1
@@ -53,7 +61,7 @@ Summary: m32c-rtems4.10 gcc
Group: Development/Tools
Version: %{gcc_rpmvers}
-Release: 20%{?dist}
+Release: 21%{?dist}
License: GPL
URL: http://gcc.gnu.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -76,12 +84,11 @@ BuildRequires: mpfr-devel >= 2.3.0
%endif
# These distros ship an insufficient mpfr
%{?el4:%define _build_mpfr 1}
-%{?suse10_2:%define _build_mpfr 1}
%{?suse10_3:%define _build_mpfr 1}
%endif
%if "%{_build}" != "%{_host}"
-BuildRequires: rtems-4.10-m32c-rtems4.10-gcc
+BuildRequires: rtems-4.10-m32c-rtems4.10-gcc = %{gcc_rpmvers}
%endif
%if "%{gcc_version}" >= "4.2.0"
@@ -93,7 +100,7 @@ BuildRequires: texinfo >= 4.2
BuildRequires: rtems-4.10-m32c-rtems4.10-binutils
Requires: rtems-4.10-m32c-rtems4.10-binutils
-Requires: rtems-4.10-m32c-rtems4.10-newlib = %{newlib_version}-%{release}
+Requires: rtems-4.10-m32c-rtems4.10-newlib = %{newlib_version}-%{newlib_release}
%if "%{gcc_version}" >= "3.4"
@@ -415,7 +422,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}-%{release}
+# Requires: rtems-4.10-m32c-rtems4.10-newlib = %{newlib_version}-%{newlib_release}
# License: GPL
# %if %build_infos
@@ -474,9 +481,7 @@ Summary: C Library (newlib) for m32c-rtems4.10
Group: Development/Tools
License: Distributable
Version: %{newlib_version}
-
-Provides: rtems-4.10-m32c-rtems4.10-libc = %{newlib_version}-%{release}
-Obsoletes: rtems-4.10-m32c-rtems4.10-libc < %{newlib_version}-%{release}
+Release: %{newlib_release}
%description -n rtems-4.10-m32c-rtems4.10-newlib
diff --git a/contrib/crossrpms/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-binutils.spec b/contrib/crossrpms/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-binutils.spec
index 0c989c84f6..44426c131e 100644
--- a/contrib/crossrpms/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-binutils.spec
+++ b/contrib/crossrpms/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-binutils.spec
@@ -21,14 +21,22 @@
%ifos cygwin cygwin32 mingw mingw32
%define _exeext .exe
-%define debug_package %{nil}
+%define debug_package %{nil}
+%define _libdir %{_exec_prefix}/lib
%else
%define _exeext %{nil}
%endif
%ifos cygwin cygwin32
%define optflags -O3 -pipe -march=i486 -funroll-loops
-%define _libdir %{_exec_prefix}/lib
+%endif
+
+%ifos mingw mingw32
+%if %{defined _mingw32_cflags}
+%define optflags %{_mingw32_cflags}
+%else
+%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
+%endif
%endif
%if "%{_build}" != "%{_host}"
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 7c157e26a5..83e02afa0e 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
@@ -21,14 +21,22 @@
%ifos cygwin cygwin32 mingw mingw32
%define _exeext .exe
-%define debug_package %{nil}
+%define debug_package %{nil}
+%define _libdir %{_exec_prefix}/lib
%else
%define _exeext %{nil}
%endif
%ifos cygwin cygwin32
%define optflags -O3 -pipe -march=i486 -funroll-loops
-%define _libdir %{_exec_prefix}/lib
+%endif
+
+%ifos mingw mingw32
+%if %{defined _mingw32_cflags}
+%define optflags %{_mingw32_cflags}
+%else
+%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
+%endif
%endif
%if "%{_build}" != "%{_host}"
@@ -44,7 +52,7 @@
%define newlib_pkgvers 1.17.0
%define newlib_version 1.17.0
-%define gccnewlib_version gcc%{gcc_version}newlib%{newlib_version}
+%define newlib_release 21%{?dist}
%define mpfr_version 2.3.1
@@ -53,7 +61,7 @@ Summary: m32r-rtems4.10 gcc
Group: Development/Tools
Version: %{gcc_rpmvers}
-Release: 20%{?dist}
+Release: 21%{?dist}
License: GPL
URL: http://gcc.gnu.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -76,12 +84,11 @@ BuildRequires: mpfr-devel >= 2.3.0
%endif
# These distros ship an insufficient mpfr
%{?el4:%define _build_mpfr 1}
-%{?suse10_2:%define _build_mpfr 1}
%{?suse10_3:%define _build_mpfr 1}
%endif
%if "%{_build}" != "%{_host}"
-BuildRequires: rtems-4.10-m32r-rtems4.10-gcc
+BuildRequires: rtems-4.10-m32r-rtems4.10-gcc = %{gcc_rpmvers}
%endif
%if "%{gcc_version}" >= "4.2.0"
@@ -93,7 +100,7 @@ BuildRequires: texinfo >= 4.2
BuildRequires: rtems-4.10-m32r-rtems4.10-binutils
Requires: rtems-4.10-m32r-rtems4.10-binutils
-Requires: rtems-4.10-m32r-rtems4.10-newlib = %{newlib_version}-%{release}
+Requires: rtems-4.10-m32r-rtems4.10-newlib = %{newlib_version}-%{newlib_release}
%if "%{gcc_version}" >= "3.4"
@@ -415,7 +422,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}-%{release}
+# Requires: rtems-4.10-m32r-rtems4.10-newlib = %{newlib_version}-%{newlib_release}
# License: GPL
# %if %build_infos
@@ -474,9 +481,7 @@ Summary: C Library (newlib) for m32r-rtems4.10
Group: Development/Tools
License: Distributable
Version: %{newlib_version}
-
-Provides: rtems-4.10-m32r-rtems4.10-libc = %{newlib_version}-%{release}
-Obsoletes: rtems-4.10-m32r-rtems4.10-libc < %{newlib_version}-%{release}
+Release: %{newlib_release}
%description -n rtems-4.10-m32r-rtems4.10-newlib
diff --git a/contrib/crossrpms/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-binutils.spec b/contrib/crossrpms/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-binutils.spec
index 091319952c..fe41f64aba 100644
--- a/contrib/crossrpms/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-binutils.spec
+++ b/contrib/crossrpms/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-binutils.spec
@@ -21,14 +21,22 @@
%ifos cygwin cygwin32 mingw mingw32
%define _exeext .exe
-%define debug_package %{nil}
+%define debug_package %{nil}
+%define _libdir %{_exec_prefix}/lib
%else
%define _exeext %{nil}
%endif
%ifos cygwin cygwin32
%define optflags -O3 -pipe -march=i486 -funroll-loops
-%define _libdir %{_exec_prefix}/lib
+%endif
+
+%ifos mingw mingw32
+%if %{defined _mingw32_cflags}
+%define optflags %{_mingw32_cflags}
+%else
+%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
+%endif
%endif
%if "%{_build}" != "%{_host}"
diff --git a/contrib/crossrpms/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-cpukit.spec b/contrib/crossrpms/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-cpukit.spec
index ff06c32011..eab179f881 100644
--- a/contrib/crossrpms/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-cpukit.spec
+++ b/contrib/crossrpms/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-cpukit.spec
@@ -21,14 +21,22 @@
%ifos cygwin cygwin32 mingw mingw32
%define _exeext .exe
-%define debug_package %{nil}
+%define debug_package %{nil}
+%define _libdir %{_exec_prefix}/lib
%else
%define _exeext %{nil}
%endif
%ifos cygwin cygwin32
%define optflags -O3 -pipe -march=i486 -funroll-loops
-%define _libdir %{_exec_prefix}/lib
+%endif
+
+%ifos mingw mingw32
+%if %{defined _mingw32_cflags}
+%define optflags %{_mingw32_cflags}
+%else
+%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
+%endif
%endif
%if "%{_build}" != "%{_host}"
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 633815a9ce..cf06e41c7b 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
@@ -21,14 +21,22 @@
%ifos cygwin cygwin32 mingw mingw32
%define _exeext .exe
-%define debug_package %{nil}
+%define debug_package %{nil}
+%define _libdir %{_exec_prefix}/lib
%else
%define _exeext %{nil}
%endif
%ifos cygwin cygwin32
%define optflags -O3 -pipe -march=i486 -funroll-loops
-%define _libdir %{_exec_prefix}/lib
+%endif
+
+%ifos mingw mingw32
+%if %{defined _mingw32_cflags}
+%define optflags %{_mingw32_cflags}
+%else
+%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
+%endif
%endif
%if "%{_build}" != "%{_host}"
@@ -44,7 +52,7 @@
%define newlib_pkgvers 1.17.0
%define newlib_version 1.17.0
-%define gccnewlib_version gcc%{gcc_version}newlib%{newlib_version}
+%define newlib_release 21%{?dist}
%define mpfr_version 2.3.1
@@ -53,7 +61,7 @@ Summary: m68k-rtems4.10 gcc
Group: Development/Tools
Version: %{gcc_rpmvers}
-Release: 20%{?dist}
+Release: 21%{?dist}
License: GPL
URL: http://gcc.gnu.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -76,12 +84,11 @@ BuildRequires: mpfr-devel >= 2.3.0
%endif
# These distros ship an insufficient mpfr
%{?el4:%define _build_mpfr 1}
-%{?suse10_2:%define _build_mpfr 1}
%{?suse10_3:%define _build_mpfr 1}
%endif
%if "%{_build}" != "%{_host}"
-BuildRequires: rtems-4.10-m68k-rtems4.10-gcc
+BuildRequires: rtems-4.10-m68k-rtems4.10-gcc = %{gcc_rpmvers}
%endif
%if "%{gcc_version}" >= "4.2.0"
@@ -94,7 +101,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-newlib = %{newlib_version}-%{release}
+Requires: rtems-4.10-m68k-rtems4.10-newlib = %{newlib_version}-%{newlib_release}
%if "%{gcc_version}" >= "3.4"
@@ -423,7 +430,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}-%{release}
+# Requires: rtems-4.10-m68k-rtems4.10-newlib = %{newlib_version}-%{newlib_release}
# License: GPL
# %if %build_infos
@@ -539,7 +546,7 @@ Version: %{gcc_rpmvers}
License: GPL
%if "%{_build}" != "%{_host}"
-BuildRequires: rtems-4.10-m68k-rtems4.10-gcc-c++
+BuildRequires: rtems-4.10-m68k-rtems4.10-gcc-c++ = %{gcc_rpmvers}
%endif
Provides: rtems-4.10-m68k-rtems4.10-c++ = %{gcc_rpmvers}-%{release}
Obsoletes: rtems-4.10-m68k-rtems4.10-c++ < %{gcc_rpmvers}-%{release}
@@ -563,11 +570,7 @@ GCC c++ compiler for m68k-rtems4.10.
%{gccexec}/m68k-rtems4.10/%{gcc_version}/cc1plus%{_exeext}
%dir %{gcclib}/m68k-rtems4.10/%{gcc_version}/include
-%if "%{gcc_version}" >= "3.2"
%{gcclib}/m68k-rtems4.10/%{gcc_version}/include/c++
-%else
-%{gcclib}/m68k-rtems4.10/%{gcc_version}/include/g++
-%endif
@@ -579,9 +582,7 @@ Summary: C Library (newlib) for m68k-rtems4.10
Group: Development/Tools
License: Distributable
Version: %{newlib_version}
-
-Provides: rtems-4.10-m68k-rtems4.10-libc = %{newlib_version}-%{release}
-Obsoletes: rtems-4.10-m68k-rtems4.10-libc < %{newlib_version}-%{release}
+Release: %{newlib_release}
Requires: rtems-4.10-newlib-common
@@ -601,6 +602,7 @@ Newlib C Library for m68k-rtems4.10.
Summary: Base package for RTEMS newlib C Library
Group: Development/Tools
Version: %{newlib_version}
+Release: %{newlib_release}
License: Distributable
Requires(post): /sbin/install-info
diff --git a/contrib/crossrpms/rtems4.10/mips/rtems-4.10-mips-rtems4.10-binutils.spec b/contrib/crossrpms/rtems4.10/mips/rtems-4.10-mips-rtems4.10-binutils.spec
index bdaa19a744..1fc847bd39 100644
--- a/contrib/crossrpms/rtems4.10/mips/rtems-4.10-mips-rtems4.10-binutils.spec
+++ b/contrib/crossrpms/rtems4.10/mips/rtems-4.10-mips-rtems4.10-binutils.spec
@@ -21,14 +21,22 @@
%ifos cygwin cygwin32 mingw mingw32
%define _exeext .exe
-%define debug_package %{nil}
+%define debug_package %{nil}
+%define _libdir %{_exec_prefix}/lib
%else
%define _exeext %{nil}
%endif
%ifos cygwin cygwin32
%define optflags -O3 -pipe -march=i486 -funroll-loops
-%define _libdir %{_exec_prefix}/lib
+%endif
+
+%ifos mingw mingw32
+%if %{defined _mingw32_cflags}
+%define optflags %{_mingw32_cflags}
+%else
+%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
+%endif
%endif
%if "%{_build}" != "%{_host}"
diff --git a/contrib/crossrpms/rtems4.10/mips/rtems-4.10-mips-rtems4.10-cpukit.spec b/contrib/crossrpms/rtems4.10/mips/rtems-4.10-mips-rtems4.10-cpukit.spec
index 414d34a104..9cc79f1876 100644
--- a/contrib/crossrpms/rtems4.10/mips/rtems-4.10-mips-rtems4.10-cpukit.spec
+++ b/contrib/crossrpms/rtems4.10/mips/rtems-4.10-mips-rtems4.10-cpukit.spec
@@ -21,14 +21,22 @@
%ifos cygwin cygwin32 mingw mingw32
%define _exeext .exe
-%define debug_package %{nil}
+%define debug_package %{nil}
+%define _libdir %{_exec_prefix}/lib
%else
%define _exeext %{nil}
%endif
%ifos cygwin cygwin32
%define optflags -O3 -pipe -march=i486 -funroll-loops
-%define _libdir %{_exec_prefix}/lib
+%endif
+
+%ifos mingw mingw32
+%if %{defined _mingw32_cflags}
+%define optflags %{_mingw32_cflags}
+%else
+%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
+%endif
%endif
%if "%{_build}" != "%{_host}"
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 804d58a68d..598a7c9cb9 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
@@ -21,14 +21,22 @@
%ifos cygwin cygwin32 mingw mingw32
%define _exeext .exe
-%define debug_package %{nil}
+%define debug_package %{nil}
+%define _libdir %{_exec_prefix}/lib
%else
%define _exeext %{nil}
%endif
%ifos cygwin cygwin32
%define optflags -O3 -pipe -march=i486 -funroll-loops
-%define _libdir %{_exec_prefix}/lib
+%endif
+
+%ifos mingw mingw32
+%if %{defined _mingw32_cflags}
+%define optflags %{_mingw32_cflags}
+%else
+%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
+%endif
%endif
%if "%{_build}" != "%{_host}"
@@ -44,7 +52,7 @@
%define newlib_pkgvers 1.17.0
%define newlib_version 1.17.0
-%define gccnewlib_version gcc%{gcc_version}newlib%{newlib_version}
+%define newlib_release 21%{?dist}
%define mpfr_version 2.3.1
@@ -53,7 +61,7 @@ Summary: mips-rtems4.10 gcc
Group: Development/Tools
Version: %{gcc_rpmvers}
-Release: 20%{?dist}
+Release: 21%{?dist}
License: GPL
URL: http://gcc.gnu.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -76,12 +84,11 @@ BuildRequires: mpfr-devel >= 2.3.0
%endif
# These distros ship an insufficient mpfr
%{?el4:%define _build_mpfr 1}
-%{?suse10_2:%define _build_mpfr 1}
%{?suse10_3:%define _build_mpfr 1}
%endif
%if "%{_build}" != "%{_host}"
-BuildRequires: rtems-4.10-mips-rtems4.10-gcc
+BuildRequires: rtems-4.10-mips-rtems4.10-gcc = %{gcc_rpmvers}
%endif
%if "%{gcc_version}" >= "4.2.0"
@@ -94,7 +101,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-newlib = %{newlib_version}-%{release}
+Requires: rtems-4.10-mips-rtems4.10-newlib = %{newlib_version}-%{newlib_release}
%if "%{gcc_version}" >= "3.4"
@@ -423,7 +430,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}-%{release}
+# Requires: rtems-4.10-mips-rtems4.10-newlib = %{newlib_version}-%{newlib_release}
# License: GPL
# %if %build_infos
@@ -539,7 +546,7 @@ Version: %{gcc_rpmvers}
License: GPL
%if "%{_build}" != "%{_host}"
-BuildRequires: rtems-4.10-mips-rtems4.10-gcc-c++
+BuildRequires: rtems-4.10-mips-rtems4.10-gcc-c++ = %{gcc_rpmvers}
%endif
Provides: rtems-4.10-mips-rtems4.10-c++ = %{gcc_rpmvers}-%{release}
Obsoletes: rtems-4.10-mips-rtems4.10-c++ < %{gcc_rpmvers}-%{release}
@@ -563,11 +570,7 @@ GCC c++ compiler for mips-rtems4.10.
%{gccexec}/mips-rtems4.10/%{gcc_version}/cc1plus%{_exeext}
%dir %{gcclib}/mips-rtems4.10/%{gcc_version}/include
-%if "%{gcc_version}" >= "3.2"
%{gcclib}/mips-rtems4.10/%{gcc_version}/include/c++
-%else
-%{gcclib}/mips-rtems4.10/%{gcc_version}/include/g++
-%endif
@@ -579,9 +582,7 @@ Summary: C Library (newlib) for mips-rtems4.10
Group: Development/Tools
License: Distributable
Version: %{newlib_version}
-
-Provides: rtems-4.10-mips-rtems4.10-libc = %{newlib_version}-%{release}
-Obsoletes: rtems-4.10-mips-rtems4.10-libc < %{newlib_version}-%{release}
+Release: %{newlib_release}
Requires: rtems-4.10-newlib-common
@@ -601,6 +602,7 @@ Newlib C Library for mips-rtems4.10.
Summary: Base package for RTEMS newlib C Library
Group: Development/Tools
Version: %{newlib_version}
+Release: %{newlib_release}
License: Distributable
Requires(post): /sbin/install-info
diff --git a/contrib/crossrpms/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-binutils.spec b/contrib/crossrpms/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-binutils.spec
index d589c111c6..22d3f05027 100644
--- a/contrib/crossrpms/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-binutils.spec
+++ b/contrib/crossrpms/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-binutils.spec
@@ -21,14 +21,22 @@
%ifos cygwin cygwin32 mingw mingw32
%define _exeext .exe
-%define debug_package %{nil}
+%define debug_package %{nil}
+%define _libdir %{_exec_prefix}/lib
%else
%define _exeext %{nil}
%endif
%ifos cygwin cygwin32
%define optflags -O3 -pipe -march=i486 -funroll-loops
-%define _libdir %{_exec_prefix}/lib
+%endif
+
+%ifos mingw mingw32
+%if %{defined _mingw32_cflags}
+%define optflags %{_mingw32_cflags}
+%else
+%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
+%endif
%endif
%if "%{_build}" != "%{_host}"
diff --git a/contrib/crossrpms/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-cpukit.spec b/contrib/crossrpms/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-cpukit.spec
index 3c6ccc60ca..7df97ae0e1 100644
--- a/contrib/crossrpms/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-cpukit.spec
+++ b/contrib/crossrpms/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-cpukit.spec
@@ -21,14 +21,22 @@
%ifos cygwin cygwin32 mingw mingw32
%define _exeext .exe
-%define debug_package %{nil}
+%define debug_package %{nil}
+%define _libdir %{_exec_prefix}/lib
%else
%define _exeext %{nil}
%endif
%ifos cygwin cygwin32
%define optflags -O3 -pipe -march=i486 -funroll-loops
-%define _libdir %{_exec_prefix}/lib
+%endif
+
+%ifos mingw mingw32
+%if %{defined _mingw32_cflags}
+%define optflags %{_mingw32_cflags}
+%else
+%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
+%endif
%endif
%if "%{_build}" != "%{_host}"
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 08ec45f100..4b0e47248b 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
@@ -21,14 +21,22 @@
%ifos cygwin cygwin32 mingw mingw32
%define _exeext .exe
-%define debug_package %{nil}
+%define debug_package %{nil}
+%define _libdir %{_exec_prefix}/lib
%else
%define _exeext %{nil}
%endif
%ifos cygwin cygwin32
%define optflags -O3 -pipe -march=i486 -funroll-loops
-%define _libdir %{_exec_prefix}/lib
+%endif
+
+%ifos mingw mingw32
+%if %{defined _mingw32_cflags}
+%define optflags %{_mingw32_cflags}
+%else
+%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
+%endif
%endif
%if "%{_build}" != "%{_host}"
@@ -44,7 +52,7 @@
%define newlib_pkgvers 1.17.0
%define newlib_version 1.17.0
-%define gccnewlib_version gcc%{gcc_version}newlib%{newlib_version}
+%define newlib_release 21%{?dist}
%define mpfr_version 2.3.1
@@ -53,7 +61,7 @@ Summary: powerpc-rtems4.10 gcc
Group: Development/Tools
Version: %{gcc_rpmvers}
-Release: 20%{?dist}
+Release: 21%{?dist}
License: GPL
URL: http://gcc.gnu.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -76,12 +84,11 @@ BuildRequires: mpfr-devel >= 2.3.0
%endif
# These distros ship an insufficient mpfr
%{?el4:%define _build_mpfr 1}
-%{?suse10_2:%define _build_mpfr 1}
%{?suse10_3:%define _build_mpfr 1}
%endif
%if "%{_build}" != "%{_host}"
-BuildRequires: rtems-4.10-powerpc-rtems4.10-gcc
+BuildRequires: rtems-4.10-powerpc-rtems4.10-gcc = %{gcc_rpmvers}
%endif
%if "%{gcc_version}" >= "4.2.0"
@@ -94,7 +101,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-newlib = %{newlib_version}-%{release}
+Requires: rtems-4.10-powerpc-rtems4.10-newlib = %{newlib_version}-%{newlib_release}
%if "%{gcc_version}" >= "3.4"
@@ -423,7 +430,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}-%{release}
+# Requires: rtems-4.10-powerpc-rtems4.10-newlib = %{newlib_version}-%{newlib_release}
# License: GPL
# %if %build_infos
@@ -539,7 +546,7 @@ Version: %{gcc_rpmvers}
License: GPL
%if "%{_build}" != "%{_host}"
-BuildRequires: rtems-4.10-powerpc-rtems4.10-gcc-c++
+BuildRequires: rtems-4.10-powerpc-rtems4.10-gcc-c++ = %{gcc_rpmvers}
%endif
Provides: rtems-4.10-powerpc-rtems4.10-c++ = %{gcc_rpmvers}-%{release}
Obsoletes: rtems-4.10-powerpc-rtems4.10-c++ < %{gcc_rpmvers}-%{release}
@@ -563,11 +570,7 @@ GCC c++ compiler for powerpc-rtems4.10.
%{gccexec}/powerpc-rtems4.10/%{gcc_version}/cc1plus%{_exeext}
%dir %{gcclib}/powerpc-rtems4.10/%{gcc_version}/include
-%if "%{gcc_version}" >= "3.2"
%{gcclib}/powerpc-rtems4.10/%{gcc_version}/include/c++
-%else
-%{gcclib}/powerpc-rtems4.10/%{gcc_version}/include/g++
-%endif
@@ -579,9 +582,7 @@ Summary: C Library (newlib) for powerpc-rtems4.10
Group: Development/Tools
License: Distributable
Version: %{newlib_version}
-
-Provides: rtems-4.10-powerpc-rtems4.10-libc = %{newlib_version}-%{release}
-Obsoletes: rtems-4.10-powerpc-rtems4.10-libc < %{newlib_version}-%{release}
+Release: %{newlib_release}
Requires: rtems-4.10-newlib-common
@@ -601,6 +602,7 @@ Newlib C Library for powerpc-rtems4.10.
Summary: Base package for RTEMS newlib C Library
Group: Development/Tools
Version: %{newlib_version}
+Release: %{newlib_release}
License: Distributable
Requires(post): /sbin/install-info
diff --git a/contrib/crossrpms/rtems4.10/sh/rtems-4.10-sh-rtems4.10-binutils.spec b/contrib/crossrpms/rtems4.10/sh/rtems-4.10-sh-rtems4.10-binutils.spec
index 3654f1b659..6c48e9a872 100644
--- a/contrib/crossrpms/rtems4.10/sh/rtems-4.10-sh-rtems4.10-binutils.spec
+++ b/contrib/crossrpms/rtems4.10/sh/rtems-4.10-sh-rtems4.10-binutils.spec
@@ -21,14 +21,22 @@
%ifos cygwin cygwin32 mingw mingw32
%define _exeext .exe
-%define debug_package %{nil}
+%define debug_package %{nil}
+%define _libdir %{_exec_prefix}/lib
%else
%define _exeext %{nil}
%endif
%ifos cygwin cygwin32
%define optflags -O3 -pipe -march=i486 -funroll-loops
-%define _libdir %{_exec_prefix}/lib
+%endif
+
+%ifos mingw mingw32
+%if %{defined _mingw32_cflags}
+%define optflags %{_mingw32_cflags}
+%else
+%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
+%endif
%endif
%if "%{_build}" != "%{_host}"
diff --git a/contrib/crossrpms/rtems4.10/sh/rtems-4.10-sh-rtems4.10-cpukit.spec b/contrib/crossrpms/rtems4.10/sh/rtems-4.10-sh-rtems4.10-cpukit.spec
index 3c2765813a..5f991bcf13 100644
--- a/contrib/crossrpms/rtems4.10/sh/rtems-4.10-sh-rtems4.10-cpukit.spec
+++ b/contrib/crossrpms/rtems4.10/sh/rtems-4.10-sh-rtems4.10-cpukit.spec
@@ -21,14 +21,22 @@
%ifos cygwin cygwin32 mingw mingw32
%define _exeext .exe
-%define debug_package %{nil}
+%define debug_package %{nil}
+%define _libdir %{_exec_prefix}/lib
%else
%define _exeext %{nil}
%endif
%ifos cygwin cygwin32
%define optflags -O3 -pipe -march=i486 -funroll-loops
-%define _libdir %{_exec_prefix}/lib
+%endif
+
+%ifos mingw mingw32
+%if %{defined _mingw32_cflags}
+%define optflags %{_mingw32_cflags}
+%else
+%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
+%endif
%endif
%if "%{_build}" != "%{_host}"
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 9351f9f2b7..fe4a087715 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
@@ -21,14 +21,22 @@
%ifos cygwin cygwin32 mingw mingw32
%define _exeext .exe
-%define debug_package %{nil}
+%define debug_package %{nil}
+%define _libdir %{_exec_prefix}/lib
%else
%define _exeext %{nil}
%endif
%ifos cygwin cygwin32
%define optflags -O3 -pipe -march=i486 -funroll-loops
-%define _libdir %{_exec_prefix}/lib
+%endif
+
+%ifos mingw mingw32
+%if %{defined _mingw32_cflags}
+%define optflags %{_mingw32_cflags}
+%else
+%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
+%endif
%endif
%if "%{_build}" != "%{_host}"
@@ -44,7 +52,7 @@
%define newlib_pkgvers 1.17.0
%define newlib_version 1.17.0
-%define gccnewlib_version gcc%{gcc_version}newlib%{newlib_version}
+%define newlib_release 21%{?dist}
%define mpfr_version 2.3.1
@@ -53,7 +61,7 @@ Summary: sh-rtems4.10 gcc
Group: Development/Tools
Version: %{gcc_rpmvers}
-Release: 20%{?dist}
+Release: 21%{?dist}
License: GPL
URL: http://gcc.gnu.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -76,12 +84,11 @@ BuildRequires: mpfr-devel >= 2.3.0
%endif
# These distros ship an insufficient mpfr
%{?el4:%define _build_mpfr 1}
-%{?suse10_2:%define _build_mpfr 1}
%{?suse10_3:%define _build_mpfr 1}
%endif
%if "%{_build}" != "%{_host}"
-BuildRequires: rtems-4.10-sh-rtems4.10-gcc
+BuildRequires: rtems-4.10-sh-rtems4.10-gcc = %{gcc_rpmvers}
%endif
%if "%{gcc_version}" >= "4.2.0"
@@ -94,7 +101,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-newlib = %{newlib_version}-%{release}
+Requires: rtems-4.10-sh-rtems4.10-newlib = %{newlib_version}-%{newlib_release}
%if "%{gcc_version}" >= "3.4"
@@ -423,7 +430,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}-%{release}
+# Requires: rtems-4.10-sh-rtems4.10-newlib = %{newlib_version}-%{newlib_release}
# License: GPL
# %if %build_infos
@@ -539,7 +546,7 @@ Version: %{gcc_rpmvers}
License: GPL
%if "%{_build}" != "%{_host}"
-BuildRequires: rtems-4.10-sh-rtems4.10-gcc-c++
+BuildRequires: rtems-4.10-sh-rtems4.10-gcc-c++ = %{gcc_rpmvers}
%endif
Provides: rtems-4.10-sh-rtems4.10-c++ = %{gcc_rpmvers}-%{release}
Obsoletes: rtems-4.10-sh-rtems4.10-c++ < %{gcc_rpmvers}-%{release}
@@ -563,11 +570,7 @@ GCC c++ compiler for sh-rtems4.10.
%{gccexec}/sh-rtems4.10/%{gcc_version}/cc1plus%{_exeext}
%dir %{gcclib}/sh-rtems4.10/%{gcc_version}/include
-%if "%{gcc_version}" >= "3.2"
%{gcclib}/sh-rtems4.10/%{gcc_version}/include/c++
-%else
-%{gcclib}/sh-rtems4.10/%{gcc_version}/include/g++
-%endif
@@ -579,9 +582,7 @@ Summary: C Library (newlib) for sh-rtems4.10
Group: Development/Tools
License: Distributable
Version: %{newlib_version}
-
-Provides: rtems-4.10-sh-rtems4.10-libc = %{newlib_version}-%{release}
-Obsoletes: rtems-4.10-sh-rtems4.10-libc < %{newlib_version}-%{release}
+Release: %{newlib_release}
Requires: rtems-4.10-newlib-common
@@ -601,6 +602,7 @@ Newlib C Library for sh-rtems4.10.
Summary: Base package for RTEMS newlib C Library
Group: Development/Tools
Version: %{newlib_version}
+Release: %{newlib_release}
License: Distributable
Requires(post): /sbin/install-info
diff --git a/contrib/crossrpms/rtems4.10/sparc/Makefile.am b/contrib/crossrpms/rtems4.10/sparc/Makefile.am
index 75eed75545..f893eada01 100644
--- a/contrib/crossrpms/rtems4.10/sparc/Makefile.am
+++ b/contrib/crossrpms/rtems4.10/sparc/Makefile.am
@@ -10,12 +10,12 @@ BINUTILS_RPMREL = 2%{?dist}
include ../binutils.am
BINUTILS_OPTS +=
-GCC_VERS = 4.3.2
+GCC_VERS = 4.3.3
GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 21%{?dist}
+GCC_RPMREL = 1%{?dist}
NEWLIB_VERS = 1.17.0
NEWLIB_PKGVERS = $(NEWLIB_VERS)
-NEWLIB_RPMREL = $(GCC_RPMREL)
+NEWLIB_RPMREL = 22%{?dist}
include ../gcc.am
GCC_OPTS += --languages=cxx
diff --git a/contrib/crossrpms/rtems4.10/sparc/gcc-sources.add b/contrib/crossrpms/rtems4.10/sparc/gcc-sources.add
index 1364439588..bbf24fd44f 100644
--- a/contrib/crossrpms/rtems4.10/sparc/gcc-sources.add
+++ b/contrib/crossrpms/rtems4.10/sparc/gcc-sources.add
@@ -2,6 +2,10 @@
Source0: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.3.2-rtems4.10-20081205.diff
%endif
+%if "%{gcc_version}" == "4.3.3"
+Source0: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
+Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.3.3-rtems4.10-20090125.diff
+%endif
%{?_without_sources:NoSource: 0}
%if %build_cxx
diff --git a/contrib/crossrpms/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-binutils.spec b/contrib/crossrpms/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-binutils.spec
index d7c5d4d854..8e363d3130 100644
--- a/contrib/crossrpms/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-binutils.spec
+++ b/contrib/crossrpms/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-binutils.spec
@@ -21,14 +21,22 @@
%ifos cygwin cygwin32 mingw mingw32
%define _exeext .exe
-%define debug_package %{nil}
+%define debug_package %{nil}
+%define _libdir %{_exec_prefix}/lib
%else
%define _exeext %{nil}
%endif
%ifos cygwin cygwin32
%define optflags -O3 -pipe -march=i486 -funroll-loops
-%define _libdir %{_exec_prefix}/lib
+%endif
+
+%ifos mingw mingw32
+%if %{defined _mingw32_cflags}
+%define optflags %{_mingw32_cflags}
+%else
+%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
+%endif
%endif
%if "%{_build}" != "%{_host}"
diff --git a/contrib/crossrpms/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-cpukit.spec b/contrib/crossrpms/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-cpukit.spec
index a10862a0ce..cbf5c84949 100644
--- a/contrib/crossrpms/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-cpukit.spec
+++ b/contrib/crossrpms/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-cpukit.spec
@@ -21,14 +21,22 @@
%ifos cygwin cygwin32 mingw mingw32
%define _exeext .exe
-%define debug_package %{nil}
+%define debug_package %{nil}
+%define _libdir %{_exec_prefix}/lib
%else
%define _exeext %{nil}
%endif
%ifos cygwin cygwin32
%define optflags -O3 -pipe -march=i486 -funroll-loops
-%define _libdir %{_exec_prefix}/lib
+%endif
+
+%ifos mingw mingw32
+%if %{defined _mingw32_cflags}
+%define optflags %{_mingw32_cflags}
+%else
+%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
+%endif
%endif
%if "%{_build}" != "%{_host}"
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 fa60720baf..b9af49a357 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
@@ -21,14 +21,22 @@
%ifos cygwin cygwin32 mingw mingw32
%define _exeext .exe
-%define debug_package %{nil}
+%define debug_package %{nil}
+%define _libdir %{_exec_prefix}/lib
%else
%define _exeext %{nil}
%endif
%ifos cygwin cygwin32
%define optflags -O3 -pipe -march=i486 -funroll-loops
-%define _libdir %{_exec_prefix}/lib
+%endif
+
+%ifos mingw mingw32
+%if %{defined _mingw32_cflags}
+%define optflags %{_mingw32_cflags}
+%else
+%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
+%endif
%endif
%if "%{_build}" != "%{_host}"
@@ -38,13 +46,13 @@
%endif
-%define gcc_pkgvers 4.3.2
-%define gcc_version 4.3.2
-%define gcc_rpmvers %{expand:%(echo "4.3.2" | tr - _ )}
+%define gcc_pkgvers 4.3.3
+%define gcc_version 4.3.3
+%define gcc_rpmvers %{expand:%(echo "4.3.3" | tr - _ )}
%define newlib_pkgvers 1.17.0
%define newlib_version 1.17.0
-%define gccnewlib_version gcc%{gcc_version}newlib%{newlib_version}
+%define newlib_release 22%{?dist}
%define mpfr_version 2.3.1
@@ -53,7 +61,7 @@ Summary: sparc-rtems4.10 gcc
Group: Development/Tools
Version: %{gcc_rpmvers}
-Release: 20%{?dist}
+Release: 1%{?dist}
License: GPL
URL: http://gcc.gnu.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -76,12 +84,11 @@ BuildRequires: mpfr-devel >= 2.3.0
%endif
# These distros ship an insufficient mpfr
%{?el4:%define _build_mpfr 1}
-%{?suse10_2:%define _build_mpfr 1}
%{?suse10_3:%define _build_mpfr 1}
%endif
%if "%{_build}" != "%{_host}"
-BuildRequires: rtems-4.10-sparc-rtems4.10-gcc
+BuildRequires: rtems-4.10-sparc-rtems4.10-gcc = %{gcc_rpmvers}
%endif
%if "%{gcc_version}" >= "4.2.0"
@@ -94,7 +101,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-newlib = %{newlib_version}-%{release}
+Requires: rtems-4.10-sparc-rtems4.10-newlib = %{newlib_version}-%{newlib_release}
%if "%{gcc_version}" >= "3.4"
@@ -109,11 +116,18 @@ Requires: rtems-4.10-sparc-rtems4.10-newlib = %{newlib_version}-%{release}
Source0: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.3.2-rtems4.10-20081205.diff
%endif
+%if "%{gcc_version}" == "4.3.3"
+Source0: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
+Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.3.3-rtems4.10-20090125.diff
+%endif
%{?_without_sources:NoSource: 0}
%if "%{gcc_version}" == "4.3.2"
Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
%endif
+%if "%{gcc_version}" == "4.3.3"
+Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
+%endif
%{?_without_sources:NoSource: 1}
%if "%{newlib_version}" == "1.17.0"
@@ -423,7 +437,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}-%{release}
+# Requires: rtems-4.10-sparc-rtems4.10-newlib = %{newlib_version}-%{newlib_release}
# License: GPL
# %if %build_infos
@@ -539,7 +553,7 @@ Version: %{gcc_rpmvers}
License: GPL
%if "%{_build}" != "%{_host}"
-BuildRequires: rtems-4.10-sparc-rtems4.10-gcc-c++
+BuildRequires: rtems-4.10-sparc-rtems4.10-gcc-c++ = %{gcc_rpmvers}
%endif
Provides: rtems-4.10-sparc-rtems4.10-c++ = %{gcc_rpmvers}-%{release}
Obsoletes: rtems-4.10-sparc-rtems4.10-c++ < %{gcc_rpmvers}-%{release}
@@ -563,11 +577,7 @@ GCC c++ compiler for sparc-rtems4.10.
%{gccexec}/sparc-rtems4.10/%{gcc_version}/cc1plus%{_exeext}
%dir %{gcclib}/sparc-rtems4.10/%{gcc_version}/include
-%if "%{gcc_version}" >= "3.2"
%{gcclib}/sparc-rtems4.10/%{gcc_version}/include/c++
-%else
-%{gcclib}/sparc-rtems4.10/%{gcc_version}/include/g++
-%endif
@@ -579,9 +589,7 @@ Summary: C Library (newlib) for sparc-rtems4.10
Group: Development/Tools
License: Distributable
Version: %{newlib_version}
-
-Provides: rtems-4.10-sparc-rtems4.10-libc = %{newlib_version}-%{release}
-Obsoletes: rtems-4.10-sparc-rtems4.10-libc < %{newlib_version}-%{release}
+Release: %{newlib_release}
Requires: rtems-4.10-newlib-common
@@ -601,6 +609,7 @@ Newlib C Library for sparc-rtems4.10.
Summary: Base package for RTEMS newlib C Library
Group: Development/Tools
Version: %{newlib_version}
+Release: %{newlib_release}
License: Distributable
Requires(post): /sbin/install-info
diff --git a/contrib/crossrpms/solaris2.7/sparc/Makefile.am b/contrib/crossrpms/solaris2.7/sparc/Makefile.am
index 2a70a3db22..ee218c252d 100644
--- a/contrib/crossrpms/solaris2.7/sparc/Makefile.am
+++ b/contrib/crossrpms/solaris2.7/sparc/Makefile.am
@@ -35,7 +35,7 @@ BINUTILS_RPMREL = @VERSION@%{?dist}
include ../binutils.am
BINUTILS_OPTS +=
-GCC_VERS = 4.2.4
+GCC_VERS = 4.3.3
GCC_PKGVERS = $(GCC_VERS)
GCC_RPMREL = @VERSION@%{?dist}
include ../gcc.am