regenerate

22 files changed, 22 insertions, 385 deletions

diff --git a/contrib/crossrpms/rtems4.9/arm/rtems-4.9-arm-rtems4.9-binutils.spec b/contrib/crossrpms/rtems4.9/arm/rtems-4.9-arm-rtems4.9-binutils.spec
index 89f2cf57af..76164fd2f1 100644
--- a/contrib/crossrpms/rtems4.9/arm/rtems-4.9-arm-rtems4.9-binutils.spec
+++ b/contrib/crossrpms/rtems4.9/arm/rtems-4.9-arm-rtems4.9-binutils.spec
@@ -21,7 +21,7 @@ Name:		rtems-4.9-arm-rtems4.9-binutils
 Summary:	Binutils for target arm-rtems4.9
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -36,11 +36,8 @@ Requires:	rtems-4.9-binutils-common
 
 Source0:	ftp://ftp.gnu.org/pub/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
 %{?_without_sources:NoSource:	0}
-%if "%{binutils_version}" == "2.17"
-Patch0:		binutils-2.17-rtems4.8-20061021.diff
-%endif
 %if "%{binutils_version}" == "2.17.90"
-Patch0:		binutils-2.17.90-rtems4.8-20070807.diff
+Patch0:		binutils-2.18-rtems4.9-20071104.diff
 %endif
 
 %description
diff --git a/contrib/crossrpms/rtems4.9/arm/rtems-4.9-arm-rtems4.9-gdb.spec b/contrib/crossrpms/rtems4.9/arm/rtems-4.9-arm-rtems4.9-gdb.spec
index 0acbdff6b8..d2630aa951 100644
--- a/contrib/crossrpms/rtems4.9/arm/rtems-4.9-arm-rtems4.9-gdb.spec
+++ b/contrib/crossrpms/rtems4.9/arm/rtems-4.9-arm-rtems4.9-gdb.spec
@@ -102,25 +102,7 @@ cd ..
   rm -rf $RPM_BUILD_ROOT
 
   cd build
-%if "%{gdb_version}" >= "6.3"
   make DESTDIR=$RPM_BUILD_ROOT install
-%else
-  make prefix=$RPM_BUILD_ROOT%{_prefix} \
-    bindir=$RPM_BUILD_ROOT%{_bindir} \
-    includedir=$RPM_BUILD_ROOT%{_includedir} \
-    libdir=$RPM_BUILD_ROOT%{_libdir} \
-    infodir=$RPM_BUILD_ROOT%{_infodir} \
-    mandir=$RPM_BUILD_ROOT%{_mandir} \
-    install
-
-  make prefix=$RPM_BUILD_ROOT%{_prefix} \
-    bindir=$RPM_BUILD_ROOT%{_bindir} \
-    includedir=$RPM_BUILD_ROOT%{_includedir} \
-    libdir=$RPM_BUILD_ROOT%{_libdir} \
-    infodir=$RPM_BUILD_ROOT%{_infodir} \
-    mandir=$RPM_BUILD_ROOT%{_mandir} \
-    install-info
-%endif
 
   rm -f $RPM_BUILD_ROOT%{_infodir}/dir
   touch $RPM_BUILD_ROOT%{_infodir}/dir
@@ -133,10 +115,8 @@ cd ..
 # We don't ship host files
   rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
 
-%if "%{gdb_version}" >= "6.4"
 # host library, installed to a bogus directory
   rm -f ${RPM_BUILD_ROOT}%{_libdir}/libarm-rtems4.9-sim.a
-%endif
 
   cd ..
 
@@ -209,9 +189,6 @@ GDB files shared by all targets.
 
 %post -n rtems-4.9-gdb-common
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-%if "%{gdb_version}" < "6.3"
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/mmalloc.info.gz || :
-%endif
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
@@ -219,9 +196,6 @@ GDB files shared by all targets.
 %preun -n rtems-4.9-gdb-common
 if [ $1 -eq 0 ]; then
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-%if "%{gdb_version}" < "6.3"
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/mmalloc.info.gz || :
-%endif
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
@@ -233,10 +207,6 @@ fi
 %ghost %{_infodir}/dir
 %{_infodir}/gdb.info*
 
-# FIXME: When had mmalloc.info been removed?
-%if "%{gdb_version}" < "6.3"
-%{_infodir}/mmalloc.info*
-%endif
 %{_infodir}/gdbint.info*
 %{_infodir}/stabs.info*
 %{_infodir}/annotate.info*
diff --git a/contrib/crossrpms/rtems4.9/avr/rtems-4.9-avr-rtems4.9-binutils.spec b/contrib/crossrpms/rtems4.9/avr/rtems-4.9-avr-rtems4.9-binutils.spec
index 8007898f0c..879dad8aac 100644
--- a/contrib/crossrpms/rtems4.9/avr/rtems-4.9-avr-rtems4.9-binutils.spec
+++ b/contrib/crossrpms/rtems4.9/avr/rtems-4.9-avr-rtems4.9-binutils.spec
@@ -21,7 +21,7 @@ Name:		rtems-4.9-avr-rtems4.9-binutils
 Summary:	Binutils for target avr-rtems4.9
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -36,11 +36,8 @@ Requires:	rtems-4.9-binutils-common
 
 Source0:	ftp://ftp.gnu.org/pub/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
 %{?_without_sources:NoSource:	0}
-%if "%{binutils_version}" == "2.17"
-Patch0:		binutils-2.17-rtems4.8-20061021.diff
-%endif
 %if "%{binutils_version}" == "2.17.90"
-Patch0:		binutils-2.17.90-rtems4.8-20070807.diff
+Patch0:		binutils-2.18-rtems4.9-20071104.diff
 %endif
 
 %description
