Regenerate.

13 files changed, 234 insertions, 78 deletions

diff --git a/contrib/crossrpms/rtems4.10/arm/rtems-4.10-arm-rtems4.10-gdb.spec b/contrib/crossrpms/rtems4.10/arm/rtems-4.10-arm-rtems4.10-gdb.spec
index c63ab71a8d..7629e89463 100644
--- a/contrib/crossrpms/rtems4.10/arm/rtems-4.10-arm-rtems4.10-gdb.spec
+++ b/contrib/crossrpms/rtems4.10/arm/rtems-4.10-arm-rtems4.10-gdb.spec
@@ -45,8 +45,8 @@
 %define _host_rpmprefix %{nil}
 %endif
 
-%define gdb_version 6.8.92
-%define gdb_rpmvers %{expand:%(echo 6.8.92 | tr - _)} 
+%define gdb_version 7.0
+%define gdb_rpmvers %{expand:%(echo 7.0 | tr - _)} 
 
 Name:		rtems-4.10-arm-rtems4.10-gdb
 Summary:	Gdb for target arm-rtems4.10
@@ -126,10 +126,8 @@ BuildRequires:	texinfo >= 4.2
 
 Requires:	rtems-4.10-gdb-common
 
-# A copy of a gdb development snapshot having been retrieved from
-# ftp://sourceware.org/pub/gdb/snapshots/branch/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-20091001.diff
+Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-%{gdb_version}.tar.bz2
+Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-%{gdb_version}-rtems4.10-20091007.diff
 
 %description
 GDB for target arm-rtems4.10
@@ -199,6 +197,20 @@ cd ..
 # host library, installed to a bogus directory
   rm -f ${RPM_BUILD_ROOT}%{_libdir}/libarm-rtems4.10-sim.a
 
