Regenerate.

13 files changed, 364 insertions, 65 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 d2c816aafc..67ef1f41a4 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
@@ -21,14 +21,22 @@
 
 %ifos cygwin cygwin32 mingw mingw32
 %define _exeext .exe
-%define debug_package		%{nil}
+%define debug_package           %{nil}
+%define _libdir                 %{_exec_prefix}/lib
 %else
 %define _exeext %{nil}
 %endif
 
 %ifos cygwin cygwin32
 %define optflags -O3 -pipe -march=i486 -funroll-loops
-%define _libdir			%{_exec_prefix}/lib
+%endif
+
+%ifos mingw mingw32
+%if %{defined _mingw32_cflags}
+%define optflags %{_mingw32_cflags}
+%else
+%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
+%endif
 %endif
 
 %if "%{_build}" != "%{_host}"
@@ -44,13 +52,28 @@ Name:		rtems-4.10-arm-rtems4.10-gdb
 Summary:	Gdb for target arm-rtems4.10
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	5%{?dist}
+Release:	7%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{_host_rpmprefix}gcc
 
+%define build_sim --enable-sim
+# psim doesn't support Cdn-X
+%if ("arm-rtems4.10" == "powerpc-rtems4.10") && ("%{_build}" != "%{_host}")
+%define build_sim --disable-sim
+%endif
+%ifos mingw mingw32
+# Mingw lacks functions required by the simulator
+%if "arm-rtems4.10" == "sparc-rtems4.10"
+%define build_sim --disable-sim
+%endif
+%if "arm-rtems4.10" == "h8300-rtems4.10"
+%define build_sim --disable-sim
+%endif
+%endif
+
 %if "%{gdb_version}" >= "6.6"
 # suse
 %if "%{?suse}"
@@ -81,7 +104,7 @@ 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-20081003.diff
+Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-6.8-rtems4.10-20090122.diff
 
 %description
 GDB for target arm-rtems4.10
@@ -112,7 +135,7 @@ rm -f gdb-%{gdb_version}/readline/configure
     --without-included-gettext \
     --disable-win32-registry \
     --disable-werror \
-    --enable-sim \
+    %{build_sim} \
 %if "%{gdb_version}" >= "6.7"
     --with-system-readline \
 %endif
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 ef6e7348a7..6b28169757 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
@@ -21,14 +21,22 @@
 
 %ifos cygwin cygwin32 mingw mingw32
 %define _exeext .exe
-%define debug_package		%{nil}
+%define debug_package           %{nil}
+%define _libdir                 %{_exec_prefix}/lib
 %else
 %define _exeext %{nil}
 %endif
 
 %ifos cygwin cygwin32
 %define optflags -O3 -pipe -march=i486 -funroll-loops
-%define _libdir			%{_exec_prefix}/lib
+%endif
+
+%ifos mingw mingw32
+%if %{defined _mingw32_cflags}
+%define optflags %{_mingw32_cflags}
+%else
+%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
+%endif
 %endif
 
 %if "%{_build}" != "%{_host}"
@@ -44,13 +52,28 @@ Name:		rtems-4.10-avr-rtems4.10-gdb
 Summary:	Gdb for target avr-rtems4.10
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	5%{?dist}
+Release:	7%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{_host_rpmprefix}gcc
 
+%define build_sim --enable-sim
+# psim doesn't support Cdn-X
+%if ("avr-rtems4.10" == "powerpc-rtems4.10") && ("%{_build}" != "%{_host}")
+%define build_sim --disable-sim
+%endif
+%ifos mingw mingw32
+# Mingw lacks functions required by the simulator
+%if "avr-rtems4.10" == "sparc-rtems4.10"
+%define build_sim --disable-sim
+%endif
+%if "avr-rtems4.10" == "h8300-rtems4.10"
+%define build_sim --disable-sim
+%endif
+%endif
+
 %if "%{gdb_version}" >= "6.6"
 # suse
 %if "%{?suse}"
@@ -81,7 +104,7 @@ 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-20081003.diff
+Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-6.8-rtems4.10-20090122.diff
 
 %description
 GDB for target avr-rtems4.10
