Update.

21 files changed, 41 insertions, 131 deletions

diff --git a/contrib/crossrpms/rtems4.9/arm/Makefile.am b/contrib/crossrpms/rtems4.9/arm/Makefile.am
index 0ae3c4fe4a..6dd1897782 100644
--- a/contrib/crossrpms/rtems4.9/arm/Makefile.am
+++ b/contrib/crossrpms/rtems4.9/arm/Makefile.am
@@ -19,7 +19,7 @@ GCC_OPTS += --languages=cxx
 
 GDB_VERS = 6.7.1
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 4%{?dist}
+GDB_RPMREL = 5%{?dist}
 include ../gdb.am
 GDB_OPTS +=
 
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 d2630aa951..0db7fb6747 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
@@ -20,7 +20,7 @@ Name:		rtems-4.9-arm-rtems4.9-gdb
 Summary:	Gdb for target arm-rtems4.9
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -51,17 +51,8 @@ Requires:	rtems-4.9-gdb-common
 
 Source0:	ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2
 %{?_without_sources:NoSource:	0}
-%if "%{gdb_version}" == "6.5"
-Patch0:		gdb-6.5-rtems-20060713.diff
-%endif
-%if "%{gdb_version}" == "6.6"
-Patch0:		gdb-6.6-rtems4.8-20070306.diff
-%endif
-%if "%{gdb_version}" == "6.7"
-Patch0:		gdb-6.7-rtems4.9-20071011.diff
-%endif
 %if "%{gdb_version}" == "6.7.1"
-Patch0:		gdb-6.7.1-rtems4.9-20071031.diff
+Patch0:		gdb-6.7.1-rtems4.9-20071216.diff
 %endif
 
 %description
@@ -94,7 +85,7 @@ cd ..
     --includedir=%{_includedir} --libdir=%{_libdir} \
     --mandir=%{_mandir} --infodir=%{_infodir}
 
-  make all
+  make %{?_smp_mflags} all
   make info
   cd ..
 
diff --git a/contrib/crossrpms/rtems4.9/avr/Makefile.am b/contrib/crossrpms/rtems4.9/avr/Makefile.am
index 4604877b9f..6322b19873 100644
--- a/contrib/crossrpms/rtems4.9/avr/Makefile.am
+++ b/contrib/crossrpms/rtems4.9/avr/Makefile.am
@@ -18,7 +18,7 @@ include ../gcc.am
 
 GDB_VERS = 6.7.1
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 4%{?dist}
+GDB_RPMREL = 5%{?dist}
 include ../gdb.am
 GDB_OPTS +=
 
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 7a44414699..a2189ad600 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
@@ -20,7 +20,7 @@ Name:		rtems-4.9-avr-rtems4.9-gdb
 Summary:	Gdb for target avr-rtems4.9
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -51,17 +51,8 @@ Requires:	rtems-4.9-gdb-common
 
 Source0:	ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2
 %{?_without_sources:NoSource:	0}
-%if "%{gdb_version}" == "6.5"
-Patch0:		gdb-6.5-rtems-20060713.diff
-%endif
-%if "%{gdb_version}" == "6.6"
-Patch0:		gdb-6.6-rtems4.8-20070306.diff
-%endif
-%if "%{gdb_version}" == "6.7"
-Patch0:		gdb-6.7-rtems4.9-20071011.diff
-%endif
 %if "%{gdb_version}" == "6.7.1"
-Patch0:		gdb-6.7.1-rtems4.9-20071031.diff
+Patch0:		gdb-6.7.1-rtems4.9-20071216.diff
 %endif
 
 %description
@@ -94,7 +85,7 @@ cd ..
     --includedir=%{_includedir} --libdir=%{_libdir} \
     --mandir=%{_mandir} --infodir=%{_infodir}
 