diff --git a/contrib/crossrpms/rtems4.9/avr/rtems-4.9-avr-rtems4.9-gdb.spec b/contrib/crossrpms/rtems4.9/avr/rtems-4.9-avr-rtems4.9-gdb.spec
index a5445c0d77..7a44414699 100644
--- a/contrib/crossrpms/rtems4.9/avr/rtems-4.9-avr-rtems4.9-gdb.spec
+++ b/contrib/crossrpms/rtems4.9/avr/rtems-4.9-avr-rtems4.9-gdb.spec
@@ -102,25 +102,7 @@ cd ..
   rm -rf $RPM_BUILD_ROOT
 
   cd build
-%if "%{gdb_version}" >= "6.3"
   make DESTDIR=$RPM_BUILD_ROOT install
-%else
-  make prefix=$RPM_BUILD_ROOT%{_prefix} \
-    bindir=$RPM_BUILD_ROOT%{_bindir} \
-    includedir=$RPM_BUILD_ROOT%{_includedir} \
-    libdir=$RPM_BUILD_ROOT%{_libdir} \
-    infodir=$RPM_BUILD_ROOT%{_infodir} \
-    mandir=$RPM_BUILD_ROOT%{_mandir} \
-    install
-
-  make prefix=$RPM_BUILD_ROOT%{_prefix} \
-    bindir=$RPM_BUILD_ROOT%{_bindir} \
-    includedir=$RPM_BUILD_ROOT%{_includedir} \
-    libdir=$RPM_BUILD_ROOT%{_libdir} \
-    infodir=$RPM_BUILD_ROOT%{_infodir} \
-    mandir=$RPM_BUILD_ROOT%{_mandir} \
-    install-info
-%endif
 
   rm -f $RPM_BUILD_ROOT%{_infodir}/dir
   touch $RPM_BUILD_ROOT%{_infodir}/dir
@@ -133,10 +115,8 @@ cd ..
 # We don't ship host files
   rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
 
-%if "%{gdb_version}" >= "6.4"
 # host library, installed to a bogus directory
   rm -f ${RPM_BUILD_ROOT}%{_libdir}/libavr-rtems4.9-sim.a
-%endif
 
   cd ..
 
@@ -209,9 +189,6 @@ GDB files shared by all targets.
 
 %post -n rtems-4.9-gdb-common
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-%if "%{gdb_version}" < "6.3"
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/mmalloc.info.gz || :
-%endif
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
@@ -219,9 +196,6 @@ GDB files shared by all targets.
 %preun -n rtems-4.9-gdb-common
 if [ $1 -eq 0 ]; then
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-%if "%{gdb_version}" < "6.3"
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/mmalloc.info.gz || :
-%endif
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
@@ -233,10 +207,6 @@ fi
 %ghost %{_infodir}/dir
 %{_infodir}/gdb.info*
 
-# FIXME: When had mmalloc.info been removed?
-%if "%{gdb_version}" < "6.3"
-%{_infodir}/mmalloc.info*
-%endif
 %{_infodir}/gdbint.info*
 %{_infodir}/stabs.info*
 %{_infodir}/annotate.info*
diff --git a/contrib/crossrpms/rtems4.9/bfin/rtems-4.9-bfin-rtems4.9-binutils.spec b/contrib/crossrpms/rtems4.9/bfin/rtems-4.9-bfin-rtems4.9-binutils.spec
index 62ad27df82..6da3c54f7d 100644
--- a/contrib/crossrpms/rtems4.9/bfin/rtems-4.9-bfin-rtems4.9-binutils.spec
+++ b/contrib/crossrpms/rtems4.9/bfin/rtems-4.9-bfin-rtems4.9-binutils.spec
@@ -21,7 +21,7 @@ Name:		rtems-4.9-bfin-rtems4.9-binutils
 Summary:	Binutils for target bfin-rtems4.9
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -36,11 +36,8 @@ Requires:	rtems-4.9-binutils-common
 
 Source0:	ftp://ftp.gnu.org/pub/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
 %{?_without_sources:NoSource:	0}
-%if "%{binutils_version}" == "2.17"
-Patch0:		binutils-2.17-rtems4.8-20061021.diff
-%endif
 %if "%{binutils_version}" == "2.17.90"
-Patch0:		binutils-2.17.90-rtems4.8-20070807.diff
+Patch0:		binutils-2.18-rtems4.9-20071104.diff
 %endif
 
 %description
diff --git a/contrib/crossrpms/rtems4.9/bfin/rtems-4.9-bfin-rtems4.9-gdb.spec b/contrib/crossrpms/rtems4.9/bfin/rtems-4.9-bfin-rtems4.9-gdb.spec
index 62fe2f9cf9..7f233c9a03 100644
--- a/contrib/crossrpms/rtems4.9/bfin/rtems-4.9-bfin-rtems4.9-gdb.spec
+++ b/contrib/crossrpms/rtems4.9/bfin/rtems-4.9-bfin-rtems4.9-gdb.spec
@@ -91,25 +91,7 @@ cd ..
   rm -rf $RPM_BUILD_ROOT
 
   cd build
-%if "%{gdb_version}" >= "6.3"
   make DESTDIR=$RPM_BUILD_ROOT install
-%else
-  make prefix=$RPM_BUILD_ROOT%{_prefix} \
-    bindir=$RPM_BUILD_ROOT%{_bindir} \
-    includedir=$RPM_BUILD_ROOT%{_includedir} \
-    libdir=$RPM_BUILD_ROOT%{_libdir} \
-    infodir=$RPM_BUILD_ROOT%{_infodir} \
-    mandir=$RPM_BUILD_ROOT%{_mandir} \
-    install
-
-  make prefix=$RPM_BUILD_ROOT%{_prefix} \
-    bindir=$RPM_BUILD_ROOT%{_bindir} \
-    includedir=$RPM_BUILD_ROOT%{_includedir} \
-    libdir=$RPM_BUILD_ROOT%{_libdir} \
-    infodir=$RPM_BUILD_ROOT%{_infodir} \
-    mandir=$RPM_BUILD_ROOT%{_mandir} \
-    install-info
-%endif
 
   rm -f $RPM_BUILD_ROOT%{_infodir}/dir
   touch $RPM_BUILD_ROOT%{_infodir}/dir
