Upgrade to gdb-6.8.50.20090902.

15 files changed, 212 insertions, 78 deletions

diff --git a/contrib/crossrpms/rtems4.10/avr/Makefile.am b/contrib/crossrpms/rtems4.10/avr/Makefile.am
index f733a64467..70d9bdee87 100644
--- a/contrib/crossrpms/rtems4.10/avr/Makefile.am
+++ b/contrib/crossrpms/rtems4.10/avr/Makefile.am
@@ -19,11 +19,11 @@ NEWLIB_RPMREL = `expr 40 + $(GCC_RPMREL)`
 include ../gcc.am
 GCC_OPTS +=
 
-GDB_VERS = 6.8.50.20090629
+GDB_VERS = 6.8.50.20090902
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 3
+GDB_RPMREL = 1
 include ../gdb.am
-GDB_OPTS += --disable-infos
+GDB_OPTS +=
 
 CPUKIT_VERS = 4.9.99.0
 CPUKIT_PKGVERS = $(CPUKIT_VERS)-20090206-2
diff --git a/contrib/crossrpms/rtems4.10/avr/gdb-sources.add b/contrib/crossrpms/rtems4.10/avr/gdb-sources.add
index a35a4b360d..6a5d128287 100644
--- a/contrib/crossrpms/rtems4.10/avr/gdb-sources.add
+++ b/contrib/crossrpms/rtems4.10/avr/gdb-sources.add
@@ -1,9 +1,4 @@
 # A copy of a gdb development snapshot having been retrieved from
 # ftp://sources.redhat.com/pub/gdb/snapshots/current/gdb-%{gdb_version}.tar.bz2
 Source0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-%{gdb_version}.tar.bz2
-
-# rtems-4.10 patches
-# + lm32-sim/gdb http://sourceware.org/ml/gdb-patches/2008-12/msg00373.html
-# + misc small fixes to lm32-sim/gdb
-# + avr simulator
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-6.8.50.20090629-rtems4.10-20090629.diff
+Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-%{gdb_version}-rtems4.10-20090902.diff
diff --git a/contrib/crossrpms/rtems4.10/avr/rtems-4.10-avr-rtems4.10-gdb.spec b/contrib/crossrpms/rtems4.10/avr/rtems-4.10-avr-rtems4.10-gdb.spec
index 2e5f23ed07..3ed3549cfe 100644
--- a/contrib/crossrpms/rtems4.10/avr/rtems-4.10-avr-rtems4.10-gdb.spec
+++ b/contrib/crossrpms/rtems4.10/avr/rtems-4.10-avr-rtems4.10-gdb.spec
@@ -45,14 +45,14 @@
 %define _host_rpmprefix %{nil}
 %endif
 
-%define gdb_version 6.8.50.20090629
-%define gdb_rpmvers %{expand:%(echo 6.8.50.20090629 | tr - _)} 
+%define gdb_version 6.8.50.20090902
+%define gdb_rpmvers %{expand:%(echo 6.8.50.20090902 | tr - _)} 
 
 Name:		rtems-4.10-avr-rtems4.10-gdb
 Summary:	Gdb for target avr-rtems4.10
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	3%{?dist}
+Release:	1%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -106,17 +106,17 @@ BuildRequires:  %{_host_rpmprefix}termcap-devel
 BuildRequires:  %{_host_rpmprefix}readline-devel
 BuildRequires:  %{_host_rpmprefix}ncurses-devel
 
+# Required for building the infos
+BuildRequires:	/sbin/install-info
+BuildRequires:	texinfo >= 4.2
 
 
+Requires:	rtems-4.10-gdb-common
+
 # A copy of a gdb development snapshot having been retrieved from
 # ftp://sources.redhat.com/pub/gdb/snapshots/current/gdb-%{gdb_version}.tar.bz2
 Source0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-%{gdb_version}.tar.bz2
-
-# rtems-4.10 patches
-# + lm32-sim/gdb http://sourceware.org/ml/gdb-patches/2008-12/msg00373.html
-# + misc small fixes to lm32-sim/gdb
-# + avr simulator
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-6.8.50.20090629-rtems4.10-20090629.diff
+Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-%{gdb_version}-rtems4.10-20090902.diff
 
 %description
 GDB for target avr-rtems4.10