@@ -112,7 +135,7 @@ rm -f gdb-%{gdb_version}/readline/configure
     --without-included-gettext \
     --disable-win32-registry \
     --disable-werror \
-    --enable-sim \
+    %{build_sim} \
 %if "%{gdb_version}" >= "6.7"
     --with-system-readline \
 %endif
diff --git a/contrib/crossrpms/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-gdb.spec b/contrib/crossrpms/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-gdb.spec
index ae8efe3e32..26dd99e05c 100644
--- a/contrib/crossrpms/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-gdb.spec
+++ b/contrib/crossrpms/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-gdb.spec
@@ -21,14 +21,22 @@
 
 %ifos cygwin cygwin32 mingw mingw32
 %define _exeext .exe
-%define debug_package		%{nil}
+%define debug_package           %{nil}
+%define _libdir                 %{_exec_prefix}/lib
 %else
 %define _exeext %{nil}
 %endif
 
 %ifos cygwin cygwin32
 %define optflags -O3 -pipe -march=i486 -funroll-loops
-%define _libdir			%{_exec_prefix}/lib
+%endif
+
+%ifos mingw mingw32
+%if %{defined _mingw32_cflags}
+%define optflags %{_mingw32_cflags}
+%else
+%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
+%endif
 %endif
 
 %if "%{_build}" != "%{_host}"
@@ -44,13 +52,28 @@ Name:		rtems-4.10-bfin-rtems4.10-gdb
 Summary:	Gdb for target bfin-rtems4.10
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{_host_rpmprefix}gcc
 
+%define build_sim --enable-sim
+# psim doesn't support Cdn-X
+%if ("bfin-rtems4.10" == "powerpc-rtems4.10") && ("%{_build}" != "%{_host}")
+%define build_sim --disable-sim
+%endif
+%ifos mingw mingw32
+# Mingw lacks functions required by the simulator
+%if "bfin-rtems4.10" == "sparc-rtems4.10"
+%define build_sim --disable-sim
+%endif
+%if "bfin-rtems4.10" == "h8300-rtems4.10"
+%define build_sim --disable-sim
+%endif
+%endif
+
 %if "%{gdb_version}" >= "6.6"
 # suse
 %if "%{?suse}"
@@ -82,7 +105,7 @@ Requires:	rtems-4.10-gdb-common
 
 Source0:	ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2
 %{?_without_sources:NoSource:	0}
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-6.5-bfinrtems-20071114.diff
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-6.5-bfinrtems-20090122.diff
 
 %description
 GDB for target bfin-rtems4.10
@@ -113,7 +136,7 @@ rm -f gdb-%{gdb_version}/readline/configure
     --without-included-gettext \
     --disable-win32-registry \
     --disable-werror \
-    --enable-sim \
+    %{build_sim} \
 %if "%{gdb_version}" >= "6.7"
     --with-system-readline \
 %endif
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 138a77e5a9..b303685e6b 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
@@ -21,14 +21,22 @@
 
 %ifos cygwin cygwin32 mingw mingw32
 %define _exeext .exe
-%define debug_package		%{nil}
+%define debug_package           %{nil}
+%define _libdir                 %{_exec_prefix}/lib
 %else
 %define _exeext %{nil}
 %endif
 
 %ifos cygwin cygwin32
 %define optflags -O3 -pipe -march=i486 -funroll-loops
-%define _libdir			%{_exec_prefix}/lib
+%endif
+
+%ifos mingw mingw32
+%if %{defined _mingw32_cflags}
+%define optflags %{_mingw32_cflags}
+%else
+%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
+%endif
 %endif
 
 %if "%{_build}" != "%{_host}"
@@ -44,13 +52,28 @@ Name:		rtems-4.10-h8300-rtems4.10-gdb
 Summary:	Gdb for target h8300-rtems4.10
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	5%{?dist}
+Release:	7%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{_host_rpmprefix}gcc
 