@@ -122,10 +104,8 @@ cd ..
 # We don't ship host files
   rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
 
-%if "%{gdb_version}" >= "6.4"
 # host library, installed to a bogus directory
   rm -f ${RPM_BUILD_ROOT}%{_libdir}/libbfin-rtems4.9-sim.a
-%endif
 
   cd ..
 
@@ -198,9 +178,6 @@ GDB files shared by all targets.
 
 %post -n rtems-4.9-gdb-common
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-%if "%{gdb_version}" < "6.3"
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/mmalloc.info.gz || :
-%endif
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
@@ -208,9 +185,6 @@ GDB files shared by all targets.
 %preun -n rtems-4.9-gdb-common
 if [ $1 -eq 0 ]; then
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-%if "%{gdb_version}" < "6.3"
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/mmalloc.info.gz || :
-%endif
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
@@ -222,10 +196,6 @@ fi
 %ghost %{_infodir}/dir
 %{_infodir}/gdb.info*
 
-# FIXME: When had mmalloc.info been removed?
-%if "%{gdb_version}" < "6.3"
-%{_infodir}/mmalloc.info*
-%endif
 %{_infodir}/gdbint.info*
 %{_infodir}/stabs.info*
 %{_infodir}/annotate.info*
diff --git a/contrib/crossrpms/rtems4.9/h8300/rtems-4.9-h8300-rtems4.9-binutils.spec b/contrib/crossrpms/rtems4.9/h8300/rtems-4.9-h8300-rtems4.9-binutils.spec
index aa44314784..39c557a5b7 100644
--- a/contrib/crossrpms/rtems4.9/h8300/rtems-4.9-h8300-rtems4.9-binutils.spec
+++ b/contrib/crossrpms/rtems4.9/h8300/rtems-4.9-h8300-rtems4.9-binutils.spec
@@ -21,7 +21,7 @@ Name:		rtems-4.9-h8300-rtems4.9-binutils
 Summary:	Binutils for target h8300-rtems4.9
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -36,11 +36,8 @@ Requires:	rtems-4.9-binutils-common
 
 Source0:	ftp://ftp.gnu.org/pub/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
 %{?_without_sources:NoSource:	0}
-%if "%{binutils_version}" == "2.17"
-Patch0:		binutils-2.17-rtems4.8-20061021.diff
-%endif
 %if "%{binutils_version}" == "2.17.90"
-Patch0:		binutils-2.17.90-rtems4.8-20070807.diff
+Patch0:		binutils-2.18-rtems4.9-20071104.diff
 %endif
 
 %description
diff --git a/contrib/crossrpms/rtems4.9/h8300/rtems-4.9-h8300-rtems4.9-gdb.spec b/contrib/crossrpms/rtems4.9/h8300/rtems-4.9-h8300-rtems4.9-gdb.spec
index b0b653f374..74348e670f 100644
--- a/contrib/crossrpms/rtems4.9/h8300/rtems-4.9-h8300-rtems4.9-gdb.spec
+++ b/contrib/crossrpms/rtems4.9/h8300/rtems-4.9-h8300-rtems4.9-gdb.spec
@@ -102,25 +102,7 @@ cd ..
   rm -rf $RPM_BUILD_ROOT
 
   cd build
-%if "%{gdb_version}" >= "6.3"
   make DESTDIR=$RPM_BUILD_ROOT install
-%else
-  make prefix=$RPM_BUILD_ROOT%{_prefix} \
-    bindir=$RPM_BUILD_ROOT%{_bindir} \
-    includedir=$RPM_BUILD_ROOT%{_includedir} \
-    libdir=$RPM_BUILD_ROOT%{_libdir} \
-    infodir=$RPM_BUILD_ROOT%{_infodir} \
-    mandir=$RPM_BUILD_ROOT%{_mandir} \
-    install
-
-  make prefix=$RPM_BUILD_ROOT%{_prefix} \
-    bindir=$RPM_BUILD_ROOT%{_bindir} \
-    includedir=$RPM_BUILD_ROOT%{_includedir} \
-    libdir=$RPM_BUILD_ROOT%{_libdir} \
-    infodir=$RPM_BUILD_ROOT%{_infodir} \
-    mandir=$RPM_BUILD_ROOT%{_mandir} \
-    install-info
-%endif
 
   rm -f $RPM_BUILD_ROOT%{_infodir}/dir
   touch $RPM_BUILD_ROOT%{_infodir}/dir
@@ -133,10 +115,8 @@ cd ..
 # We don't ship host files
   rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
 
-%if "%{gdb_version}" >= "6.4"
 # host library, installed to a bogus directory
   rm -f ${RPM_BUILD_ROOT}%{_libdir}/libh8300-rtems4.9-sim.a
-%endif
 
   cd ..
 
@@ -209,9 +189,6 @@ GDB files shared by all targets.
 
 %post -n rtems-4.9-gdb-common
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-%if "%{gdb_version}" < "6.3"
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/mmalloc.info.gz || :
-%endif
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
@@ -219,9 +196,6 @@ GDB files shared by all targets.
 %preun -n rtems-4.9-gdb-common
 if [ $1 -eq 0 ]; then
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-%if "%{gdb_version}" < "6.3"
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/mmalloc.info.gz || :
-%endif
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
@@ -233,10 +207,6 @@ fi
 %ghost %{_infodir}/dir
 %{_infodir}/gdb.info*
 
-# FIXME: When had mmalloc.info been removed?
-%if "%{gdb_version}" < "6.3"
-%{_infodir}/mmalloc.info*
-%endif
 %{_infodir}/gdbint.info*
 %{_infodir}/stabs.info*
 %{_infodir}/annotate.info*