@@ -162,6 +162,7 @@ rm -f gdb-%{gdb_version}/readline/configure
     --mandir=%{_mandir} --infodir=%{_infodir}
 
   make %{?_smp_mflags} all
+  make info
   cd ..
 
 %install
@@ -171,8 +172,13 @@ rm -f gdb-%{gdb_version}/readline/configure
   cd build
   make DESTDIR=$RPM_BUILD_ROOT install
 
-# Conflict with a native gdb's infos
-  rm -rf $RPM_BUILD_ROOT%{_infodir}
+  rm -f $RPM_BUILD_ROOT%{_infodir}/dir
+  touch $RPM_BUILD_ROOT%{_infodir}/dir
+
+# These come from other packages
+  rm -rf $RPM_BUILD_ROOT%{_infodir}/bfd*
+  rm -rf $RPM_BUILD_ROOT%{_infodir}/configure*
+  rm -rf $RPM_BUILD_ROOT%{_infodir}/standards*
 
 # We don't ship host files
   rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
@@ -238,3 +244,44 @@ GNU gdb targetting avr-rtems4.10.
 %dir %{_bindir}
 %{_bindir}/avr-rtems4.10-*
 
+# ==============================================================
+# rtems-4.10-gdb-common
+# ==============================================================
+%package -n rtems-4.10-gdb-common
+Summary:      Base package for RTEMS gdbs
+Group: Development/Tools
+Requires(post):		/sbin/install-info
+Requires(preun):	/sbin/install-info
+%{?_with_noarch_subpackages:BuildArch: noarch}
+
+%description -n rtems-4.10-gdb-common
+
+GDB files shared by all targets.
+
+%post -n rtems-4.10-gdb-common
+  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
+  /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 || :
+
+%preun -n rtems-4.10-gdb-common
+if [ $1 -eq 0 ]; then
+  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
+  /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 || :
+fi
+
+%files -n rtems-4.10-gdb-common
+%defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_prefix}/share
+
+%dir %{_infodir}
+%ghost %{_infodir}/dir
+%{_infodir}/gdb.info*
+
+%{_infodir}/gdbint.info*
+%{_infodir}/stabs.info*
+%{_infodir}/annotate.info*
+
diff --git a/contrib/crossrpms/rtems4.10/lm32/Makefile.am b/contrib/crossrpms/rtems4.10/lm32/Makefile.am
index e96996cc58..a00ee9ff37 100644
--- a/contrib/crossrpms/rtems4.10/lm32/Makefile.am
+++ b/contrib/crossrpms/rtems4.10/lm32/Makefile.am
@@ -19,11 +19,11 @@ NEWLIB_RPMREL = `expr 40 + $(GCC_RPMREL)`
 include ../gcc.am
 GCC_OPTS += --languages=cxx
 
-GDB_VERS = 6.8.50.20090629
+GDB_VERS = 6.8.50.20090902
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 3
+GDB_RPMREL = 1
 include ../gdb.am
-GDB_OPTS += --disable-infos
+GDB_OPTS +=
 
 # NOTREADY
 #CPUKIT_VERS = 4.9.99.0
diff --git a/contrib/crossrpms/rtems4.10/lm32/gdb-sources.add b/contrib/crossrpms/rtems4.10/lm32/gdb-sources.add
index a35a4b360d..6a5d128287 100644
--- a/contrib/crossrpms/rtems4.10/lm32/gdb-sources.add
+++ b/contrib/crossrpms/rtems4.10/lm32/gdb-sources.add
@@ -1,9 +1,4 @@
 # A copy of a gdb development snapshot having been retrieved from
 # ftp://sources.redhat.com/pub/gdb/snapshots/current/gdb-%{gdb_version}.tar.bz2
 Source0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-%{gdb_version}.tar.bz2