+%define build_sim --enable-sim
+# psim doesn't support Cdn-X
+%if ("h8300-rtems4.10" == "powerpc-rtems4.10") && ("%{_build}" != "%{_host}")
+%define build_sim --disable-sim
+%endif
+%ifos mingw mingw32
+# Mingw lacks functions required by the simulator
+%if "h8300-rtems4.10" == "sparc-rtems4.10"
+%define build_sim --disable-sim
+%endif
+%if "h8300-rtems4.10" == "h8300-rtems4.10"
+%define build_sim --disable-sim
+%endif
+%endif
+
 %if "%{gdb_version}" >= "6.6"
 # suse
 %if "%{?suse}"
@@ -81,7 +104,7 @@ 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-20081003.diff
+Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-6.8-rtems4.10-20090122.diff
 
 %description
 GDB for target h8300-rtems4.10
@@ -112,7 +135,7 @@ rm -f gdb-%{gdb_version}/readline/configure
     --without-included-gettext \
     --disable-win32-registry \
     --disable-werror \
-    --enable-sim \
+    %{build_sim} \
 %if "%{gdb_version}" >= "6.7"
     --with-system-readline \
 %endif
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 a2c7f97db9..caafea3720 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
@@ -21,14 +21,22 @@
 
 %ifos cygwin cygwin32 mingw mingw32
 %define _exeext .exe
-%define debug_package		%{nil}
+%define debug_package           %{nil}
+%define _libdir                 %{_exec_prefix}/lib
 %else
 %define _exeext %{nil}
 %endif
 
 %ifos cygwin cygwin32
 %define optflags -O3 -pipe -march=i486 -funroll-loops
-%define _libdir			%{_exec_prefix}/lib
+%endif
+
+%ifos mingw mingw32
+%if %{defined _mingw32_cflags}
+%define optflags %{_mingw32_cflags}
+%else
+%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
+%endif
 %endif
 
 %if "%{_build}" != "%{_host}"
@@ -44,13 +52,28 @@ Name:		rtems-4.10-i386-rtems4.10-gdb
 Summary:	Gdb for target i386-rtems4.10
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	5%{?dist}
+Release:	7%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{_host_rpmprefix}gcc
 
+%define build_sim --enable-sim
+# psim doesn't support Cdn-X
+%if ("i386-rtems4.10" == "powerpc-rtems4.10") && ("%{_build}" != "%{_host}")
+%define build_sim --disable-sim
+%endif
+%ifos mingw mingw32
+# Mingw lacks functions required by the simulator
+%if "i386-rtems4.10" == "sparc-rtems4.10"
+%define build_sim --disable-sim
+%endif
+%if "i386-rtems4.10" == "h8300-rtems4.10"
+%define build_sim --disable-sim
+%endif
+%endif
+
 %if "%{gdb_version}" >= "6.6"
 # suse
 %if "%{?suse}"
@@ -81,7 +104,7 @@ 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-20081003.diff
+Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-6.8-rtems4.10-20090122.diff
 
 %description
 GDB for target i386-rtems4.10
@@ -112,7 +135,7 @@ rm -f gdb-%{gdb_version}/readline/configure
     --without-included-gettext \
     --disable-win32-registry \
     --disable-werror \
-    --enable-sim \
+    %{build_sim} \
 %if "%{gdb_version}" >= "6.7"
     --with-system-readline \
 %endif
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 04be856390..5de2e84172 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
@@ -21,14 +21,22 @@
 
 %ifos cygwin cygwin32 mingw mingw32
 %define _exeext .exe
-%define debug_package		%{nil}
+%define debug_package           %{nil}
+%define _libdir                 %{_exec_prefix}/lib
 %else
 %define _exeext %{nil}
 %endif
 
 %ifos cygwin cygwin32
 %define optflags -O3 -pipe -march=i486 -funroll-loops
-%define _libdir			%{_exec_prefix}/lib
+%endif
+
+%ifos mingw mingw32
+%if %{defined _mingw32_cflags}
+%define optflags %{_mingw32_cflags}
+%else
+%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
+%endif
 %endif
 
 %if "%{_build}" != "%{_host}"
@@ -44,13 +52,28 @@ Name:		rtems-4.10-m32c-rtems4.10-gdb
 Summary:	Gdb for target m32c-rtems4.10
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	6%{?dist}
+Release:	7%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{_host_rpmprefix}gcc
 