diff --git a/contrib/crossrpms/rtems4.9/i386/rtems-4.9-i386-rtems4.9-binutils.spec b/contrib/crossrpms/rtems4.9/i386/rtems-4.9-i386-rtems4.9-binutils.spec
index 9f2d01e8ec..88f60f9d11 100644
--- a/contrib/crossrpms/rtems4.9/i386/rtems-4.9-i386-rtems4.9-binutils.spec
+++ b/contrib/crossrpms/rtems4.9/i386/rtems-4.9-i386-rtems4.9-binutils.spec
@@ -21,7 +21,7 @@ Name:		rtems-4.9-i386-rtems4.9-binutils
 Summary:	Binutils for target i386-rtems4.9
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -36,11 +36,8 @@ Requires:	rtems-4.9-binutils-common
 
 Source0:	ftp://ftp.gnu.org/pub/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
 %{?_without_sources:NoSource:	0}
-%if "%{binutils_version}" == "2.17"
-Patch0:		binutils-2.17-rtems4.8-20061021.diff
-%endif
 %if "%{binutils_version}" == "2.17.90"
-Patch0:		binutils-2.17.90-rtems4.8-20070807.diff
+Patch0:		binutils-2.18-rtems4.9-20071104.diff
 %endif
 
 %description
diff --git a/contrib/crossrpms/rtems4.9/i386/rtems-4.9-i386-rtems4.9-gdb.spec b/contrib/crossrpms/rtems4.9/i386/rtems-4.9-i386-rtems4.9-gdb.spec
index f86bc316bc..5019fb0d03 100644
--- a/contrib/crossrpms/rtems4.9/i386/rtems-4.9-i386-rtems4.9-gdb.spec
+++ b/contrib/crossrpms/rtems4.9/i386/rtems-4.9-i386-rtems4.9-gdb.spec
@@ -102,25 +102,7 @@ cd ..
   rm -rf $RPM_BUILD_ROOT
 
   cd build
-%if "%{gdb_version}" >= "6.3"
   make DESTDIR=$RPM_BUILD_ROOT install
-%else
-  make prefix=$RPM_BUILD_ROOT%{_prefix} \
-    bindir=$RPM_BUILD_ROOT%{_bindir} \
-    includedir=$RPM_BUILD_ROOT%{_includedir} \
-    libdir=$RPM_BUILD_ROOT%{_libdir} \
-    infodir=$RPM_BUILD_ROOT%{_infodir} \
-    mandir=$RPM_BUILD_ROOT%{_mandir} \
-    install
-
-  make prefix=$RPM_BUILD_ROOT%{_prefix} \
-    bindir=$RPM_BUILD_ROOT%{_bindir} \
-    includedir=$RPM_BUILD_ROOT%{_includedir} \
-    libdir=$RPM_BUILD_ROOT%{_libdir} \
-    infodir=$RPM_BUILD_ROOT%{_infodir} \
-    mandir=$RPM_BUILD_ROOT%{_mandir} \
-    install-info
-%endif
 
   rm -f $RPM_BUILD_ROOT%{_infodir}/dir
   touch $RPM_BUILD_ROOT%{_infodir}/dir
@@ -133,10 +115,8 @@ cd ..
 # We don't ship host files
   rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
 
-%if "%{gdb_version}" >= "6.4"
 # host library, installed to a bogus directory
   rm -f ${RPM_BUILD_ROOT}%{_libdir}/libi386-rtems4.9-sim.a
-%endif
 
   cd ..
 
@@ -209,9 +189,6 @@ GDB files shared by all targets.
 
 %post -n rtems-4.9-gdb-common
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-%if "%{gdb_version}" < "6.3"
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/mmalloc.info.gz || :
-%endif
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
@@ -219,9 +196,6 @@ GDB files shared by all targets.
 %preun -n rtems-4.9-gdb-common
 if [ $1 -eq 0 ]; then
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-%if "%{gdb_version}" < "6.3"
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/mmalloc.info.gz || :
-%endif
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
@@ -233,10 +207,6 @@ fi
 %ghost %{_infodir}/dir
 %{_infodir}/gdb.info*
 
-# FIXME: When had mmalloc.info been removed?
-%if "%{gdb_version}" < "6.3"
-%{_infodir}/mmalloc.info*
-%endif
 %{_infodir}/gdbint.info*
 %{_infodir}/stabs.info*
 %{_infodir}/annotate.info*
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 58ac1d30cb..d74a7d9255 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
@@ -21,7 +21,7 @@ Name:		rtems-4.9-m68k-rtems4.9-binutils
 Summary:	Binutils for target m68k-rtems4.9
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -36,11 +36,8 @@ Requires:	rtems-4.9-binutils-common
 
 Source0:	ftp://ftp.gnu.org/pub/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
 %{?_without_sources:NoSource:	0}
-%if "%{binutils_version}" == "2.17"
-Patch0:		binutils-2.17-rtems4.8-20061021.diff
-%endif
 %if "%{binutils_version}" == "2.17.90"
-Patch0:		binutils-2.17.90-rtems4.8-20070807.diff
+Patch0:		binutils-2.18-rtems4.9-20071104.diff
 %endif
 
 %description
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 6e6e444865..9c896a8385 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
@@ -102,25 +102,7 @@ cd ..
   rm -rf $RPM_BUILD_ROOT
 
   cd build
-%if "%{gdb_version}" >= "6.3"
   make DESTDIR=$RPM_BUILD_ROOT install
-%else
-  make prefix=$RPM_BUILD_ROOT%{_prefix} \
-    bindir=$RPM_BUILD_ROOT%{_bindir} \
-    includedir=$RPM_BUILD_ROOT%{_includedir} \
-    libdir=$RPM_BUILD_ROOT%{_libdir} \
-    infodir=$RPM_BUILD_ROOT%{_infodir} \
-    mandir=$RPM_BUILD_ROOT%{_mandir} \
-    install
-
-  make prefix=$RPM_BUILD_ROOT%{_prefix} \
-    bindir=$RPM_BUILD_ROOT%{_bindir} \
-    includedir=$RPM_BUILD_ROOT%{_includedir} \
-    libdir=$RPM_BUILD_ROOT%{_libdir} \
-    infodir=$RPM_BUILD_ROOT%{_infodir} \
-    mandir=$RPM_BUILD_ROOT%{_mandir} \
-    install-info
-%endif
 
   rm -f $RPM_BUILD_ROOT%{_infodir}/dir
   touch $RPM_BUILD_ROOT%{_infodir}/dir