-
-# rtems-4.10 patches
-# + lm32-sim/gdb http://sourceware.org/ml/gdb-patches/2008-12/msg00373.html
-# + misc small fixes to lm32-sim/gdb
-# + avr simulator
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-6.8.50.20090629-rtems4.10-20090629.diff
+Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-%{gdb_version}-rtems4.10-20090902.diff
diff --git a/contrib/crossrpms/rtems4.10/lm32/rtems-4.10-lm32-rtems4.10-gdb.spec b/contrib/crossrpms/rtems4.10/lm32/rtems-4.10-lm32-rtems4.10-gdb.spec
index acd0cd7aca..13eb8bdbe2 100644
--- a/contrib/crossrpms/rtems4.10/lm32/rtems-4.10-lm32-rtems4.10-gdb.spec
+++ b/contrib/crossrpms/rtems4.10/lm32/rtems-4.10-lm32-rtems4.10-gdb.spec
@@ -45,14 +45,14 @@
 %define _host_rpmprefix %{nil}
 %endif
 
-%define gdb_version 6.8.50.20090629
-%define gdb_rpmvers %{expand:%(echo 6.8.50.20090629 | tr - _)} 
+%define gdb_version 6.8.50.20090902
+%define gdb_rpmvers %{expand:%(echo 6.8.50.20090902 | tr - _)} 
 
 Name:		rtems-4.10-lm32-rtems4.10-gdb
 Summary:	Gdb for target lm32-rtems4.10
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	3%{?dist}
+Release:	1%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -106,17 +106,17 @@ BuildRequires:  %{_host_rpmprefix}termcap-devel
 BuildRequires:  %{_host_rpmprefix}readline-devel
 BuildRequires:  %{_host_rpmprefix}ncurses-devel
 
+# Required for building the infos
+BuildRequires:	/sbin/install-info
+BuildRequires:	texinfo >= 4.2
 
 
+Requires:	rtems-4.10-gdb-common
+
 # A copy of a gdb development snapshot having been retrieved from
 # ftp://sources.redhat.com/pub/gdb/snapshots/current/gdb-%{gdb_version}.tar.bz2
 Source0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-%{gdb_version}.tar.bz2
-
-# rtems-4.10 patches
-# + lm32-sim/gdb http://sourceware.org/ml/gdb-patches/2008-12/msg00373.html
-# + misc small fixes to lm32-sim/gdb
-# + avr simulator
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-6.8.50.20090629-rtems4.10-20090629.diff
+Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-%{gdb_version}-rtems4.10-20090902.diff
 
 %description
 GDB for target lm32-rtems4.10
@@ -162,6 +162,7 @@ rm -f gdb-%{gdb_version}/readline/configure
     --mandir=%{_mandir} --infodir=%{_infodir}
 
   make %{?_smp_mflags} all
+  make info
   cd ..
 
 %install
@@ -171,8 +172,13 @@ rm -f gdb-%{gdb_version}/readline/configure
   cd build
   make DESTDIR=$RPM_BUILD_ROOT install
 
-# Conflict with a native gdb's infos
-  rm -rf $RPM_BUILD_ROOT%{_infodir}
+  rm -f $RPM_BUILD_ROOT%{_infodir}/dir
+  touch $RPM_BUILD_ROOT%{_infodir}/dir
+
+# These come from other packages
+  rm -rf $RPM_BUILD_ROOT%{_infodir}/bfd*
+  rm -rf $RPM_BUILD_ROOT%{_infodir}/configure*
+  rm -rf $RPM_BUILD_ROOT%{_infodir}/standards*
 
 # We don't ship host files
   rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
@@ -238,3 +244,44 @@ GNU gdb targetting lm32-rtems4.10.
 %dir %{_bindir}
 %{_bindir}/lm32-rtems4.10-*
 