+%define build_sim --enable-sim
+# psim doesn't support Cdn-X
+%if ("m32c-rtems4.10" == "powerpc-rtems4.10") && ("%{_build}" != "%{_host}")
+%define build_sim --disable-sim
+%endif
+%ifos mingw mingw32
+# Mingw lacks functions required by the simulator
+%if "m32c-rtems4.10" == "sparc-rtems4.10"
+%define build_sim --disable-sim
+%endif
+%if "m32c-rtems4.10" == "h8300-rtems4.10"
+%define build_sim --disable-sim
+%endif
+%endif
+
 %if "%{gdb_version}" >= "6.6"
 # suse
 %if "%{?suse}"
@@ -81,7 +104,7 @@ 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-20081217.diff
+Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-6.8-rtems4.10-20090122.diff
 
 %description
 GDB for target m32c-rtems4.10
@@ -112,7 +135,7 @@ rm -f gdb-%{gdb_version}/readline/configure
     --without-included-gettext \
     --disable-win32-registry \
     --disable-werror \
-    --enable-sim \
+    %{build_sim} \
 %if "%{gdb_version}" >= "6.7"
     --with-system-readline \
 %endif
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 d124cb866d..dfb23606f3 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
@@ -21,14 +21,22 @@
 
 %ifos cygwin cygwin32 mingw mingw32
 %define _exeext .exe
-%define debug_package		%{nil}
+%define debug_package           %{nil}
+%define _libdir                 %{_exec_prefix}/lib
 %else
 %define _exeext %{nil}
 %endif
 
 %ifos cygwin cygwin32
 %define optflags -O3 -pipe -march=i486 -funroll-loops
-%define _libdir			%{_exec_prefix}/lib
+%endif
+
+%ifos mingw mingw32
+%if %{defined _mingw32_cflags}
+%define optflags %{_mingw32_cflags}
+%else
+%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
+%endif
 %endif
 
 %if "%{_build}" != "%{_host}"
@@ -44,13 +52,28 @@ Name:		rtems-4.10-m32r-rtems4.10-gdb
 Summary:	Gdb for target m32r-rtems4.10
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	5%{?dist}
+Release:	7%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{_host_rpmprefix}gcc
 
+%define build_sim --enable-sim
+# psim doesn't support Cdn-X
+%if ("m32r-rtems4.10" == "powerpc-rtems4.10") && ("%{_build}" != "%{_host}")
+%define build_sim --disable-sim
+%endif
+%ifos mingw mingw32
+# Mingw lacks functions required by the simulator
+%if "m32r-rtems4.10" == "sparc-rtems4.10"
+%define build_sim --disable-sim
+%endif
+%if "m32r-rtems4.10" == "h8300-rtems4.10"
+%define build_sim --disable-sim
+%endif
+%endif
+
 %if "%{gdb_version}" >= "6.6"
 # suse
 %if "%{?suse}"
@@ -81,7 +104,7 @@ 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-20081003.diff
+Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-6.8-rtems4.10-20090122.diff
 
 %description
 GDB for target m32r-rtems4.10
@@ -112,7 +135,7 @@ rm -f gdb-%{gdb_version}/readline/configure
     --without-included-gettext \
     --disable-win32-registry \
     --disable-werror \
-    --enable-sim \
+    %{build_sim} \
 %if "%{gdb_version}" >= "6.7"
     --with-system-readline \
 %endif
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 5ede437a93..d1cc995e53 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
@@ -21,14 +21,22 @@
 
 %ifos cygwin cygwin32 mingw mingw32
 %define _exeext .exe
-%define debug_package		%{nil}
+%define debug_package           %{nil}
+%define _libdir                 %{_exec_prefix}/lib
 %else
 %define _exeext %{nil}
 %endif
 
 %ifos cygwin cygwin32
 %define optflags -O3 -pipe -march=i486 -funroll-loops
-%define _libdir			%{_exec_prefix}/lib
+%endif
+
+%ifos mingw mingw32
+%if %{defined _mingw32_cflags}
+%define optflags %{_mingw32_cflags}
+%else
+%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
+%endif
 %endif
 
 %if "%{_build}" != "%{_host}"