@@ -133,10 +115,8 @@ cd ..
 # We don't ship host files
   rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
 
-%if "%{gdb_version}" >= "6.4"
 # host library, installed to a bogus directory
   rm -f ${RPM_BUILD_ROOT}%{_libdir}/libm68k-rtems4.9-sim.a
-%endif
 
   cd ..
 
@@ -209,9 +189,6 @@ GDB files shared by all targets.
 
 %post -n rtems-4.9-gdb-common
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-%if "%{gdb_version}" < "6.3"
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/mmalloc.info.gz || :
-%endif
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
@@ -219,9 +196,6 @@ GDB files shared by all targets.
 %preun -n rtems-4.9-gdb-common
 if [ $1 -eq 0 ]; then
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-%if "%{gdb_version}" < "6.3"
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/mmalloc.info.gz || :
-%endif
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
@@ -233,10 +207,6 @@ fi
 %ghost %{_infodir}/dir
 %{_infodir}/gdb.info*
 
-# FIXME: When had mmalloc.info been removed?
-%if "%{gdb_version}" < "6.3"
-%{_infodir}/mmalloc.info*
-%endif
 %{_infodir}/gdbint.info*
 %{_infodir}/stabs.info*
 %{_infodir}/annotate.info*
diff --git a/contrib/crossrpms/rtems4.9/mips/rtems-4.9-mips-rtems4.9-binutils.spec b/contrib/crossrpms/rtems4.9/mips/rtems-4.9-mips-rtems4.9-binutils.spec
index b4f668d324..f37c99bcb6 100644
--- a/contrib/crossrpms/rtems4.9/mips/rtems-4.9-mips-rtems4.9-binutils.spec
+++ b/contrib/crossrpms/rtems4.9/mips/rtems-4.9-mips-rtems4.9-binutils.spec
@@ -21,7 +21,7 @@ Name:		rtems-4.9-mips-rtems4.9-binutils
 Summary:	Binutils for target mips-rtems4.9
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -36,11 +36,8 @@ Requires:	rtems-4.9-binutils-common
 
 Source0:	ftp://ftp.gnu.org/pub/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
 %{?_without_sources:NoSource:	0}
-%if "%{binutils_version}" == "2.17"
-Patch0:		binutils-2.17-rtems4.8-20061021.diff
-%endif
 %if "%{binutils_version}" == "2.17.90"
-Patch0:		binutils-2.17.90-rtems4.8-20070807.diff
+Patch0:		binutils-2.18-rtems4.9-20071104.diff
 %endif
 
 %description
diff --git a/contrib/crossrpms/rtems4.9/mips/rtems-4.9-mips-rtems4.9-gdb.spec b/contrib/crossrpms/rtems4.9/mips/rtems-4.9-mips-rtems4.9-gdb.spec
index c6dffba929..90af403238 100644
--- a/contrib/crossrpms/rtems4.9/mips/rtems-4.9-mips-rtems4.9-gdb.spec
+++ b/contrib/crossrpms/rtems4.9/mips/rtems-4.9-mips-rtems4.9-gdb.spec
@@ -102,25 +102,7 @@ cd ..
   rm -rf $RPM_BUILD_ROOT
 
   cd build
-%if "%{gdb_version}" >= "6.3"
   make DESTDIR=$RPM_BUILD_ROOT install
-%else
-  make prefix=$RPM_BUILD_ROOT%{_prefix} \
-    bindir=$RPM_BUILD_ROOT%{_bindir} \
-    includedir=$RPM_BUILD_ROOT%{_includedir} \
-    libdir=$RPM_BUILD_ROOT%{_libdir} \
-    infodir=$RPM_BUILD_ROOT%{_infodir} \
-    mandir=$RPM_BUILD_ROOT%{_mandir} \
-    install
-
-  make prefix=$RPM_BUILD_ROOT%{_prefix} \
-    bindir=$RPM_BUILD_ROOT%{_bindir} \
-    includedir=$RPM_BUILD_ROOT%{_includedir} \
-    libdir=$RPM_BUILD_ROOT%{_libdir} \
-    infodir=$RPM_BUILD_ROOT%{_infodir} \
-    mandir=$RPM_BUILD_ROOT%{_mandir} \
-    install-info
-%endif
 
   rm -f $RPM_BUILD_ROOT%{_infodir}/dir
   touch $RPM_BUILD_ROOT%{_infodir}/dir
@@ -133,10 +115,8 @@ cd ..
 # We don't ship host files
   rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
 
-%if "%{gdb_version}" >= "6.4"
 # host library, installed to a bogus directory
   rm -f ${RPM_BUILD_ROOT}%{_libdir}/libmips-rtems4.9-sim.a
-%endif
 
   cd ..
 
@@ -209,9 +189,6 @@ GDB files shared by all targets.
 
 %post -n rtems-4.9-gdb-common
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-%if "%{gdb_version}" < "6.3"
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/mmalloc.info.gz || :
-%endif
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
@@ -219,9 +196,6 @@ GDB files shared by all targets.
 %preun -n rtems-4.9-gdb-common
 if [ $1 -eq 0 ]; then
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-%if "%{gdb_version}" < "6.3"
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/mmalloc.info.gz || :
-%endif
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
@@ -233,10 +207,6 @@ fi
 %ghost %{_infodir}/dir
 %{_infodir}/gdb.info*
 
-# FIXME: When had mmalloc.info been removed?
-%if "%{gdb_version}" < "6.3"
-%{_infodir}/mmalloc.info*
-%endif
 %{_infodir}/gdbint.info*
 %{_infodir}/stabs.info*
 %{_infodir}/annotate.info*
