Backup.

5 files changed, 47 insertions, 15 deletions

diff --git a/contrib/crossrpms/rtems4.9/m68k/Makefile.am b/contrib/crossrpms/rtems4.9/m68k/Makefile.am
index a717c4063d..bfcc5acaaa 100644
--- a/contrib/crossrpms/rtems4.9/m68k/Makefile.am
+++ b/contrib/crossrpms/rtems4.9/m68k/Makefile.am
@@ -12,7 +12,7 @@ BINUTILS_OPTS +=
 
 GCC_VERS = 4.3.1
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 13%{?dist}
+GCC_RPMREL = 14%{?dist}
 NEWLIB_VERS = 1.16.0
 include ../gcc.am
 GCC_OPTS += --languages=cxx
diff --git a/contrib/crossrpms/rtems4.9/m68k/rtems-4.9-m68k-rtems4.9-binutils.spec b/contrib/crossrpms/rtems4.9/m68k/rtems-4.9-m68k-rtems4.9-binutils.spec
index 1054b90fad..0f1a34ff67 100644
--- a/contrib/crossrpms/rtems4.9/m68k/rtems-4.9-m68k-rtems4.9-binutils.spec
+++ b/contrib/crossrpms/rtems4.9/m68k/rtems-4.9-m68k-rtems4.9-binutils.spec
@@ -13,6 +13,18 @@
 %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
+
+%if "%{_build}" != "%{_host}"
+%define _host_rpmprefix rtems-4.9-%{_host}-
+%else
+%define _host_rpmprefix %{nil}
+%endif
+
 %define binutils_pkgvers 2.18
 %define binutils_version 2.18
 %define binutils_rpmvers %{expand:%(echo "2.18" | tr - _ )}
@@ -26,6 +38,8 @@ License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:	%{_host_rpmprefix}gcc
+
 %if "%{binutils_version}" >= "2.18"
 # Bug in bfd: Doesn't build without texinfo installed
 BuildRequires:	texinfo >= 4.2
@@ -56,12 +70,16 @@ cd binutils-%{binutils_pkgvers}
 cd ..
 
 %build
+  export PATH="%{_bindir}:${PATH}"
 %if "m68k-rtems4.9" == "i686-pc-cygwin"
 # The cygwin sources are leaking memory
   RPM_OPT_FLAGS="$(echo "$RPM_OPT_FLAGS"|sed -e 's; -Wp,-D_FORTIFY_SOURCE=2;;')"
 %endif
   mkdir -p build
   cd build
+%if "%{_build}" != "%{_host}"
+  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
+%endif
   CFLAGS="$RPM_OPT_FLAGS" \
   ../binutils-%{binutils_pkgvers}/configure \
     --build=%_build --host=%_host \
@@ -80,6 +98,7 @@ cd ..
   cd ..
 
 %install
+  export PATH="%{_bindir}:${PATH}"
   rm -rf $RPM_BUILD_ROOT
 
   cd build
@@ -161,7 +180,6 @@ sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
 # %endif
 
 %description -n rtems-4.9-m68k-rtems4.9-binutils
-
 GNU binutils targetting m68k-rtems4.9.
 
 %files -n rtems-4.9-m68k-rtems4.9-binutils
diff --git a/contrib/crossrpms/rtems4.9/m68k/rtems-4.9-m68k-rtems4.9-cpukit.spec b/contrib/crossrpms/rtems4.9/m68k/rtems-4.9-m68k-rtems4.9-cpukit.spec
index abeeeda635..615019f8a8 100644
--- a/contrib/crossrpms/rtems4.9/m68k/rtems-4.9-m68k-rtems4.9-cpukit.spec
+++ b/contrib/crossrpms/rtems4.9/m68k/rtems-4.9-m68k-rtems4.9-cpukit.spec
@@ -13,6 +13,18 @@
 %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
+
+%if "%{_build}" != "%{_host}"
+%define _host_rpmprefix rtems-4.9-%{_host}-
+%else
+%define _host_rpmprefix %{nil}
+%endif
+
 
 %define cpukit_pkgvers 4.7.99.1-20070510
 %define cpukit_version 4.7.99.1