@@ -44,13 +52,28 @@ Name:		rtems-4.10-m68k-rtems4.10-gdb
 Summary:	Gdb for target m68k-rtems4.10
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	5%{?dist}
+Release:	7%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{_host_rpmprefix}gcc
 
+%define build_sim --enable-sim
+# psim doesn't support Cdn-X
+%if ("m68k-rtems4.10" == "powerpc-rtems4.10") && ("%{_build}" != "%{_host}")
+%define build_sim --disable-sim
+%endif
+%ifos mingw mingw32
+# Mingw lacks functions required by the simulator
+%if "m68k-rtems4.10" == "sparc-rtems4.10"
+%define build_sim --disable-sim
+%endif
+%if "m68k-rtems4.10" == "h8300-rtems4.10"
+%define build_sim --disable-sim
+%endif
+%endif
+
 %if "%{gdb_version}" >= "6.6"
 # suse
 %if "%{?suse}"
@@ -81,7 +104,7 @@ 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-20081003.diff
+Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-6.8-rtems4.10-20090122.diff
 
 %description
 GDB for target m68k-rtems4.10
@@ -112,7 +135,7 @@ rm -f gdb-%{gdb_version}/readline/configure
     --without-included-gettext \
     --disable-win32-registry \
     --disable-werror \
-    --enable-sim \
+    %{build_sim} \
 %if "%{gdb_version}" >= "6.7"
     --with-system-readline \
 %endif
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 26364bdc90..b33f7073dc 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
@@ -21,14 +21,22 @@
 
 %ifos cygwin cygwin32 mingw mingw32
 %define _exeext .exe
-%define debug_package		%{nil}
+%define debug_package           %{nil}
+%define _libdir                 %{_exec_prefix}/lib
 %else
 %define _exeext %{nil}
 %endif
 
 %ifos cygwin cygwin32
 %define optflags -O3 -pipe -march=i486 -funroll-loops
-%define _libdir			%{_exec_prefix}/lib
+%endif
+
+%ifos mingw mingw32
+%if %{defined _mingw32_cflags}
+%define optflags %{_mingw32_cflags}
+%else
+%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
+%endif
 %endif
 
 %if "%{_build}" != "%{_host}"
@@ -44,13 +52,28 @@ Name:		rtems-4.10-mips-rtems4.10-gdb
 Summary:	Gdb for target mips-rtems4.10
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	5%{?dist}
+Release:	7%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{_host_rpmprefix}gcc
 
+%define build_sim --enable-sim
+# psim doesn't support Cdn-X
+%if ("mips-rtems4.10" == "powerpc-rtems4.10") && ("%{_build}" != "%{_host}")
+%define build_sim --disable-sim
+%endif
+%ifos mingw mingw32
+# Mingw lacks functions required by the simulator
+%if "mips-rtems4.10" == "sparc-rtems4.10"
+%define build_sim --disable-sim
+%endif
+%if "mips-rtems4.10" == "h8300-rtems4.10"
+%define build_sim --disable-sim
+%endif
+%endif
+
 %if "%{gdb_version}" >= "6.6"
 # suse
 %if "%{?suse}"
@@ -81,7 +104,7 @@ 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-20081003.diff
+Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-6.8-rtems4.10-20090122.diff
 
 %description
 GDB for target mips-rtems4.10
@@ -112,7 +135,7 @@ rm -f gdb-%{gdb_version}/readline/configure
     --without-included-gettext \
     --disable-win32-registry \
     --disable-werror \
-    --enable-sim \
+    %{build_sim} \
 %if "%{gdb_version}" >= "6.7"
     --with-system-readline \
 %endif
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 8cd99edb6d..68d92923d2 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
@@ -21,14 +21,22 @@
 
 %ifos cygwin cygwin32 mingw mingw32
 %define _exeext .exe
-%define debug_package		%{nil}
+%define debug_package           %{nil}
+%define _libdir                 %{_exec_prefix}/lib
 %else
 %define _exeext %{nil}
 %endif
 
 %ifos cygwin cygwin32
 %define optflags -O3 -pipe -march=i486 -funroll-loops
-%define _libdir			%{_exec_prefix}/lib
+%endif
+
+%ifos mingw mingw32
+%if %{defined _mingw32_cflags}
+%define optflags %{_mingw32_cflags}
+%else
+%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
+%endif
 %endif
 
 %if "%{_build}" != "%{_host}"