diff --git a/contrib/crossrpms/rtems4.9/mipstx39/rtems-4.9-mipstx39-rtems4.9-gdb.spec b/contrib/crossrpms/rtems4.9/mipstx39/rtems-4.9-mipstx39-rtems4.9-gdb.spec
index fda92432cf..7e360a8618 100644
--- a/contrib/crossrpms/rtems4.9/mipstx39/rtems-4.9-mipstx39-rtems4.9-gdb.spec
+++ b/contrib/crossrpms/rtems4.9/mipstx39/rtems-4.9-mipstx39-rtems4.9-gdb.spec
@@ -102,25 +102,7 @@ cd ..
   rm -rf $RPM_BUILD_ROOT
 
   cd build
-%if "%{gdb_version}" >= "6.3"
   make DESTDIR=$RPM_BUILD_ROOT install
-%else
-  make prefix=$RPM_BUILD_ROOT%{_prefix} \
-    bindir=$RPM_BUILD_ROOT%{_bindir} \
-    includedir=$RPM_BUILD_ROOT%{_includedir} \
-    libdir=$RPM_BUILD_ROOT%{_libdir} \
-    infodir=$RPM_BUILD_ROOT%{_infodir} \
-    mandir=$RPM_BUILD_ROOT%{_mandir} \
-    install
-
-  make prefix=$RPM_BUILD_ROOT%{_prefix} \
-    bindir=$RPM_BUILD_ROOT%{_bindir} \
-    includedir=$RPM_BUILD_ROOT%{_includedir} \
-    libdir=$RPM_BUILD_ROOT%{_libdir} \
-    infodir=$RPM_BUILD_ROOT%{_infodir} \
-    mandir=$RPM_BUILD_ROOT%{_mandir} \
-    install-info
-%endif
 
   rm -f $RPM_BUILD_ROOT%{_infodir}/dir
   touch $RPM_BUILD_ROOT%{_infodir}/dir
@@ -133,10 +115,8 @@ cd ..
 # We don't ship host files
   rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
 
-%if "%{gdb_version}" >= "6.4"
 # host library, installed to a bogus directory
   rm -f ${RPM_BUILD_ROOT}%{_libdir}/libmipstx39-rtems4.9-sim.a
-%endif
 
   cd ..
 
@@ -209,9 +189,6 @@ GDB files shared by all targets.
 
 %post -n rtems-4.9-gdb-common
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-%if "%{gdb_version}" < "6.3"
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/mmalloc.info.gz || :
-%endif
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
@@ -219,9 +196,6 @@ GDB files shared by all targets.
 %preun -n rtems-4.9-gdb-common
 if [ $1 -eq 0 ]; then
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-%if "%{gdb_version}" < "6.3"
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/mmalloc.info.gz || :
-%endif
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
@@ -233,10 +207,6 @@ fi
 %ghost %{_infodir}/dir
 %{_infodir}/gdb.info*
 
-# FIXME: When had mmalloc.info been removed?
-%if "%{gdb_version}" < "6.3"
-%{_infodir}/mmalloc.info*
-%endif
 %{_infodir}/gdbint.info*
 %{_infodir}/stabs.info*
 %{_infodir}/annotate.info*
diff --git a/contrib/crossrpms/rtems4.9/powerpc/rtems-4.9-powerpc-rtems4.9-binutils.spec b/contrib/crossrpms/rtems4.9/powerpc/rtems-4.9-powerpc-rtems4.9-binutils.spec
index f7bda306dd..82c793b25c 100644
--- a/contrib/crossrpms/rtems4.9/powerpc/rtems-4.9-powerpc-rtems4.9-binutils.spec
+++ b/contrib/crossrpms/rtems4.9/powerpc/rtems-4.9-powerpc-rtems4.9-binutils.spec
@@ -21,7 +21,7 @@ Name:		rtems-4.9-powerpc-rtems4.9-binutils
 Summary:	Binutils for target powerpc-rtems4.9
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -36,11 +36,8 @@ Requires:	rtems-4.9-binutils-common
 
 Source0:	ftp://ftp.gnu.org/pub/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
 %{?_without_sources:NoSource:	0}
-%if "%{binutils_version}" == "2.17"
-Patch0:		binutils-2.17-rtems4.8-20061021.diff
-%endif
 %if "%{binutils_version}" == "2.17.90"
-Patch0:		binutils-2.17.90-rtems4.8-20070807.diff
+Patch0:		binutils-2.18-rtems4.9-20071104.diff
 %endif
 
 %description
diff --git a/contrib/crossrpms/rtems4.9/powerpc/rtems-4.9-powerpc-rtems4.9-gdb.spec b/contrib/crossrpms/rtems4.9/powerpc/rtems-4.9-powerpc-rtems4.9-gdb.spec
index 166467cc5d..62db682885 100644
--- a/contrib/crossrpms/rtems4.9/powerpc/rtems-4.9-powerpc-rtems4.9-gdb.spec
+++ b/contrib/crossrpms/rtems4.9/powerpc/rtems-4.9-powerpc-rtems4.9-gdb.spec
@@ -102,25 +102,7 @@ cd ..
   rm -rf $RPM_BUILD_ROOT
 
   cd build
-%if "%{gdb_version}" >= "6.3"
   make DESTDIR=$RPM_BUILD_ROOT install
-%else
-  make prefix=$RPM_BUILD_ROOT%{_prefix} \
-    bindir=$RPM_BUILD_ROOT%{_bindir} \
-    includedir=$RPM_BUILD_ROOT%{_includedir} \
-    libdir=$RPM_BUILD_ROOT%{_libdir} \
-    infodir=$RPM_BUILD_ROOT%{_infodir} \
-    mandir=$RPM_BUILD_ROOT%{_mandir} \
-    install
-
-  make prefix=$RPM_BUILD_ROOT%{_prefix} \
-    bindir=$RPM_BUILD_ROOT%{_bindir} \
-    includedir=$RPM_BUILD_ROOT%{_includedir} \
-    libdir=$RPM_BUILD_ROOT%{_libdir} \
-    infodir=$RPM_BUILD_ROOT%{_infodir} \
-    mandir=$RPM_BUILD_ROOT%{_mandir} \
-    install-info
-%endif
 
   rm -f $RPM_BUILD_ROOT%{_infodir}/dir
   touch $RPM_BUILD_ROOT%{_infodir}/dir