+# ==============================================================
+# rtems-4.10-gdb-common
+# ==============================================================
+%package -n rtems-4.10-gdb-common
+Summary:      Base package for RTEMS gdbs
+Group: Development/Tools
+Requires(post):		/sbin/install-info
+Requires(preun):	/sbin/install-info
+%{?_with_noarch_subpackages:BuildArch: noarch}
+
+%description -n rtems-4.10-gdb-common
+
+GDB files shared by all targets.
+
+%post -n rtems-4.10-gdb-common
+  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
+  /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 || :
+
+%preun -n rtems-4.10-gdb-common
+if [ $1 -eq 0 ]; then
+  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
+  /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 || :
+fi
+
+%files -n rtems-4.10-gdb-common
+%defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_prefix}/share
+
+%dir %{_infodir}
+%ghost %{_infodir}/dir
+%{_infodir}/gdb.info*
+
+%{_infodir}/gdbint.info*
+%{_infodir}/stabs.info*
+%{_infodir}/annotate.info*
+
diff --git a/contrib/crossrpms/rtems4.10/m32c/Makefile.am b/contrib/crossrpms/rtems4.10/m32c/Makefile.am
index 323afa7a0c..ef7178caa8 100644
--- a/contrib/crossrpms/rtems4.10/m32c/Makefile.am
+++ b/contrib/crossrpms/rtems4.10/m32c/Makefile.am
@@ -19,11 +19,11 @@ NEWLIB_RPMREL = `expr 40 + $(GCC_RPMREL)`
 include ../gcc.am
 GCC_OPTS += --disable-infos
 
-GDB_VERS = 6.8.50.20090629
+GDB_VERS = 6.8.50.20090902
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 3
+GDB_RPMREL = 1
 include ../gdb.am
-GDB_OPTS += --disable-infos
+GDB_OPTS +=
 
 CPUKIT_VERS = 4.9.99.0
 CPUKIT_PKGVERS = $(CPUKIT_VERS)-20090206-2
diff --git a/contrib/crossrpms/rtems4.10/m32c/gdb-sources.add b/contrib/crossrpms/rtems4.10/m32c/gdb-sources.add
index a35a4b360d..6a5d128287 100644
--- a/contrib/crossrpms/rtems4.10/m32c/gdb-sources.add
+++ b/contrib/crossrpms/rtems4.10/m32c/gdb-sources.add
@@ -1,9 +1,4 @@
 # A copy of a gdb development snapshot having been retrieved from
 # ftp://sources.redhat.com/pub/gdb/snapshots/current/gdb-%{gdb_version}.tar.bz2
 Source0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-%{gdb_version}.tar.bz2
-
-# rtems-4.10 patches
-# + lm32-sim/gdb http://sourceware.org/ml/gdb-patches/2008-12/msg00373.html
-# + misc small fixes to lm32-sim/gdb
-# + avr simulator
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-6.8.50.20090629-rtems4.10-20090629.diff
+Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-%{gdb_version}-rtems4.10-20090902.diff
diff --git a/contrib/crossrpms/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-gdb.spec b/contrib/crossrpms/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-gdb.spec
index 1b444bb4f6..9f9eaa335f 100644
--- a/contrib/crossrpms/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-gdb.spec
+++ b/contrib/crossrpms/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-gdb.spec
@@ -45,14 +45,14 @@
 %define _host_rpmprefix %{nil}
 %endif
 
-%define gdb_version 6.8.50.20090629
-%define gdb_rpmvers %{expand:%(echo 6.8.50.20090629 | tr - _)} 
+%define gdb_version 6.8.50.20090902
+%define gdb_rpmvers %{expand:%(echo 6.8.50.20090902 | tr - _)} 
 
 Name:		rtems-4.10-m32c-rtems4.10-gdb
 Summary:	Gdb for target m32c-rtems4.10
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	3%{?dist}
+Release:	1%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -106,17 +106,17 @@ BuildRequires:  %{_host_rpmprefix}termcap-devel
 BuildRequires:  %{_host_rpmprefix}readline-devel
 BuildRequires:  %{_host_rpmprefix}ncurses-devel
 
+# Required for building the infos
+BuildRequires:	/sbin/install-info
+BuildRequires:	texinfo >= 4.2
 
 
+Requires:	rtems-4.10-gdb-common
+
 # A copy of a gdb development snapshot having been retrieved from
 # ftp://sources.redhat.com/pub/gdb/snapshots/current/gdb-%{gdb_version}.tar.bz2
 Source0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-%{gdb_version}.tar.bz2