diff --git a/contrib/crossrpms/rtems4.9/m68k/rtems-4.9-m68k-rtems4.9-gcc.spec b/contrib/crossrpms/rtems4.9/m68k/rtems-4.9-m68k-rtems4.9-gcc.spec
index cf09b93420..393d35022f 100644
--- a/contrib/crossrpms/rtems4.9/m68k/rtems-4.9-m68k-rtems4.9-gcc.spec
+++ b/contrib/crossrpms/rtems4.9/m68k/rtems-4.9-m68k-rtems4.9-gcc.spec
@@ -26,9 +26,9 @@
 %endif
 
 
-%define gcc_pkgvers 4.3.0
-%define gcc_version 4.3.0
-%define gcc_rpmvers %{expand:%(echo "4.3.0" | tr - _ )}
+%define gcc_pkgvers 4.3.1
+%define gcc_version 4.3.1
+%define gcc_rpmvers %{expand:%(echo "4.3.1" | tr - _ )}
 
 %define newlib_version		1.16.0
 %define gccnewlib_version	gcc%{gcc_version}newlib%{newlib_version}
@@ -40,7 +40,7 @@ Summary:      	m68k-rtems4.9 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	12%{?dist}
+Release:      	14%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -55,7 +55,7 @@ BuildRequires:  gmp-devel >= 4.1
 BuildRequires:  %{_host_rpmprefix}gmp-devel
 BuildRequires:  %{_host_rpmprefix}mpfr-devel
 %endif
-%if "%{?fedora}" >= "8"
+%if 0%{?fedora} >= 8
 BuildRequires:  mpfr-devel >= 2.3.0
 %endif
 %if "%{?suse}" > "10.3"
@@ -92,21 +92,21 @@ Requires:	rtems-4.9-m68k-rtems4.9-newlib = %{newlib_version}-%{release}
 %define gccexec %{_libdir}/gcc-lib
 %endif
 
-%if "%{gcc_version}" == "4.3.0"
+%if "%{gcc_version}" == "4.3.1"
 Source0:	ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		gcc-core-%{gcc_pkgvers}-rtems4.9-20080501.diff
+Patch0:		gcc-core-4.3.1-rtems4.9-20080609.diff
 %endif
-%if "%{gcc_version}" == "4.2.3"
+%if "%{gcc_version}" == "4.3.0"
 Source0:	ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		gcc-core-4.2.3-rtems4.9-20080205.diff
+Patch0:		gcc-core-4.3.0-rtems4.9-20080501.diff
 %endif
 %{?_without_sources:NoSource:	0}
 
-%if "%{gcc_version}" == "4.3.0" 
+%if "%{gcc_version}" == "4.3.1" 
 Source1:        ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
 %endif
-%if  "%{gcc_version}" == "4.2.3"
-Source1: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
+%if "%{gcc_version}" == "4.3.0" 
+Source1:        ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
 %endif
 %{?_without_sources:NoSource:	1}
 
diff --git a/contrib/crossrpms/rtems4.9/m68k/rtems-4.9-m68k-rtems4.9-gdb.spec b/contrib/crossrpms/rtems4.9/m68k/rtems-4.9-m68k-rtems4.9-gdb.spec
index 8d03ee74a9..6b1f4da4ed 100644
--- a/contrib/crossrpms/rtems4.9/m68k/rtems-4.9-m68k-rtems4.9-gdb.spec
+++ b/contrib/crossrpms/rtems4.9/m68k/rtems-4.9-m68k-rtems4.9-gdb.spec
@@ -104,8 +104,10 @@ rm -f gdb-%{gdb_version}/readline/configure
     --disable-win32-registry \
     --disable-werror \
     --enable-sim \
-%if "%{gdb_version}" >= "6.6"
+%if "%{gdb_version}" >= "6.7"
     --with-system-readline \
+%endif
+%if "%{gdb_version}" >= "6.6"
     --with-expat \
 %endif
     --prefix=%{_prefix} --bindir=%{_bindir} \