-  make all
+  make %{?_smp_mflags} all
   make info
   cd ..
 
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 88510349f7..7afad307b9 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
@@ -83,7 +83,7 @@ cd ..
     --includedir=%{_includedir} --libdir=%{_libdir} \
     --mandir=%{_mandir} --infodir=%{_infodir}
 
-  make all
+  make %{?_smp_mflags} all
   make info
   cd ..
 
diff --git a/contrib/crossrpms/rtems4.9/h8300/Makefile.am b/contrib/crossrpms/rtems4.9/h8300/Makefile.am
index 97d3ca41ae..2e0a3df53e 100644
--- a/contrib/crossrpms/rtems4.9/h8300/Makefile.am
+++ b/contrib/crossrpms/rtems4.9/h8300/Makefile.am
@@ -19,7 +19,7 @@ GCC_OPTS += --languages=cxx
 
 GDB_VERS = 6.7.1
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 4%{?dist}
+GDB_RPMREL = 5%{?dist}
 include ../gdb.am
 GDB_OPTS +=
 
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 74348e670f..cb33d61f0e 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
@@ -20,7 +20,7 @@ Name:		rtems-4.9-h8300-rtems4.9-gdb
 Summary:	Gdb for target h8300-rtems4.9
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -51,17 +51,8 @@ Requires:	rtems-4.9-gdb-common
 
 Source0:	ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2
 %{?_without_sources:NoSource:	0}
-%if "%{gdb_version}" == "6.5"
-Patch0:		gdb-6.5-rtems-20060713.diff
-%endif
-%if "%{gdb_version}" == "6.6"
-Patch0:		gdb-6.6-rtems4.8-20070306.diff
-%endif
-%if "%{gdb_version}" == "6.7"
-Patch0:		gdb-6.7-rtems4.9-20071011.diff
-%endif
 %if "%{gdb_version}" == "6.7.1"
-Patch0:		gdb-6.7.1-rtems4.9-20071031.diff
+Patch0:		gdb-6.7.1-rtems4.9-20071216.diff
 %endif
 
 %description
@@ -94,7 +85,7 @@ cd ..
     --includedir=%{_includedir} --libdir=%{_libdir} \
     --mandir=%{_mandir} --infodir=%{_infodir}
 
-  make all
+  make %{?_smp_mflags} all
   make info
   cd ..
 
diff --git a/contrib/crossrpms/rtems4.9/i386/Makefile.am b/contrib/crossrpms/rtems4.9/i386/Makefile.am
index b0f28efe2d..3283b58574 100644
--- a/contrib/crossrpms/rtems4.9/i386/Makefile.am
+++ b/contrib/crossrpms/rtems4.9/i386/Makefile.am
@@ -19,7 +19,7 @@ GCC_OPTS += --languages=cxx
 
 GDB_VERS = 6.7.1
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 4%{?dist}
+GDB_RPMREL = 5%{?dist}
 include ../gdb.am
 GDB_OPTS +=
 
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 5019fb0d03..9afde969e7 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
@@ -20,7 +20,7 @@ Name:		rtems-4.9-i386-rtems4.9-gdb
 Summary:	Gdb for target i386-rtems4.9
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -51,17 +51,8 @@ Requires:	rtems-4.9-gdb-common
 
 Source0:	ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2
 %{?_without_sources:NoSource:	0}
-%if "%{gdb_version}" == "6.5"
-Patch0:		gdb-6.5-rtems-20060713.diff
-%endif
-%if "%{gdb_version}" == "6.6"
-Patch0:		gdb-6.6-rtems4.8-20070306.diff
-%endif
-%if "%{gdb_version}" == "6.7"
-Patch0:		gdb-6.7-rtems4.9-20071011.diff
-%endif
 %if "%{gdb_version}" == "6.7.1"
-Patch0:		gdb-6.7.1-rtems4.9-20071031.diff
+Patch0:		gdb-6.7.1-rtems4.9-20071216.diff
 %endif
 
 %description
@@ -94,7 +85,7 @@ cd ..
     --includedir=%{_includedir} --libdir=%{_libdir} \
     --mandir=%{_mandir} --infodir=%{_infodir}
 