@@ -133,10 +115,8 @@ cd ..
 # We don't ship host files
   rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
 
-%if "%{gdb_version}" >= "6.4"
 # host library, installed to a bogus directory
   rm -f ${RPM_BUILD_ROOT}%{_libdir}/libpowerpc-rtems4.9-sim.a
-%endif
 
   cd ..
 
@@ -209,9 +189,6 @@ GDB files shared by all targets.
 
 %post -n rtems-4.9-gdb-common
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-%if "%{gdb_version}" < "6.3"
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/mmalloc.info.gz || :
-%endif
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
@@ -219,9 +196,6 @@ GDB files shared by all targets.
 %preun -n rtems-4.9-gdb-common
 if [ $1 -eq 0 ]; then
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-%if "%{gdb_version}" < "6.3"
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/mmalloc.info.gz || :
-%endif
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
@@ -233,10 +207,6 @@ fi
 %ghost %{_infodir}/dir
 %{_infodir}/gdb.info*
 
-# FIXME: When had mmalloc.info been removed?
-%if "%{gdb_version}" < "6.3"
-%{_infodir}/mmalloc.info*
-%endif
 %{_infodir}/gdbint.info*
 %{_infodir}/stabs.info*
 %{_infodir}/annotate.info*
diff --git a/contrib/crossrpms/rtems4.9/sh/rtems-4.9-sh-rtems4.9-binutils.spec b/contrib/crossrpms/rtems4.9/sh/rtems-4.9-sh-rtems4.9-binutils.spec
index 9febc5e054..9a70f9e9ce 100644
--- a/contrib/crossrpms/rtems4.9/sh/rtems-4.9-sh-rtems4.9-binutils.spec
+++ b/contrib/crossrpms/rtems4.9/sh/rtems-4.9-sh-rtems4.9-binutils.spec
@@ -21,7 +21,7 @@ Name:		rtems-4.9-sh-rtems4.9-binutils
 Summary:	Binutils for target sh-rtems4.9
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -36,11 +36,8 @@ Requires:	rtems-4.9-binutils-common
 
 Source0:	ftp://ftp.gnu.org/pub/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
 %{?_without_sources:NoSource:	0}
-%if "%{binutils_version}" == "2.17"
-Patch0:		binutils-2.17-rtems4.8-20061021.diff
-%endif
 %if "%{binutils_version}" == "2.17.90"
-Patch0:		binutils-2.17.90-rtems4.8-20070807.diff
+Patch0:		binutils-2.18-rtems4.9-20071104.diff
 %endif
 
 %description
diff --git a/contrib/crossrpms/rtems4.9/sh/rtems-4.9-sh-rtems4.9-gdb.spec b/contrib/crossrpms/rtems4.9/sh/rtems-4.9-sh-rtems4.9-gdb.spec
index f8e4d9f441..69edd4403e 100644
--- a/contrib/crossrpms/rtems4.9/sh/rtems-4.9-sh-rtems4.9-gdb.spec
+++ b/contrib/crossrpms/rtems4.9/sh/rtems-4.9-sh-rtems4.9-gdb.spec
@@ -102,25 +102,7 @@ cd ..
   rm -rf $RPM_BUILD_ROOT
 
   cd build
-%if "%{gdb_version}" >= "6.3"
   make DESTDIR=$RPM_BUILD_ROOT install
-%else
-  make prefix=$RPM_BUILD_ROOT%{_prefix} \
-    bindir=$RPM_BUILD_ROOT%{_bindir} \
-    includedir=$RPM_BUILD_ROOT%{_includedir} \
-    libdir=$RPM_BUILD_ROOT%{_libdir} \
-    infodir=$RPM_BUILD_ROOT%{_infodir} \
-    mandir=$RPM_BUILD_ROOT%{_mandir} \
-    install
-
-  make prefix=$RPM_BUILD_ROOT%{_prefix} \
-    bindir=$RPM_BUILD_ROOT%{_bindir} \
-    includedir=$RPM_BUILD_ROOT%{_includedir} \
-    libdir=$RPM_BUILD_ROOT%{_libdir} \
-    infodir=$RPM_BUILD_ROOT%{_infodir} \
-    mandir=$RPM_BUILD_ROOT%{_mandir} \
-    install-info
-%endif
 
   rm -f $RPM_BUILD_ROOT%{_infodir}/dir
   touch $RPM_BUILD_ROOT%{_infodir}/dir
@@ -133,10 +115,8 @@ cd ..
 # We don't ship host files
   rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
 
-%if "%{gdb_version}" >= "6.4"
 # host library, installed to a bogus directory
   rm -f ${RPM_BUILD_ROOT}%{_libdir}/libsh-rtems4.9-sim.a
-%endif
 
   cd ..
 
@@ -209,9 +189,6 @@ GDB files shared by all targets.
 
 %post -n rtems-4.9-gdb-common
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-%if "%{gdb_version}" < "6.3"
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/mmalloc.info.gz || :
-%endif
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
@@ -219,9 +196,6 @@ GDB files shared by all targets.
 %preun -n rtems-4.9-gdb-common
 if [ $1 -eq 0 ]; then
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-%if "%{gdb_version}" < "6.3"
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/mmalloc.info.gz || :
-%endif
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
@@ -233,10 +207,6 @@ fi
 %ghost %{_infodir}/dir
 %{_infodir}/gdb.info*
 