+%if "%{gdb_version}" >= "7.0"
+# Bug in gdb-7.0, bogusly installs linux-only files
+  somethinguseful=0
+  for f in ${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls/*.xml; do
+    case $f in
+    *linux.xml) rm -f $f;;
+    *.xml) somethinguseful=1;;
+    esac
+  done
+  if test $somethinguseful -eq 0; then
+    rm -rf "${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls"
+  fi
+%endif
+
   cd ..
 
 # Extract %%__os_install_post into os_install_post~
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 62191d5865..660e580aa4 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,8 +45,8 @@
 %define _host_rpmprefix %{nil}
 %endif
 
-%define gdb_version 6.8.92
-%define gdb_rpmvers %{expand:%(echo 6.8.92 | tr - _)} 
+%define gdb_version 7.0
+%define gdb_rpmvers %{expand:%(echo 7.0 | tr - _)} 
 
 Name:		rtems-4.10-avr-rtems4.10-gdb
 Summary:	Gdb for target avr-rtems4.10
@@ -126,10 +126,8 @@ BuildRequires:	texinfo >= 4.2
 
 Requires:	rtems-4.10-gdb-common
 
-# A copy of a gdb development snapshot having been retrieved from
-# ftp://sourceware.org/pub/gdb/snapshots/branch/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-20091001.diff
+Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-%{gdb_version}.tar.bz2
+Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-%{gdb_version}-rtems4.10-20091007.diff
 
 %description
 GDB for target avr-rtems4.10
@@ -199,6 +197,20 @@ cd ..
 # host library, installed to a bogus directory
   rm -f ${RPM_BUILD_ROOT}%{_libdir}/libavr-rtems4.10-sim.a
 
+%if "%{gdb_version}" >= "7.0"
+# Bug in gdb-7.0, bogusly installs linux-only files
+  somethinguseful=0
+  for f in ${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls/*.xml; do
+    case $f in
+    *linux.xml) rm -f $f;;
+    *.xml) somethinguseful=1;;
+    esac
+  done
+  if test $somethinguseful -eq 0; then
+    rm -rf "${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls"
+  fi
+%endif
+
   cd ..
 
 # Extract %%__os_install_post into os_install_post~
diff --git a/contrib/crossrpms/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-gdb.spec b/contrib/crossrpms/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-gdb.spec
index d31fefa076..a6ebe594f9 100644
--- a/contrib/crossrpms/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-gdb.spec
+++ b/contrib/crossrpms/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-gdb.spec
@@ -45,8 +45,8 @@
 %define _host_rpmprefix %{nil}
 %endif
 
-%define gdb_version 6.8.92
-%define gdb_rpmvers %{expand:%(echo 6.8.92 | tr - _)} 
+%define gdb_version 7.0
+%define gdb_rpmvers %{expand:%(echo 7.0 | tr - _)} 
 
 Name:		rtems-4.10-h8300-rtems4.10-gdb
 Summary:	Gdb for target h8300-rtems4.10
@@ -126,10 +126,8 @@ BuildRequires:	texinfo >= 4.2
 
 Requires:	rtems-4.10-gdb-common
 
-# A copy of a gdb development snapshot having been retrieved from
-# ftp://sourceware.org/pub/gdb/snapshots/branch/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-20091001.diff
+Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-%{gdb_version}.tar.bz2
+Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-%{gdb_version}-rtems4.10-20091007.diff
 
 %description
 GDB for target h8300-rtems4.10
@@ -199,6 +197,20 @@ cd ..
 # host library, installed to a bogus directory
   rm -f ${RPM_BUILD_ROOT}%{_libdir}/libh8300-rtems4.10-sim.a
 
+%if "%{gdb_version}" >= "7.0"
+# Bug in gdb-7.0, bogusly installs linux-only files
+  somethinguseful=0
+  for f in ${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls/*.xml; do
+    case $f in
+    *linux.xml) rm -f $f;;
+    *.xml) somethinguseful=1;;
+    esac
+  done
+  if test $somethinguseful -eq 0; then
+    rm -rf "${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls"
+  fi
+%endif
+
   cd ..
 
 # Extract %%__os_install_post into os_install_post~
diff --git a/contrib/crossrpms/rtems4.10/i386/rtems-4.10-i386-rtems4.10-gdb.spec b/contrib/crossrpms/rtems4.10/i386/rtems-4.10-i386-rtems4.10-gdb.spec
index 435a691d1f..df0118b46c 100644
--- a/contrib/crossrpms/rtems4.10/i386/rtems-4.10-i386-rtems4.10-gdb.spec
+++ b/contrib/crossrpms/rtems4.10/i386/rtems-4.10-i386-rtems4.10-gdb.spec
@@ -45,8 +45,8 @@
 %define _host_rpmprefix %{nil}
 %endif
 
-%define gdb_version 6.8.92
-%define gdb_rpmvers %{expand:%(echo 6.8.92 | tr - _)} 
+%define gdb_version 7.0
+%define gdb_rpmvers %{expand:%(echo 7.0 | tr - _)} 
 
 Name:		rtems-4.10-i386-rtems4.10-gdb
 Summary:	Gdb for target i386-rtems4.10
@@ -126,10 +126,8 @@ BuildRequires:	texinfo >= 4.2
 
 Requires:	rtems-4.10-gdb-common
 
-# A copy of a gdb development snapshot having been retrieved from
-# ftp://sourceware.org/pub/gdb/snapshots/branch/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-20091001.diff
+Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-%{gdb_version}.tar.bz2
+Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-%{gdb_version}-rtems4.10-20091007.diff
 
 %description
 GDB for target i386-rtems4.10
@@ -199,6 +197,20 @@ cd ..
 # host library, installed to a bogus directory
   rm -f ${RPM_BUILD_ROOT}%{_libdir}/libi386-rtems4.10-sim.a
 
+%if "%{gdb_version}" >= "7.0"
+# Bug in gdb-7.0, bogusly installs linux-only files
+  somethinguseful=0
+  for f in ${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls/*.xml; do
+    case $f in
+    *linux.xml) rm -f $f;;
+    *.xml) somethinguseful=1;;
+    esac
+  done
+  if test $somethinguseful -eq 0; then
+    rm -rf "${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls"
+  fi
+%endif
+
   cd ..
 
 # Extract %%__os_install_post into os_install_post~
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 d81797d2ec..38a41c2a0e 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,8 +45,8 @@
 %define _host_rpmprefix %{nil}
 %endif
 
-%define gdb_version 6.8.92
-%define gdb_rpmvers %{expand:%(echo 6.8.92 | tr - _)} 
+%define gdb_version 7.0
+%define gdb_rpmvers %{expand:%(echo 7.0 | tr - _)} 
 
 Name:		rtems-4.10-lm32-rtems4.10-gdb
 Summary:	Gdb for target lm32-rtems4.10
@@ -126,10 +126,8 @@ BuildRequires:	texinfo >= 4.2
 
 Requires:	rtems-4.10-gdb-common
 
-# A copy of a gdb development snapshot having been retrieved from
-# ftp://sourceware.org/pub/gdb/snapshots/branch/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-20091001.diff
+Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-%{gdb_version}.tar.bz2
+Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-%{gdb_version}-rtems4.10-20091007.diff
 
 %description
 GDB for target lm32-rtems4.10
@@ -199,6 +197,20 @@ cd ..
 # host library, installed to a bogus directory
   rm -f ${RPM_BUILD_ROOT}%{_libdir}/liblm32-rtems4.10-sim.a
 
+%if "%{gdb_version}" >= "7.0"
+# Bug in gdb-7.0, bogusly installs linux-only files
+  somethinguseful=0
+  for f in ${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls/*.xml; do
+    case $f in
+    *linux.xml) rm -f $f;;
+    *.xml) somethinguseful=1;;
+    esac
+  done
+  if test $somethinguseful -eq 0; then
+    rm -rf "${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls"
+  fi
+%endif
+
   cd ..
 
 # Extract %%__os_install_post into os_install_post~
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 5fab202299..7b369d796e 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,8 +45,8 @@
 %define _host_rpmprefix %{nil}
 %endif
 
-%define gdb_version 6.8.92
-%define gdb_rpmvers %{expand:%(echo 6.8.92 | tr - _)} 
+%define gdb_version 7.0
+%define gdb_rpmvers %{expand:%(echo 7.0 | tr - _)} 
 
 Name:		rtems-4.10-m32c-rtems4.10-gdb
 Summary:	Gdb for target m32c-rtems4.10
@@ -126,10 +126,8 @@ BuildRequires:	texinfo >= 4.2
 
 Requires:	rtems-4.10-gdb-common
 
-# A copy of a gdb development snapshot having been retrieved from
-# ftp://sourceware.org/pub/gdb/snapshots/branch/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-20091001.diff
+Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-%{gdb_version}.tar.bz2
+Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-%{gdb_version}-rtems4.10-20091007.diff
 
 %description
 GDB for target m32c-rtems4.10
@@ -199,6 +197,20 @@ cd ..
 # host library, installed to a bogus directory
   rm -f ${RPM_BUILD_ROOT}%{_libdir}/libm32c-rtems4.10-sim.a
 
+%if "%{gdb_version}" >= "7.0"
+# Bug in gdb-7.0, bogusly installs linux-only files
+  somethinguseful=0
+  for f in ${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls/*.xml; do
+    case $f in
+    *linux.xml) rm -f $f;;
+    *.xml) somethinguseful=1;;
+    esac
+  done
+  if test $somethinguseful -eq 0; then
+    rm -rf "${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls"
+  fi
+%endif
+
   cd ..
 
 # Extract %%__os_install_post into os_install_post~
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 ad2632424f..f9d1f37312 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,8 +45,8 @@
 %define _host_rpmprefix %{nil}
 %endif
 
-%define gdb_version 6.8.92
-%define gdb_rpmvers %{expand:%(echo 6.8.92 | tr - _)} 
+%define gdb_version 7.0
+%define gdb_rpmvers %{expand:%(echo 7.0 | tr - _)} 
 
 Name:		rtems-4.10-m32r-rtems4.10-gdb
 Summary:	Gdb for target m32r-rtems4.10
@@ -126,10 +126,8 @@ BuildRequires:	texinfo >= 4.2
 
 Requires:	rtems-4.10-gdb-common
 
-# A copy of a gdb development snapshot having been retrieved from
-# ftp://sourceware.org/pub/gdb/snapshots/branch/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-20091001.diff
+Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-%{gdb_version}.tar.bz2
+Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-%{gdb_version}-rtems4.10-20091007.diff
 
 %description
 GDB for target m32r-rtems4.10
@@ -199,6 +197,20 @@ cd ..
 # host library, installed to a bogus directory
   rm -f ${RPM_BUILD_ROOT}%{_libdir}/libm32r-rtems4.10-sim.a
 
+%if "%{gdb_version}" >= "7.0"
+# Bug in gdb-7.0, bogusly installs linux-only files
+  somethinguseful=0
+  for f in ${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls/*.xml; do
+    case $f in
+    *linux.xml) rm -f $f;;
+    *.xml) somethinguseful=1;;
+    esac
+  done
+  if test $somethinguseful -eq 0; then
+    rm -rf "${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls"
+  fi
+%endif
+
   cd ..
 
 # Extract %%__os_install_post into os_install_post~
diff --git a/contrib/crossrpms/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-gdb.spec b/contrib/crossrpms/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-gdb.spec
index d166a76528..8af568e19c 100644
--- a/contrib/crossrpms/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-gdb.spec
+++ b/contrib/crossrpms/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-gdb.spec
@@ -45,8 +45,8 @@
 %define _host_rpmprefix %{nil}
 %endif
 
-%define gdb_version 6.8.92
-%define gdb_rpmvers %{expand:%(echo 6.8.92 | tr - _)} 
+%define gdb_version 7.0
+%define gdb_rpmvers %{expand:%(echo 7.0 | tr - _)} 
 
 Name:		rtems-4.10-m68k-rtems4.10-gdb
 Summary:	Gdb for target m68k-rtems4.10
@@ -126,10 +126,8 @@ BuildRequires:	texinfo >= 4.2
 
 Requires:	rtems-4.10-gdb-common
 
-# A copy of a gdb development snapshot having been retrieved from
-# ftp://sourceware.org/pub/gdb/snapshots/branch/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-20091001.diff
+Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-%{gdb_version}.tar.bz2
+Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-%{gdb_version}-rtems4.10-20091007.diff
 
 %description
 GDB for target m68k-rtems4.10
@@ -199,6 +197,20 @@ cd ..
 # host library, installed to a bogus directory
   rm -f ${RPM_BUILD_ROOT}%{_libdir}/libm68k-rtems4.10-sim.a
 
+%if "%{gdb_version}" >= "7.0"
+# Bug in gdb-7.0, bogusly installs linux-only files
+  somethinguseful=0
+  for f in ${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls/*.xml; do
+    case $f in
+    *linux.xml) rm -f $f;;
+    *.xml) somethinguseful=1;;
+    esac
+  done
+  if test $somethinguseful -eq 0; then
+    rm -rf "${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls"
+  fi
+%endif
+
   cd ..
 
 # Extract %%__os_install_post into os_install_post~
diff --git a/contrib/crossrpms/rtems4.10/mips/rtems-4.10-mips-rtems4.10-gdb.spec b/contrib/crossrpms/rtems4.10/mips/rtems-4.10-mips-rtems4.10-gdb.spec
index 62741040ea..4c6f7614fb 100644
--- a/contrib/crossrpms/rtems4.10/mips/rtems-4.10-mips-rtems4.10-gdb.spec
+++ b/contrib/crossrpms/rtems4.10/mips/rtems-4.10-mips-rtems4.10-gdb.spec
@@ -45,8 +45,8 @@
 %define _host_rpmprefix %{nil}
 %endif
 
-%define gdb_version 6.8.92
-%define gdb_rpmvers %{expand:%(echo 6.8.92 | tr - _)} 
+%define gdb_version 7.0
+%define gdb_rpmvers %{expand:%(echo 7.0 | tr - _)} 
 
 Name:		rtems-4.10-mips-rtems4.10-gdb
 Summary:	Gdb for target mips-rtems4.10
@@ -126,10 +126,8 @@ BuildRequires:	texinfo >= 4.2
 
 Requires:	rtems-4.10-gdb-common
 
-# A copy of a gdb development snapshot having been retrieved from
-# ftp://sourceware.org/pub/gdb/snapshots/branch/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-20091001.diff
+Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-%{gdb_version}.tar.bz2
+Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-%{gdb_version}-rtems4.10-20091007.diff
 
 %description
 GDB for target mips-rtems4.10
@@ -199,6 +197,20 @@ cd ..
 # host library, installed to a bogus directory
   rm -f ${RPM_BUILD_ROOT}%{_libdir}/libmips-rtems4.10-sim.a
 
+%if "%{gdb_version}" >= "7.0"
+# Bug in gdb-7.0, bogusly installs linux-only files
+  somethinguseful=0
+  for f in ${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls/*.xml; do
+    case $f in
+    *linux.xml) rm -f $f;;
+    *.xml) somethinguseful=1;;
+    esac
+  done
+  if test $somethinguseful -eq 0; then
+    rm -rf "${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls"
+  fi
+%endif
+
   cd ..
 
 # Extract %%__os_install_post into os_install_post~
diff --git a/contrib/crossrpms/rtems4.10/mipstx39/rtems-4.10-mipstx39-rtems4.10-gdb.spec b/contrib/crossrpms/rtems4.10/mipstx39/rtems-4.10-mipstx39-rtems4.10-gdb.spec
index e20b93cae6..959964add0 100644
--- a/contrib/crossrpms/rtems4.10/mipstx39/rtems-4.10-mipstx39-rtems4.10-gdb.spec
+++ b/contrib/crossrpms/rtems4.10/mipstx39/rtems-4.10-mipstx39-rtems4.10-gdb.spec
@@ -45,8 +45,8 @@
 %define _host_rpmprefix %{nil}
 %endif
 
-%define gdb_version 6.8.92
-%define gdb_rpmvers %{expand:%(echo 6.8.92 | tr - _)} 
+%define gdb_version 7.0
+%define gdb_rpmvers %{expand:%(echo 7.0 | tr - _)} 
 
 Name:		rtems-4.10-mipstx39-rtems4.10-gdb
 Summary:	Gdb for target mipstx39-rtems4.10
@@ -126,10 +126,8 @@ BuildRequires:	texinfo >= 4.2
 
 Requires:	rtems-4.10-gdb-common
 
-# A copy of a gdb development snapshot having been retrieved from
-# ftp://sourceware.org/pub/gdb/snapshots/branch/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-20091001.diff
+Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-%{gdb_version}.tar.bz2
+Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-%{gdb_version}-rtems4.10-20091007.diff
 
 %description
 GDB for target mipstx39-rtems4.10
@@ -199,6 +197,20 @@ cd ..
 # host library, installed to a bogus directory
   rm -f ${RPM_BUILD_ROOT}%{_libdir}/libmipstx39-rtems4.10-sim.a
 
+%if "%{gdb_version}" >= "7.0"
+# Bug in gdb-7.0, bogusly installs linux-only files
+  somethinguseful=0
+  for f in ${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls/*.xml; do
+    case $f in
+    *linux.xml) rm -f $f;;
+    *.xml) somethinguseful=1;;
+    esac
+  done
+  if test $somethinguseful -eq 0; then
+    rm -rf "${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls"
+  fi
+%endif
+
   cd ..
 
 # Extract %%__os_install_post into os_install_post~
diff --git a/contrib/crossrpms/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-gdb.spec b/contrib/crossrpms/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-gdb.spec
index 47b7ab2283..3bc4bc17ab 100644
--- a/contrib/crossrpms/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-gdb.spec
+++ b/contrib/crossrpms/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-gdb.spec
@@ -45,8 +45,8 @@
 %define _host_rpmprefix %{nil}
 %endif
 
-%define gdb_version 6.8.92
-%define gdb_rpmvers %{expand:%(echo 6.8.92 | tr - _)} 
+%define gdb_version 7.0
+%define gdb_rpmvers %{expand:%(echo 7.0 | tr - _)} 
 
 Name:		rtems-4.10-powerpc-rtems4.10-gdb
 Summary:	Gdb for target powerpc-rtems4.10
@@ -126,10 +126,8 @@ BuildRequires:	texinfo >= 4.2
 
 Requires:	rtems-4.10-gdb-common
 
-# A copy of a gdb development snapshot having been retrieved from
-# ftp://sourceware.org/pub/gdb/snapshots/branch/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-20091001.diff
+Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-%{gdb_version}.tar.bz2
+Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-%{gdb_version}-rtems4.10-20091007.diff
 
 %description
 GDB for target powerpc-rtems4.10
@@ -199,6 +197,20 @@ cd ..
 # host library, installed to a bogus directory
   rm -f ${RPM_BUILD_ROOT}%{_libdir}/libpowerpc-rtems4.10-sim.a
 
+%if "%{gdb_version}" >= "7.0"
+# Bug in gdb-7.0, bogusly installs linux-only files
+  somethinguseful=0
+  for f in ${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls/*.xml; do
+    case $f in
+    *linux.xml) rm -f $f;;
+    *.xml) somethinguseful=1;;
+    esac
+  done
+  if test $somethinguseful -eq 0; then
+    rm -rf "${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls"
+  fi
+%endif
+
   cd ..
 
 # Extract %%__os_install_post into os_install_post~
diff --git a/contrib/crossrpms/rtems4.10/sh/rtems-4.10-sh-rtems4.10-gdb.spec b/contrib/crossrpms/rtems4.10/sh/rtems-4.10-sh-rtems4.10-gdb.spec
index 849a2880f3..6f261554a5 100644
--- a/contrib/crossrpms/rtems4.10/sh/rtems-4.10-sh-rtems4.10-gdb.spec
+++ b/contrib/crossrpms/rtems4.10/sh/rtems-4.10-sh-rtems4.10-gdb.spec
@@ -45,8 +45,8 @@
 %define _host_rpmprefix %{nil}
 %endif
 
-%define gdb_version 6.8.92
-%define gdb_rpmvers %{expand:%(echo 6.8.92 | tr - _)} 
+%define gdb_version 7.0
+%define gdb_rpmvers %{expand:%(echo 7.0 | tr - _)} 
 
 Name:		rtems-4.10-sh-rtems4.10-gdb
 Summary:	Gdb for target sh-rtems4.10
@@ -126,10 +126,8 @@ BuildRequires:	texinfo >= 4.2
 
 Requires:	rtems-4.10-gdb-common
 
-# A copy of a gdb development snapshot having been retrieved from
-# ftp://sourceware.org/pub/gdb/snapshots/branch/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-20091001.diff
+Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-%{gdb_version}.tar.bz2
+Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-%{gdb_version}-rtems4.10-20091007.diff
 
 %description
 GDB for target sh-rtems4.10
@@ -199,6 +197,20 @@ cd ..
 # host library, installed to a bogus directory
   rm -f ${RPM_BUILD_ROOT}%{_libdir}/libsh-rtems4.10-sim.a
 
+%if "%{gdb_version}" >= "7.0"
+# Bug in gdb-7.0, bogusly installs linux-only files
+  somethinguseful=0
+  for f in ${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls/*.xml; do
+    case $f in
+    *linux.xml) rm -f $f;;
+    *.xml) somethinguseful=1;;
+    esac
+  done
+  if test $somethinguseful -eq 0; then
+    rm -rf "${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls"
+  fi
+%endif
+
   cd ..
 
 # Extract %%__os_install_post into os_install_post~
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 7ad1992214..833140b5ac 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,8 +45,8 @@
 %define _host_rpmprefix %{nil}
 %endif
 
-%define gdb_version 6.8.92
-%define gdb_rpmvers %{expand:%(echo 6.8.92 | tr - _)} 
+%define gdb_version 7.0
+%define gdb_rpmvers %{expand:%(echo 7.0 | tr - _)} 
 
 Name:		rtems-4.10-sparc-rtems4.10-gdb
 Summary:	Gdb for target sparc-rtems4.10
@@ -126,10 +126,8 @@ BuildRequires:	texinfo >= 4.2
 
 Requires:	rtems-4.10-gdb-common
 
-# A copy of a gdb development snapshot having been retrieved from
-# ftp://sourceware.org/pub/gdb/snapshots/branch/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-20091001.diff
+Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-%{gdb_version}.tar.bz2
+Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-%{gdb_version}-rtems4.10-20091007.diff
 
 %description
 GDB for target sparc-rtems4.10
@@ -199,6 +197,20 @@ cd ..
 # host library, installed to a bogus directory
   rm -f ${RPM_BUILD_ROOT}%{_libdir}/libsparc-rtems4.10-sim.a
 
+%if "%{gdb_version}" >= "7.0"
+# Bug in gdb-7.0, bogusly installs linux-only files
+  somethinguseful=0
+  for f in ${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls/*.xml; do
+    case $f in
+    *linux.xml) rm -f $f;;
+    *.xml) somethinguseful=1;;
+    esac
+  done
+  if test $somethinguseful -eq 0; then
+    rm -rf "${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls"
+  fi
+%endif
+
   cd ..
 
 # Extract %%__os_install_post into os_install_post~