-  make all
+  make %{?_smp_mflags} all
   make info
   cd ..
 
diff --git a/contrib/crossrpms/rtems4.9/m68k/Makefile.am b/contrib/crossrpms/rtems4.9/m68k/Makefile.am
index ca63e01926..5750473ba4 100644
--- a/contrib/crossrpms/rtems4.9/m68k/Makefile.am
+++ b/contrib/crossrpms/rtems4.9/m68k/Makefile.am
@@ -19,7 +19,7 @@ GCC_OPTS += --languages=cxx
 
 GDB_VERS = 6.7.1
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 4%{?dist}
+GDB_RPMREL = 5%{?dist}
 include ../gdb.am
 GDB_OPTS +=
 
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 9c896a8385..97934311bc 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
@@ -20,7 +20,7 @@ Name:		rtems-4.9-m68k-rtems4.9-gdb
 Summary:	Gdb for target m68k-rtems4.9
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -51,17 +51,8 @@ Requires:	rtems-4.9-gdb-common
 
 Source0:	ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2
 %{?_without_sources:NoSource:	0}
-%if "%{gdb_version}" == "6.5"
-Patch0:		gdb-6.5-rtems-20060713.diff
-%endif
-%if "%{gdb_version}" == "6.6"
-Patch0:		gdb-6.6-rtems4.8-20070306.diff
-%endif
-%if "%{gdb_version}" == "6.7"
-Patch0:		gdb-6.7-rtems4.9-20071011.diff
-%endif
 %if "%{gdb_version}" == "6.7.1"
-Patch0:		gdb-6.7.1-rtems4.9-20071031.diff
+Patch0:		gdb-6.7.1-rtems4.9-20071216.diff
 %endif
 
 %description
@@ -94,7 +85,7 @@ cd ..
     --includedir=%{_includedir} --libdir=%{_libdir} \
     --mandir=%{_mandir} --infodir=%{_infodir}
 
-  make all
+  make %{?_smp_mflags} all
   make info
   cd ..
 
diff --git a/contrib/crossrpms/rtems4.9/mips/Makefile.am b/contrib/crossrpms/rtems4.9/mips/Makefile.am
index a741d4f4f6..8f337b652c 100644
--- a/contrib/crossrpms/rtems4.9/mips/Makefile.am
+++ b/contrib/crossrpms/rtems4.9/mips/Makefile.am
@@ -19,7 +19,7 @@ GCC_OPTS += --languages=cxx
 
 GDB_VERS = 6.7.1
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 4%{?dist}
+GDB_RPMREL = 5%{?dist}
 include ../gdb.am
 GDB_OPTS +=
 
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 90af403238..84c83c0b12 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
@@ -20,7 +20,7 @@ Name:		rtems-4.9-mips-rtems4.9-gdb
 Summary:	Gdb for target mips-rtems4.9
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -51,17 +51,8 @@ Requires:	rtems-4.9-gdb-common
 
 Source0:	ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2
 %{?_without_sources:NoSource:	0}
-%if "%{gdb_version}" == "6.5"
-Patch0:		gdb-6.5-rtems-20060713.diff
-%endif
-%if "%{gdb_version}" == "6.6"
-Patch0:		gdb-6.6-rtems4.8-20070306.diff
-%endif
-%if "%{gdb_version}" == "6.7"
-Patch0:		gdb-6.7-rtems4.9-20071011.diff
-%endif
 %if "%{gdb_version}" == "6.7.1"
-Patch0:		gdb-6.7.1-rtems4.9-20071031.diff
+Patch0:		gdb-6.7.1-rtems4.9-20071216.diff
 %endif
 
 %description
@@ -94,7 +85,7 @@ cd ..
     --includedir=%{_includedir} --libdir=%{_libdir} \
     --mandir=%{_mandir} --infodir=%{_infodir}
 