-
-# rtems-4.10 patches
-# + lm32-sim/gdb http://sourceware.org/ml/gdb-patches/2008-12/msg00373.html
-# + misc small fixes to lm32-sim/gdb
-# + avr simulator
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-6.8.50.20090629-rtems4.10-20090629.diff
+Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-%{gdb_version}-rtems4.10-20090902.diff
 
 %description
 GDB for target m32c-rtems4.10
@@ -162,6 +162,7 @@ rm -f gdb-%{gdb_version}/readline/configure
     --mandir=%{_mandir} --infodir=%{_infodir}
 
   make %{?_smp_mflags} all
+  make info
   cd ..
 
 %install
@@ -171,8 +172,13 @@ rm -f gdb-%{gdb_version}/readline/configure
   cd build
   make DESTDIR=$RPM_BUILD_ROOT install
 
-# Conflict with a native gdb's infos
-  rm -rf $RPM_BUILD_ROOT%{_infodir}
+  rm -f $RPM_BUILD_ROOT%{_infodir}/dir
+  touch $RPM_BUILD_ROOT%{_infodir}/dir
+
+# These come from other packages
+  rm -rf $RPM_BUILD_ROOT%{_infodir}/bfd*
+  rm -rf $RPM_BUILD_ROOT%{_infodir}/configure*
+  rm -rf $RPM_BUILD_ROOT%{_infodir}/standards*
 
 # We don't ship host files
   rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
@@ -238,3 +244,44 @@ GNU gdb targetting m32c-rtems4.10.
 %dir %{_bindir}
 %{_bindir}/m32c-rtems4.10-*
 
+# ==============================================================
+# rtems-4.10-gdb-common
+# ==============================================================
+%package -n rtems-4.10-gdb-common
+Summary:      Base package for RTEMS gdbs
+Group: Development/Tools
+Requires(post):		/sbin/install-info
+Requires(preun):	/sbin/install-info
+%{?_with_noarch_subpackages:BuildArch: noarch}
+
+%description -n rtems-4.10-gdb-common
+
+GDB files shared by all targets.
+
+%post -n rtems-4.10-gdb-common
+  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
+  /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 || :
+
+%preun -n rtems-4.10-gdb-common
+if [ $1 -eq 0 ]; then
+  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
+  /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 || :
+fi
+
+%files -n rtems-4.10-gdb-common
+%defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_prefix}/share
+
+%dir %{_infodir}
+%ghost %{_infodir}/dir
+%{_infodir}/gdb.info*
+
+%{_infodir}/gdbint.info*
+%{_infodir}/stabs.info*
+%{_infodir}/annotate.info*
+
diff --git a/contrib/crossrpms/rtems4.10/m32r/Makefile.am b/contrib/crossrpms/rtems4.10/m32r/Makefile.am
index 8d5bfc3fae..0d97ad80e6 100644
--- a/contrib/crossrpms/rtems4.10/m32r/Makefile.am
+++ b/contrib/crossrpms/rtems4.10/m32r/Makefile.am
@@ -19,9 +19,9 @@ NEWLIB_RPMREL = `expr 40 + $(GCC_RPMREL)`
 include ../gcc.am
 GCC_OPTS += --disable-infos
 
-GDB_VERS = 6.8
+GDB_VERS = 6.8.50.20090902
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 12
+GDB_RPMREL = 1
 include ../gdb.am
 GDB_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.10/m32r/gdb-sources.add b/contrib/crossrpms/rtems4.10/m32r/gdb-sources.add
index 3eb2c4a1fa..6a5d128287 100644
--- a/contrib/crossrpms/rtems4.10/m32r/gdb-sources.add
+++ b/contrib/crossrpms/rtems4.10/m32r/gdb-sources.add
@@ -1,2 +1,4 @@
-Source0: ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2
-Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-6.8-rtems4.10-20090312.diff
+# A copy of a gdb development snapshot having been retrieved from
+# ftp://sources.redhat.com/pub/gdb/snapshots/current/gdb-%{gdb_version}.tar.bz2
+Source0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-%{gdb_version}.tar.bz2
+Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-%{gdb_version}-rtems4.10-20090902.diff
diff --git a/contrib/crossrpms/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-gdb.spec b/contrib/crossrpms/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-gdb.spec
index 527d75bd52..1246daa216 100644
--- a/contrib/crossrpms/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-gdb.spec
+++ b/contrib/crossrpms/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-gdb.spec
@@ -45,14 +45,14 @@
 %define _host_rpmprefix %{nil}
 %endif
 
