Update to gdb-6.8.50.20090329

6 files changed, 23 insertions, 18 deletions

diff --git a/contrib/crossrpms/rtems4.10/lm32/Makefile.am b/contrib/crossrpms/rtems4.10/lm32/Makefile.am
index 4b8f7bfd6b..37101c0a6e 100644
--- a/contrib/crossrpms/rtems4.10/lm32/Makefile.am
+++ b/contrib/crossrpms/rtems4.10/lm32/Makefile.am
@@ -19,9 +19,9 @@ NEWLIB_RPMREL = `expr 21 + $(GCC_RPMREL)`
 include ../gcc.am
 GCC_OPTS += --languages=cxx
 
-GDB_VERS = 6.8.50.20090224
+GDB_VERS = 6.8.50.20090329
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 3
+GDB_RPMREL = 1
 include ../gdb.am
 GDB_OPTS += --disable-infos
 
diff --git a/contrib/crossrpms/rtems4.10/lm32/gdb-sources.add b/contrib/crossrpms/rtems4.10/lm32/gdb-sources.add
index 9ef94d0f3a..d74a4f6fbc 100644
--- a/contrib/crossrpms/rtems4.10/lm32/gdb-sources.add
+++ b/contrib/crossrpms/rtems4.10/lm32/gdb-sources.add
@@ -1,8 +1,8 @@
 # A copy of a gdb development snapshot having been retrieved from
-# ftp://sources.redhat.com/pub/gdb/snapshots/gdb-%{gdb_version}.tar.bz2
+# 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
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-%{gdb_version}-rtems4.10-20090225.diff
+Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-6.8.50.20090224-rtems4.10-20090225.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 2c6b062ca6..cbd165bd1f 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.20090224
-%define gdb_rpmvers %{expand:%(echo 6.8.50.20090224 | tr - _)} 
+%define gdb_version 6.8.50.20090329
+%define gdb_rpmvers %{expand:%(echo 6.8.50.20090329 | 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)
@@ -75,6 +75,11 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %if "lm32-rtems4.10" == "h8300-rtems4.10"
 %define build_sim --disable-sim
 %endif
+%if "%{gdb_version}" >= "6.8.50"
+%if "lm32-rtems4.10" == "m32c-rtems4.10"
+%define build_sim --disable-sim
+%endif
+%endif
 %if "lm32-rtems4.10" == "lm32-rtems4.10"
 %define build_sim --disable-sim
 %endif
@@ -104,13 +109,13 @@ BuildRequires:  %{_host_rpmprefix}ncurses-devel
 
 
 # A copy of a gdb development snapshot having been retrieved from
-# ftp://sources.redhat.com/pub/gdb/snapshots/gdb-%{gdb_version}.tar.bz2
+# 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
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-%{gdb_version}-rtems4.10-20090225.diff
+Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-6.8.50.20090224-rtems4.10-20090225.diff
 
 %description
 GDB for target lm32-rtems4.10
diff --git a/contrib/crossrpms/rtems4.10/m32c/Makefile.am b/contrib/crossrpms/rtems4.10/m32c/Makefile.am
index 15f36b5166..e252d7786c 100644
--- a/contrib/crossrpms/rtems4.10/m32c/Makefile.am
+++ b/contrib/crossrpms/rtems4.10/m32c/Makefile.am
@@ -19,9 +19,9 @@ NEWLIB_RPMREL = `expr 21 + $(GCC_RPMREL)`
 include ../gcc.am
 GCC_OPTS += --disable-infos
 
-GDB_VERS = 6.8.50.20090224
+GDB_VERS = 6.8.50.20090329
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 4
+GDB_RPMREL = 1
 include ../gdb.am
 GDB_OPTS += --disable-infos
 
diff --git a/contrib/crossrpms/rtems4.10/m32c/gdb-sources.add b/contrib/crossrpms/rtems4.10/m32c/gdb-sources.add
index 9ef94d0f3a..d74a4f6fbc 100644
--- a/contrib/crossrpms/rtems4.10/m32c/gdb-sources.add
+++ b/contrib/crossrpms/rtems4.10/m32c/gdb-sources.add
@@ -1,8 +1,8 @@
 # A copy of a gdb development snapshot having been retrieved from
-# ftp://sources.redhat.com/pub/gdb/snapshots/gdb-%{gdb_version}.tar.bz2
+# 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
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-%{gdb_version}-rtems4.10-20090225.diff
+Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-6.8.50.20090224-rtems4.10-20090225.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 c7198e191d..5b853d3693 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.20090224
-%define gdb_rpmvers %{expand:%(echo 6.8.50.20090224 | tr - _)} 
+%define gdb_version 6.8.50.20090329
+%define gdb_rpmvers %{expand:%(echo 6.8.50.20090329 | tr - _)} 
 
 Name:		rtems-4.10-m32c-rtems4.10-gdb
 Summary:	Gdb for target m32c-rtems4.10
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	4%{?dist}
+Release:	1%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -109,13 +109,13 @@ BuildRequires:  %{_host_rpmprefix}ncurses-devel
 
 
 # A copy of a gdb development snapshot having been retrieved from
-# ftp://sources.redhat.com/pub/gdb/snapshots/gdb-%{gdb_version}.tar.bz2
+# 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
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-%{gdb_version}-rtems4.10-20090225.diff
+Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-6.8.50.20090224-rtems4.10-20090225.diff
 
 %description
 GDB for target m32c-rtems4.10