-  make all
+  make %{?_smp_mflags} all
   make info
   cd ..
 
diff --git a/contrib/crossrpms/rtems4.9/mipstx39/Makefile.am b/contrib/crossrpms/rtems4.9/mipstx39/Makefile.am
index 9f7263b950..b934cf74f3 100644
--- a/contrib/crossrpms/rtems4.9/mipstx39/Makefile.am
+++ b/contrib/crossrpms/rtems4.9/mipstx39/Makefile.am
@@ -7,6 +7,6 @@ include $(top_srcdir)/mkspec.am
 # We only want a gdb with a tx39 simulator in it.  We share the other tools
 GDB_VERS = 6.7.1
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 4%{?dist}
+GDB_RPMREL = 5%{?dist}
 include ../gdb.am
 GDB_OPTS +=
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 7e360a8618..c72f6a9caa 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
@@ -20,7 +20,7 @@ Name:		rtems-4.9-mipstx39-rtems4.9-gdb
 Summary:	Gdb for target mipstx39-rtems4.9
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -51,17 +51,8 @@ Requires:	rtems-4.9-gdb-common
 
 Source0:	ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2
 %{?_without_sources:NoSource:	0}
-%if "%{gdb_version}" == "6.5"
-Patch0:		gdb-6.5-rtems-20060713.diff
-%endif
-%if "%{gdb_version}" == "6.6"
-Patch0:		gdb-6.6-rtems4.8-20070306.diff
-%endif
-%if "%{gdb_version}" == "6.7"
-Patch0:		gdb-6.7-rtems4.9-20071011.diff
-%endif
 %if "%{gdb_version}" == "6.7.1"
-Patch0:		gdb-6.7.1-rtems4.9-20071031.diff
+Patch0:		gdb-6.7.1-rtems4.9-20071216.diff
 %endif
 
 %description
@@ -94,7 +85,7 @@ cd ..
     --includedir=%{_includedir} --libdir=%{_libdir} \
     --mandir=%{_mandir} --infodir=%{_infodir}
 
-  make all
+  make %{?_smp_mflags} all
   make info
   cd ..
 
diff --git a/contrib/crossrpms/rtems4.9/powerpc/Makefile.am b/contrib/crossrpms/rtems4.9/powerpc/Makefile.am
index 6dec498141..936851ec16 100644
--- a/contrib/crossrpms/rtems4.9/powerpc/Makefile.am
+++ b/contrib/crossrpms/rtems4.9/powerpc/Makefile.am
@@ -19,7 +19,7 @@ GCC_OPTS += --languages=cxx
 
 GDB_VERS = 6.7.1
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 4%{?dist}
+GDB_RPMREL = 5%{?dist}
 include ../gdb.am
 GDB_OPTS +=
 
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 62db682885..c979eea625 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
@@ -20,7 +20,7 @@ Name:		rtems-4.9-powerpc-rtems4.9-gdb
 Summary:	Gdb for target powerpc-rtems4.9
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -51,17 +51,8 @@ Requires:	rtems-4.9-gdb-common
 
 Source0:	ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2
 %{?_without_sources:NoSource:	0}
-%if "%{gdb_version}" == "6.5"
-Patch0:		gdb-6.5-rtems-20060713.diff
-%endif
-%if "%{gdb_version}" == "6.6"
-Patch0:		gdb-6.6-rtems4.8-20070306.diff
-%endif
-%if "%{gdb_version}" == "6.7"
-Patch0:		gdb-6.7-rtems4.9-20071011.diff
-%endif
 %if "%{gdb_version}" == "6.7.1"
-Patch0:		gdb-6.7.1-rtems4.9-20071031.diff
+Patch0:		gdb-6.7.1-rtems4.9-20071216.diff
 %endif
 
 %description
@@ -94,7 +85,7 @@ cd ..
     --includedir=%{_includedir} --libdir=%{_libdir} \
     --mandir=%{_mandir} --infodir=%{_infodir}
 