-%define gdb_version 6.8
-%define gdb_rpmvers %{expand:%(echo 6.8 | tr - _)} 
+%define gdb_version 6.8.50.20090902
+%define gdb_rpmvers %{expand:%(echo 6.8.50.20090902 | tr - _)} 
 
 Name:		rtems-4.10-m32r-rtems4.10-gdb
 Summary:	Gdb for target m32r-rtems4.10
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	12%{?dist}
+Release:	1%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -113,8 +113,10 @@ BuildRequires:	texinfo >= 4.2
 
 Requires:	rtems-4.10-gdb-common
 
-Source0: ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2
-Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-6.8-rtems4.10-20090312.diff
+# A copy of a gdb development snapshot having been retrieved from
+# ftp://sources.redhat.com/pub/gdb/snapshots/current/gdb-%{gdb_version}.tar.bz2
+Source0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-%{gdb_version}.tar.bz2
+Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-%{gdb_version}-rtems4.10-20090902.diff
 
 %description
 GDB for target m32r-rtems4.10
diff --git a/contrib/crossrpms/rtems4.10/sparc/Makefile.am b/contrib/crossrpms/rtems4.10/sparc/Makefile.am
index 7585e95820..d6f25b69fa 100644
--- a/contrib/crossrpms/rtems4.10/sparc/Makefile.am
+++ b/contrib/crossrpms/rtems4.10/sparc/Makefile.am
@@ -19,9 +19,9 @@ NEWLIB_RPMREL = `expr 40 + $(GCC_RPMREL)`
 include ../gcc.am
 GCC_OPTS += --languages=cxx
 
-GDB_VERS = 6.8
+GDB_VERS = 6.8.50.20090902
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 12
+GDB_RPMREL = 1
 include ../gdb.am
 GDB_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.10/sparc/gdb-sources.add b/contrib/crossrpms/rtems4.10/sparc/gdb-sources.add
index 3eb2c4a1fa..6a5d128287 100644
--- a/contrib/crossrpms/rtems4.10/sparc/gdb-sources.add
+++ b/contrib/crossrpms/rtems4.10/sparc/gdb-sources.add
@@ -1,2 +1,4 @@
-Source0: ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2
-Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-6.8-rtems4.10-20090312.diff
+# A copy of a gdb development snapshot having been retrieved from
+# ftp://sources.redhat.com/pub/gdb/snapshots/current/gdb-%{gdb_version}.tar.bz2
+Source0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-%{gdb_version}.tar.bz2
+Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-%{gdb_version}-rtems4.10-20090902.diff
diff --git a/contrib/crossrpms/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-gdb.spec b/contrib/crossrpms/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-gdb.spec
index 9612b09353..9188d53093 100644
--- a/contrib/crossrpms/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-gdb.spec
+++ b/contrib/crossrpms/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-gdb.spec
@@ -45,14 +45,14 @@
 %define _host_rpmprefix %{nil}
 %endif
 
-%define gdb_version 6.8
-%define gdb_rpmvers %{expand:%(echo 6.8 | tr - _)} 
+%define gdb_version 6.8.50.20090902
+%define gdb_rpmvers %{expand:%(echo 6.8.50.20090902 | tr - _)} 
 
 Name:		rtems-4.10-sparc-rtems4.10-gdb
 Summary:	Gdb for target sparc-rtems4.10
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	12%{?dist}
+Release:	1%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -113,8 +113,10 @@ BuildRequires:	texinfo >= 4.2
 
 Requires:	rtems-4.10-gdb-common
 
-Source0: ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2
-Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-6.8-rtems4.10-20090312.diff
+# A copy of a gdb development snapshot having been retrieved from
+# ftp://sources.redhat.com/pub/gdb/snapshots/current/gdb-%{gdb_version}.tar.bz2
+Source0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-%{gdb_version}.tar.bz2
+Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-%{gdb_version}-rtems4.10-20090902.diff
 
 %description
 GDB for target sparc-rtems4.10