@@ -44,13 +52,28 @@ Name:		rtems-4.10-mipstx39-rtems4.10-gdb
 Summary:	Gdb for target mipstx39-rtems4.10
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	5%{?dist}
+Release:	7%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{_host_rpmprefix}gcc
 
+%define build_sim --enable-sim
+# psim doesn't support Cdn-X
+%if ("mipstx39-rtems4.10" == "powerpc-rtems4.10") && ("%{_build}" != "%{_host}")
+%define build_sim --disable-sim
+%endif
+%ifos mingw mingw32
+# Mingw lacks functions required by the simulator
+%if "mipstx39-rtems4.10" == "sparc-rtems4.10"
+%define build_sim --disable-sim
+%endif
+%if "mipstx39-rtems4.10" == "h8300-rtems4.10"
+%define build_sim --disable-sim
+%endif
+%endif
+
 %if "%{gdb_version}" >= "6.6"
 # suse
 %if "%{?suse}"
@@ -83,7 +106,7 @@ Requires:	rtems-4.10-gdb-common
 Source0:	ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2
 %{?_without_sources:NoSource:	0}
 %if "%{gdb_version}" == "6.8"
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-6.8-rtems4.10-20080917.diff
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-6.8-rtems4.10-20090122.diff
 %endif
 
 %description
@@ -115,7 +138,7 @@ rm -f gdb-%{gdb_version}/readline/configure
     --without-included-gettext \
     --disable-win32-registry \
     --disable-werror \
-    --enable-sim \
+    %{build_sim} \
 %if "%{gdb_version}" >= "6.7"
     --with-system-readline \
 %endif
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 8879829c2a..d2affa0f4e 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
@@ -21,14 +21,22 @@
 
 %ifos cygwin cygwin32 mingw mingw32
 %define _exeext .exe
-%define debug_package		%{nil}
+%define debug_package           %{nil}
+%define _libdir                 %{_exec_prefix}/lib
 %else
 %define _exeext %{nil}
 %endif
 
 %ifos cygwin cygwin32
 %define optflags -O3 -pipe -march=i486 -funroll-loops
-%define _libdir			%{_exec_prefix}/lib
+%endif
+
+%ifos mingw mingw32
+%if %{defined _mingw32_cflags}
+%define optflags %{_mingw32_cflags}
+%else
+%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
+%endif
 %endif
 
 %if "%{_build}" != "%{_host}"
@@ -44,13 +52,28 @@ Name:		rtems-4.10-powerpc-rtems4.10-gdb
 Summary:	Gdb for target powerpc-rtems4.10
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	5%{?dist}
+Release:	7%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{_host_rpmprefix}gcc
 
+%define build_sim --enable-sim
+# psim doesn't support Cdn-X
+%if ("powerpc-rtems4.10" == "powerpc-rtems4.10") && ("%{_build}" != "%{_host}")
+%define build_sim --disable-sim
+%endif
+%ifos mingw mingw32
+# Mingw lacks functions required by the simulator
+%if "powerpc-rtems4.10" == "sparc-rtems4.10"
+%define build_sim --disable-sim
+%endif
+%if "powerpc-rtems4.10" == "h8300-rtems4.10"
+%define build_sim --disable-sim
+%endif
+%endif
+
 %if "%{gdb_version}" >= "6.6"
 # suse
 %if "%{?suse}"
@@ -81,7 +104,7 @@ 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-20081003.diff
+Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-6.8-rtems4.10-20090122.diff
 
 %description
 GDB for target powerpc-rtems4.10
@@ -112,7 +135,7 @@ rm -f gdb-%{gdb_version}/readline/configure
     --without-included-gettext \
     --disable-win32-registry \
     --disable-werror \
-    --enable-sim \
+    %{build_sim} \
 %if "%{gdb_version}" >= "6.7"
     --with-system-readline \
 %endif
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 3185d21dbf..0c2c7871b2 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
@@ -21,14 +21,22 @@
 
 %ifos cygwin cygwin32 mingw mingw32
 %define _exeext .exe