-  make all
+  make %{?_smp_mflags} all
   make info
   cd ..
 
diff --git a/contrib/crossrpms/rtems4.9/sh/Makefile.am b/contrib/crossrpms/rtems4.9/sh/Makefile.am
index 6432314f8d..f74bd7d742 100644
--- a/contrib/crossrpms/rtems4.9/sh/Makefile.am
+++ b/contrib/crossrpms/rtems4.9/sh/Makefile.am
@@ -19,7 +19,7 @@ GCC_OPTS += --languages=cxx
 
 GDB_VERS = 6.7.1
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 4%{?dist}
+GDB_RPMREL = 5%{?dist}
 include ../gdb.am
 GDB_OPTS +=
 
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 69edd4403e..3d4219d6c2 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
@@ -20,7 +20,7 @@ Name:		rtems-4.9-sh-rtems4.9-gdb
 Summary:	Gdb for target sh-rtems4.9
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -51,17 +51,8 @@ Requires:	rtems-4.9-gdb-common
 
 Source0:	ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2
 %{?_without_sources:NoSource:	0}
-%if "%{gdb_version}" == "6.5"
-Patch0:		gdb-6.5-rtems-20060713.diff
-%endif
-%if "%{gdb_version}" == "6.6"
-Patch0:		gdb-6.6-rtems4.8-20070306.diff
-%endif
-%if "%{gdb_version}" == "6.7"
-Patch0:		gdb-6.7-rtems4.9-20071011.diff
-%endif
 %if "%{gdb_version}" == "6.7.1"
-Patch0:		gdb-6.7.1-rtems4.9-20071031.diff
+Patch0:		gdb-6.7.1-rtems4.9-20071216.diff
 %endif
 
 %description
@@ -94,7 +85,7 @@ cd ..
     --includedir=%{_includedir} --libdir=%{_libdir} \
     --mandir=%{_mandir} --infodir=%{_infodir}
 
-  make all
+  make %{?_smp_mflags} all
   make info
   cd ..
 
diff --git a/contrib/crossrpms/rtems4.9/sparc/Makefile.am b/contrib/crossrpms/rtems4.9/sparc/Makefile.am
index c30a2b29d2..b07ede5ed9 100644
--- a/contrib/crossrpms/rtems4.9/sparc/Makefile.am
+++ b/contrib/crossrpms/rtems4.9/sparc/Makefile.am
@@ -19,7 +19,7 @@ GCC_OPTS += --languages=cxx
 
 GDB_VERS = 6.7.1
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 4%{?dist}
+GDB_RPMREL = 5%{?dist}
 include ../gdb.am
 GDB_OPTS +=
 
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 a212a82be4..af4f5c4d76 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
@@ -20,7 +20,7 @@ Name:		rtems-4.9-sparc-rtems4.9-gdb
 Summary:	Gdb for target sparc-rtems4.9
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -51,17 +51,8 @@ Requires:	rtems-4.9-gdb-common
 
 Source0:	ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2
 %{?_without_sources:NoSource:	0}
-%if "%{gdb_version}" == "6.5"
-Patch0:		gdb-6.5-rtems-20060713.diff
-%endif
-%if "%{gdb_version}" == "6.6"
-Patch0:		gdb-6.6-rtems4.8-20070306.diff
-%endif
-%if "%{gdb_version}" == "6.7"
-Patch0:		gdb-6.7-rtems4.9-20071011.diff
-%endif
 %if "%{gdb_version}" == "6.7.1"
-Patch0:		gdb-6.7.1-rtems4.9-20071031.diff
+Patch0:		gdb-6.7.1-rtems4.9-20071216.diff
 %endif
 
 %description
@@ -94,7 +85,7 @@ cd ..
     --includedir=%{_includedir} --libdir=%{_libdir} \
     --mandir=%{_mandir} --infodir=%{_infodir}
 
-  make all
+  make %{?_smp_mflags} all
   make info
   cd ..