-# FIXME: When had mmalloc.info been removed?
-%if "%{gdb_version}" < "6.3"
-%{_infodir}/mmalloc.info*
-%endif
 %{_infodir}/gdbint.info*
 %{_infodir}/stabs.info*
 %{_infodir}/annotate.info*
diff --git a/contrib/crossrpms/rtems4.9/sparc/rtems-4.9-sparc-rtems4.9-binutils.spec b/contrib/crossrpms/rtems4.9/sparc/rtems-4.9-sparc-rtems4.9-binutils.spec
index baddf878af..a49a9bda60 100644
--- a/contrib/crossrpms/rtems4.9/sparc/rtems-4.9-sparc-rtems4.9-binutils.spec
+++ b/contrib/crossrpms/rtems4.9/sparc/rtems-4.9-sparc-rtems4.9-binutils.spec
@@ -21,7 +21,7 @@ Name:		rtems-4.9-sparc-rtems4.9-binutils
 Summary:	Binutils for target sparc-rtems4.9
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -36,11 +36,8 @@ Requires:	rtems-4.9-binutils-common
 
 Source0:	ftp://ftp.gnu.org/pub/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
 %{?_without_sources:NoSource:	0}
-%if "%{binutils_version}" == "2.17"
-Patch0:		binutils-2.17-rtems4.8-20061021.diff
-%endif
 %if "%{binutils_version}" == "2.17.90"
-Patch0:		binutils-2.17.90-rtems4.8-20070807.diff
+Patch0:		binutils-2.18-rtems4.9-20071104.diff
 %endif
 
 %description
diff --git a/contrib/crossrpms/rtems4.9/sparc/rtems-4.9-sparc-rtems4.9-gdb.spec b/contrib/crossrpms/rtems4.9/sparc/rtems-4.9-sparc-rtems4.9-gdb.spec
index d2c6ca93fc..a212a82be4 100644
--- a/contrib/crossrpms/rtems4.9/sparc/rtems-4.9-sparc-rtems4.9-gdb.spec
+++ b/contrib/crossrpms/rtems4.9/sparc/rtems-4.9-sparc-rtems4.9-gdb.spec
@@ -102,25 +102,7 @@ cd ..
   rm -rf $RPM_BUILD_ROOT
 
   cd build
-%if "%{gdb_version}" >= "6.3"
   make DESTDIR=$RPM_BUILD_ROOT install
-%else
-  make prefix=$RPM_BUILD_ROOT%{_prefix} \
-    bindir=$RPM_BUILD_ROOT%{_bindir} \
-    includedir=$RPM_BUILD_ROOT%{_includedir} \
-    libdir=$RPM_BUILD_ROOT%{_libdir} \
-    infodir=$RPM_BUILD_ROOT%{_infodir} \
-    mandir=$RPM_BUILD_ROOT%{_mandir} \
-    install
-
-  make prefix=$RPM_BUILD_ROOT%{_prefix} \
-    bindir=$RPM_BUILD_ROOT%{_bindir} \
-    includedir=$RPM_BUILD_ROOT%{_includedir} \
-    libdir=$RPM_BUILD_ROOT%{_libdir} \
-    infodir=$RPM_BUILD_ROOT%{_infodir} \
-    mandir=$RPM_BUILD_ROOT%{_mandir} \
-    install-info
-%endif
 
   rm -f $RPM_BUILD_ROOT%{_infodir}/dir
   touch $RPM_BUILD_ROOT%{_infodir}/dir
@@ -133,10 +115,8 @@ cd ..
 # We don't ship host files
   rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
 
-%if "%{gdb_version}" >= "6.4"
 # host library, installed to a bogus directory
   rm -f ${RPM_BUILD_ROOT}%{_libdir}/libsparc-rtems4.9-sim.a
-%endif
 
   cd ..
 
@@ -209,9 +189,6 @@ GDB files shared by all targets.
 
 %post -n rtems-4.9-gdb-common
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-%if "%{gdb_version}" < "6.3"
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/mmalloc.info.gz || :
-%endif
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
@@ -219,9 +196,6 @@ GDB files shared by all targets.
 %preun -n rtems-4.9-gdb-common
 if [ $1 -eq 0 ]; then
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-%if "%{gdb_version}" < "6.3"
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/mmalloc.info.gz || :
-%endif
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
@@ -233,10 +207,6 @@ fi
 %ghost %{_infodir}/dir
 %{_infodir}/gdb.info*
 
-# FIXME: When had mmalloc.info been removed?
-%if "%{gdb_version}" < "6.3"
-%{_infodir}/mmalloc.info*
-%endif
 %{_infodir}/gdbint.info*
 %{_infodir}/stabs.info*
 %{_infodir}/annotate.info*
diff --git a/contrib/crossrpms/rtems4.9/tic4x/rtems-4.9-tic4x-rtems4.9-binutils.spec b/contrib/crossrpms/rtems4.9/tic4x/rtems-4.9-tic4x-rtems4.9-binutils.spec
index ec8d425041..683032b496 100644
--- a/contrib/crossrpms/rtems4.9/tic4x/rtems-4.9-tic4x-rtems4.9-binutils.spec
+++ b/contrib/crossrpms/rtems4.9/tic4x/rtems-4.9-tic4x-rtems4.9-binutils.spec
@@ -21,7 +21,7 @@ Name:		rtems-4.9-tic4x-rtems4.9-binutils
 Summary:	Binutils for target tic4x-rtems4.9
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -36,11 +36,8 @@ Requires:	rtems-4.9-binutils-common
 
 Source0:	ftp://ftp.gnu.org/pub/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
 %{?_without_sources:NoSource:	0}
-%if "%{binutils_version}" == "2.17"
-Patch0:		binutils-2.17-rtems4.8-20061021.diff
-%endif
 %if "%{binutils_version}" == "2.17.90"
-Patch0:		binutils-2.17.90-rtems4.8-20070807.diff
+Patch0:		binutils-2.18-rtems4.9-20071104.diff
 %endif
 
 %description