-%define debug_package		%{nil}
+%define debug_package           %{nil}
+%define _libdir                 %{_exec_prefix}/lib
 %else
 %define _exeext %{nil}
 %endif
 
 %ifos cygwin cygwin32
 %define optflags -O3 -pipe -march=i486 -funroll-loops
-%define _libdir			%{_exec_prefix}/lib
+%endif
+
+%ifos mingw mingw32
+%if %{defined _mingw32_cflags}
+%define optflags %{_mingw32_cflags}
+%else
+%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
+%endif
 %endif
 
 %if "%{_build}" != "%{_host}"
@@ -44,13 +52,28 @@ Name:		rtems-4.10-sh-rtems4.10-gdb
 Summary:	Gdb for target sh-rtems4.10
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	5%{?dist}
+Release:	7%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{_host_rpmprefix}gcc
 
+%define build_sim --enable-sim
+# psim doesn't support Cdn-X
+%if ("sh-rtems4.10" == "powerpc-rtems4.10") && ("%{_build}" != "%{_host}")
+%define build_sim --disable-sim
+%endif
+%ifos mingw mingw32
+# Mingw lacks functions required by the simulator
+%if "sh-rtems4.10" == "sparc-rtems4.10"
+%define build_sim --disable-sim
+%endif
+%if "sh-rtems4.10" == "h8300-rtems4.10"
+%define build_sim --disable-sim
+%endif
+%endif
+
 %if "%{gdb_version}" >= "6.6"
 # suse
 %if "%{?suse}"
@@ -81,7 +104,7 @@ 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-20081003.diff
+Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-6.8-rtems4.10-20090122.diff
 
 %description
 GDB for target sh-rtems4.10
@@ -112,7 +135,7 @@ rm -f gdb-%{gdb_version}/readline/configure
     --without-included-gettext \
     --disable-win32-registry \
     --disable-werror \
-    --enable-sim \
+    %{build_sim} \
 %if "%{gdb_version}" >= "6.7"
     --with-system-readline \
 %endif
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 f4389a5cc1..2247ed0190 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
@@ -21,14 +21,22 @@
 
 %ifos cygwin cygwin32 mingw mingw32
 %define _exeext .exe
-%define debug_package		%{nil}
+%define debug_package           %{nil}
+%define _libdir                 %{_exec_prefix}/lib
 %else
 %define _exeext %{nil}
 %endif
 
 %ifos cygwin cygwin32
 %define optflags -O3 -pipe -march=i486 -funroll-loops
-%define _libdir			%{_exec_prefix}/lib
+%endif
+
+%ifos mingw mingw32
+%if %{defined _mingw32_cflags}
+%define optflags %{_mingw32_cflags}
+%else
+%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
+%endif
 %endif
 
 %if "%{_build}" != "%{_host}"
@@ -44,13 +52,28 @@ Name:		rtems-4.10-sparc-rtems4.10-gdb
 Summary:	Gdb for target sparc-rtems4.10
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	5%{?dist}
+Release:	7%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{_host_rpmprefix}gcc
 
+%define build_sim --enable-sim
+# psim doesn't support Cdn-X
+%if ("sparc-rtems4.10" == "powerpc-rtems4.10") && ("%{_build}" != "%{_host}")
+%define build_sim --disable-sim
+%endif
+%ifos mingw mingw32
+# Mingw lacks functions required by the simulator
+%if "sparc-rtems4.10" == "sparc-rtems4.10"
+%define build_sim --disable-sim
+%endif
+%if "sparc-rtems4.10" == "h8300-rtems4.10"
+%define build_sim --disable-sim
+%endif
+%endif
+
 %if "%{gdb_version}" >= "6.6"
 # suse
 %if "%{?suse}"
@@ -81,7 +104,7 @@ 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-20081003.diff
+Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-6.8-rtems4.10-20090122.diff
 
 %description
 GDB for target sparc-rtems4.10
@@ -112,7 +135,7 @@ rm -f gdb-%{gdb_version}/readline/configure
     --without-included-gettext \
     --disable-win32-registry \
     --disable-werror \
-    --enable-sim \
+    %{build_sim} \
 %if "%{gdb_version}" >= "6.7"
     --with-system-readline \
 %endif