Regenerate.

11 files changed, 371 insertions, 91 deletions

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 dab0b305b6..808de04136 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
@@ -40,7 +40,7 @@
 %endif
 
 %if "%{_build}" != "%{_host}"
-%define _host_rpmprefix rtems-4.9-%{_host}-
+%define _host_rpmprefix %{_host}-
 %else
 %define _host_rpmprefix %{nil}
 %endif
@@ -52,23 +52,48 @@ Name:		rtems-4.9-arm-rtems4.9-gdb
 Summary:	Gdb for target arm-rtems4.9
 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
+%if "%{_build}" != "%{_host}"
+# psim doesn't support Cdn-X
+%if "arm-rtems4.9" == "powerpc-rtems4.9"
+%define build_sim --disable-sim
+%endif
+%endif
+
+%ifos mingw mingw32
+# Mingw lacks functions required by the simulator
+%if "arm-rtems4.9" == "sparc-rtems4.9"
+%define build_sim --disable-sim
+%endif
+%if "arm-rtems4.9" == "h8300-rtems4.9"
+%define build_sim --disable-sim
+%endif
+%if "%{gdb_version}" >= "6.8.50"
+%if "arm-rtems4.9" == "m32c-rtems4.9"
+%define build_sim --disable-sim
+%endif
+%endif
+%if "arm-rtems4.9" == "lm32-rtems4.9"
+%define build_sim --disable-sim
+%endif
+%if "arm-rtems4.9" == "mipstx39-rtems4.9"
+%define build_sim --disable-sim
+%endif
+%endif
+
 %if "%{gdb_version}" >= "6.6"
 # suse
-%if "%{?suse}"
 %if "%{?suse}" >= "10.3"
 BuildRequires: libexpat-devel
 %else
-BuildRequires: expat
-%endif
-%else
-# fedora/redhat/cygwin
+# Fedora/CentOS/Cygwin/MinGW
 BuildRequires: %{_host_rpmprefix}expat-devel
 %endif
 %endif
@@ -91,7 +116,7 @@ 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.8"
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gdb-6.8-rtems4.9-20080917.diff
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gdb-6.8-rtems4.9-20090312.diff
 %endif
 
 %description
@@ -123,13 +148,16 @@ 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
 %if "%{gdb_version}" >= "6.6"
     --with-expat \
 %endif
+%if "%{gdb_version}" >= "6.8.50"
+    --without-python \
+%endif
     --prefix=%{_prefix} --bindir=%{_bindir} \
     --includedir=%{_includedir} --libdir=%{_libdir} \
     --mandir=%{_mandir} --infodir=%{_infodir}
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 17e1dd3995..d88b1bed55 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
@@ -40,7 +40,7 @@
 %endif
 
 %if "%{_build}" != "%{_host}"
-%define _host_rpmprefix rtems-4.9-%{_host}-
+%define _host_rpmprefix %{_host}-
 %else
 %define _host_rpmprefix %{nil}
 %endif
@@ -52,23 +52,48 @@ Name:		rtems-4.9-avr-rtems4.9-gdb
 Summary:	Gdb for target avr-rtems4.9
 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
+%if "%{_build}" != "%{_host}"
+# psim doesn't support Cdn-X
+%if "avr-rtems4.9" == "powerpc-rtems4.9"
+%define build_sim --disable-sim
+%endif
+%endif
+
+%ifos mingw mingw32
+# Mingw lacks functions required by the simulator
+%if "avr-rtems4.9" == "sparc-rtems4.9"
+%define build_sim --disable-sim
+%endif
+%if "avr-rtems4.9" == "h8300-rtems4.9"
+%define build_sim --disable-sim
+%endif
+%if "%{gdb_version}" >= "6.8.50"
+%if "avr-rtems4.9" == "m32c-rtems4.9"
+%define build_sim --disable-sim
+%endif
+%endif
+%if "avr-rtems4.9" == "lm32-rtems4.9"
+%define build_sim --disable-sim
+%endif
+%if "avr-rtems4.9" == "mipstx39-rtems4.9"
+%define build_sim --disable-sim
+%endif
+%endif
+
 %if "%{gdb_version}" >= "6.6"
 # suse
-%if "%{?suse}"
 %if "%{?suse}" >= "10.3"
 BuildRequires: libexpat-devel
 %else
-BuildRequires: expat
-%endif
-%else
-# fedora/redhat/cygwin
+# Fedora/CentOS/Cygwin/MinGW
 BuildRequires: %{_host_rpmprefix}expat-devel
 %endif
 %endif
@@ -91,7 +116,7 @@ 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.8"
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gdb-6.8-rtems4.9-20080917.diff
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gdb-6.8-rtems4.9-20090312.diff
 %endif
 
 %description
@@ -123,13 +148,16 @@ 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
 %if "%{gdb_version}" >= "6.6"
     --with-expat \
 %endif
+%if "%{gdb_version}" >= "6.8.50"
+    --without-python \
+%endif
     --prefix=%{_prefix} --bindir=%{_bindir} \
     --includedir=%{_includedir} --libdir=%{_libdir} \
     --mandir=%{_mandir} --infodir=%{_infodir}
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 b9f02834ef..fb527a3f83 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
@@ -40,7 +40,7 @@
 %endif
 
 %if "%{_build}" != "%{_host}"
-%define _host_rpmprefix rtems-4.9-%{_host}-
+%define _host_rpmprefix %{_host}-
 %else
 %define _host_rpmprefix %{nil}
 %endif
@@ -52,23 +52,48 @@ Name:		rtems-4.9-bfin-rtems4.9-gdb
 Summary:	Gdb for target bfin-rtems4.9
 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
+%if "%{_build}" != "%{_host}"
+# psim doesn't support Cdn-X
+%if "bfin-rtems4.9" == "powerpc-rtems4.9"
+%define build_sim --disable-sim
+%endif
+%endif
+
+%ifos mingw mingw32
+# Mingw lacks functions required by the simulator
+%if "bfin-rtems4.9" == "sparc-rtems4.9"
+%define build_sim --disable-sim
+%endif
+%if "bfin-rtems4.9" == "h8300-rtems4.9"
+%define build_sim --disable-sim
+%endif
+%if "%{gdb_version}" >= "6.8.50"
+%if "bfin-rtems4.9" == "m32c-rtems4.9"
+%define build_sim --disable-sim
+%endif
+%endif
+%if "bfin-rtems4.9" == "lm32-rtems4.9"
+%define build_sim --disable-sim
+%endif
+%if "bfin-rtems4.9" == "mipstx39-rtems4.9"
+%define build_sim --disable-sim
+%endif
+%endif
+
 %if "%{gdb_version}" >= "6.6"
 # suse
-%if "%{?suse}"
 %if "%{?suse}" >= "10.3"
 BuildRequires: libexpat-devel
 %else
-BuildRequires: expat
-%endif
-%else
-# fedora/redhat/cygwin
+# Fedora/CentOS/Cygwin/MinGW
 BuildRequires: %{_host_rpmprefix}expat-devel
 %endif
 %endif
@@ -121,13 +146,16 @@ 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
 %if "%{gdb_version}" >= "6.6"
     --with-expat \
 %endif
+%if "%{gdb_version}" >= "6.8.50"
+    --without-python \
+%endif
     --prefix=%{_prefix} --bindir=%{_bindir} \
     --includedir=%{_includedir} --libdir=%{_libdir} \
     --mandir=%{_mandir} --infodir=%{_infodir}
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 a20c2f0048..ee45a2bd10 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
@@ -40,7 +40,7 @@
 %endif
 
 %if "%{_build}" != "%{_host}"
-%define _host_rpmprefix rtems-4.9-%{_host}-
+%define _host_rpmprefix %{_host}-
 %else
 %define _host_rpmprefix %{nil}
 %endif
@@ -52,23 +52,48 @@ Name:		rtems-4.9-h8300-rtems4.9-gdb
 Summary:	Gdb for target h8300-rtems4.9
 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
+%if "%{_build}" != "%{_host}"
+# psim doesn't support Cdn-X
+%if "h8300-rtems4.9" == "powerpc-rtems4.9"
+%define build_sim --disable-sim
+%endif
+%endif
+
+%ifos mingw mingw32
+# Mingw lacks functions required by the simulator
+%if "h8300-rtems4.9" == "sparc-rtems4.9"
+%define build_sim --disable-sim
+%endif
+%if "h8300-rtems4.9" == "h8300-rtems4.9"
+%define build_sim --disable-sim
+%endif
+%if "%{gdb_version}" >= "6.8.50"
+%if "h8300-rtems4.9" == "m32c-rtems4.9"
+%define build_sim --disable-sim
+%endif
+%endif
+%if "h8300-rtems4.9" == "lm32-rtems4.9"
+%define build_sim --disable-sim
+%endif
+%if "h8300-rtems4.9" == "mipstx39-rtems4.9"
+%define build_sim --disable-sim
+%endif
+%endif
+
 %if "%{gdb_version}" >= "6.6"
 # suse
-%if "%{?suse}"
 %if "%{?suse}" >= "10.3"
 BuildRequires: libexpat-devel
 %else
-BuildRequires: expat
-%endif
-%else
-# fedora/redhat/cygwin
+# Fedora/CentOS/Cygwin/MinGW
 BuildRequires: %{_host_rpmprefix}expat-devel
 %endif
 %endif
@@ -91,7 +116,7 @@ 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.8"
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gdb-6.8-rtems4.9-20080917.diff
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gdb-6.8-rtems4.9-20090312.diff
 %endif
 
 %description
@@ -123,13 +148,16 @@ 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
 %if "%{gdb_version}" >= "6.6"
     --with-expat \
 %endif
+%if "%{gdb_version}" >= "6.8.50"
+    --without-python \
+%endif
     --prefix=%{_prefix} --bindir=%{_bindir} \
     --includedir=%{_includedir} --libdir=%{_libdir} \
     --mandir=%{_mandir} --infodir=%{_infodir}
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 77ea1f7cb7..f8ae75d1eb 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
@@ -40,7 +40,7 @@
 %endif
 
 %if "%{_build}" != "%{_host}"
-%define _host_rpmprefix rtems-4.9-%{_host}-
+%define _host_rpmprefix %{_host}-
 %else
 %define _host_rpmprefix %{nil}
 %endif
@@ -52,23 +52,48 @@ Name:		rtems-4.9-i386-rtems4.9-gdb
 Summary:	Gdb for target i386-rtems4.9
 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
+%if "%{_build}" != "%{_host}"
+# psim doesn't support Cdn-X
+%if "i386-rtems4.9" == "powerpc-rtems4.9"
+%define build_sim --disable-sim
+%endif
+%endif
+
+%ifos mingw mingw32
+# Mingw lacks functions required by the simulator
+%if "i386-rtems4.9" == "sparc-rtems4.9"
+%define build_sim --disable-sim
+%endif
+%if "i386-rtems4.9" == "h8300-rtems4.9"
+%define build_sim --disable-sim
+%endif
+%if "%{gdb_version}" >= "6.8.50"
+%if "i386-rtems4.9" == "m32c-rtems4.9"
+%define build_sim --disable-sim
+%endif
+%endif
+%if "i386-rtems4.9" == "lm32-rtems4.9"
+%define build_sim --disable-sim
+%endif
+%if "i386-rtems4.9" == "mipstx39-rtems4.9"
+%define build_sim --disable-sim
+%endif
+%endif
+
 %if "%{gdb_version}" >= "6.6"
 # suse
-%if "%{?suse}"
 %if "%{?suse}" >= "10.3"
 BuildRequires: libexpat-devel
 %else
-BuildRequires: expat
-%endif
-%else
-# fedora/redhat/cygwin
+# Fedora/CentOS/Cygwin/MinGW
 BuildRequires: %{_host_rpmprefix}expat-devel
 %endif
 %endif
@@ -91,7 +116,7 @@ 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.8"
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gdb-6.8-rtems4.9-20080917.diff
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gdb-6.8-rtems4.9-20090312.diff
 %endif
 
 %description
@@ -123,13 +148,16 @@ 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
 %if "%{gdb_version}" >= "6.6"
     --with-expat \
 %endif
+%if "%{gdb_version}" >= "6.8.50"
+    --without-python \
+%endif
     --prefix=%{_prefix} --bindir=%{_bindir} \
     --includedir=%{_includedir} --libdir=%{_libdir} \
     --mandir=%{_mandir} --infodir=%{_infodir}
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 de660b6fce..8c265f1a42 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
@@ -40,7 +40,7 @@
 %endif
 
 %if "%{_build}" != "%{_host}"
-%define _host_rpmprefix rtems-4.9-%{_host}-
+%define _host_rpmprefix %{_host}-
 %else
 %define _host_rpmprefix %{nil}
 %endif
@@ -52,23 +52,48 @@ Name:		rtems-4.9-m68k-rtems4.9-gdb
 Summary:	Gdb for target m68k-rtems4.9
 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
+%if "%{_build}" != "%{_host}"
+# psim doesn't support Cdn-X
+%if "m68k-rtems4.9" == "powerpc-rtems4.9"
+%define build_sim --disable-sim
+%endif
+%endif
+
+%ifos mingw mingw32
+# Mingw lacks functions required by the simulator
+%if "m68k-rtems4.9" == "sparc-rtems4.9"
+%define build_sim --disable-sim
+%endif
+%if "m68k-rtems4.9" == "h8300-rtems4.9"
+%define build_sim --disable-sim
+%endif
+%if "%{gdb_version}" >= "6.8.50"
+%if "m68k-rtems4.9" == "m32c-rtems4.9"
+%define build_sim --disable-sim
+%endif
+%endif
+%if "m68k-rtems4.9" == "lm32-rtems4.9"
+%define build_sim --disable-sim
+%endif
+%if "m68k-rtems4.9" == "mipstx39-rtems4.9"
+%define build_sim --disable-sim
+%endif
+%endif
+
 %if "%{gdb_version}" >= "6.6"
 # suse
-%if "%{?suse}"
 %if "%{?suse}" >= "10.3"
 BuildRequires: libexpat-devel
 %else
-BuildRequires: expat
-%endif
-%else
-# fedora/redhat/cygwin
+# Fedora/CentOS/Cygwin/MinGW
 BuildRequires: %{_host_rpmprefix}expat-devel
 %endif
 %endif
@@ -91,7 +116,7 @@ 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.8"
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gdb-6.8-rtems4.9-20080917.diff
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gdb-6.8-rtems4.9-20090312.diff
 %endif
 
 %description
@@ -123,13 +148,16 @@ 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
 %if "%{gdb_version}" >= "6.6"
     --with-expat \
 %endif
+%if "%{gdb_version}" >= "6.8.50"
+    --without-python \
+%endif
     --prefix=%{_prefix} --bindir=%{_bindir} \
     --includedir=%{_includedir} --libdir=%{_libdir} \
     --mandir=%{_mandir} --infodir=%{_infodir}
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 6e27ae7f15..7294fabca7 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
@@ -40,7 +40,7 @@
 %endif
 
 %if "%{_build}" != "%{_host}"
-%define _host_rpmprefix rtems-4.9-%{_host}-
+%define _host_rpmprefix %{_host}-
 %else
 %define _host_rpmprefix %{nil}
 %endif
@@ -52,23 +52,48 @@ Name:		rtems-4.9-mips-rtems4.9-gdb
 Summary:	Gdb for target mips-rtems4.9
 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
+%if "%{_build}" != "%{_host}"
+# psim doesn't support Cdn-X
+%if "mips-rtems4.9" == "powerpc-rtems4.9"
+%define build_sim --disable-sim
+%endif
+%endif
+
+%ifos mingw mingw32
+# Mingw lacks functions required by the simulator
+%if "mips-rtems4.9" == "sparc-rtems4.9"
+%define build_sim --disable-sim
+%endif
+%if "mips-rtems4.9" == "h8300-rtems4.9"
+%define build_sim --disable-sim
+%endif
+%if "%{gdb_version}" >= "6.8.50"
+%if "mips-rtems4.9" == "m32c-rtems4.9"
+%define build_sim --disable-sim
+%endif
+%endif
+%if "mips-rtems4.9" == "lm32-rtems4.9"
+%define build_sim --disable-sim
+%endif
+%if "mips-rtems4.9" == "mipstx39-rtems4.9"
+%define build_sim --disable-sim
+%endif
+%endif
+
 %if "%{gdb_version}" >= "6.6"
 # suse
-%if "%{?suse}"
 %if "%{?suse}" >= "10.3"
 BuildRequires: libexpat-devel
 %else
-BuildRequires: expat
-%endif
-%else
-# fedora/redhat/cygwin
+# Fedora/CentOS/Cygwin/MinGW
 BuildRequires: %{_host_rpmprefix}expat-devel
 %endif
 %endif
@@ -91,7 +116,7 @@ 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.8"
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gdb-6.8-rtems4.9-20080917.diff
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gdb-6.8-rtems4.9-20090312.diff
 %endif
 
 %description
@@ -123,13 +148,16 @@ 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
 %if "%{gdb_version}" >= "6.6"
     --with-expat \
 %endif
+%if "%{gdb_version}" >= "6.8.50"
+    --without-python \
+%endif
     --prefix=%{_prefix} --bindir=%{_bindir} \
     --includedir=%{_includedir} --libdir=%{_libdir} \
     --mandir=%{_mandir} --infodir=%{_infodir}
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 027ac70232..334d4d92b5 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
@@ -40,7 +40,7 @@
 %endif
 
 %if "%{_build}" != "%{_host}"
-%define _host_rpmprefix rtems-4.9-%{_host}-
+%define _host_rpmprefix %{_host}-
 %else
 %define _host_rpmprefix %{nil}
 %endif
@@ -52,23 +52,48 @@ Name:		rtems-4.9-mipstx39-rtems4.9-gdb
 Summary:	Gdb for target mipstx39-rtems4.9
 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
+%if "%{_build}" != "%{_host}"
+# psim doesn't support Cdn-X
+%if "mipstx39-rtems4.9" == "powerpc-rtems4.9"
+%define build_sim --disable-sim
+%endif
+%endif
+
+%ifos mingw mingw32
+# Mingw lacks functions required by the simulator
+%if "mipstx39-rtems4.9" == "sparc-rtems4.9"
+%define build_sim --disable-sim
+%endif
+%if "mipstx39-rtems4.9" == "h8300-rtems4.9"
+%define build_sim --disable-sim
+%endif
+%if "%{gdb_version}" >= "6.8.50"
+%if "mipstx39-rtems4.9" == "m32c-rtems4.9"
+%define build_sim --disable-sim
+%endif
+%endif
+%if "mipstx39-rtems4.9" == "lm32-rtems4.9"
+%define build_sim --disable-sim
+%endif
+%if "mipstx39-rtems4.9" == "mipstx39-rtems4.9"
+%define build_sim --disable-sim
+%endif
+%endif
+
 %if "%{gdb_version}" >= "6.6"
 # suse
-%if "%{?suse}"
 %if "%{?suse}" >= "10.3"
 BuildRequires: libexpat-devel
 %else
-BuildRequires: expat
-%endif
-%else
-# fedora/redhat/cygwin
+# Fedora/CentOS/Cygwin/MinGW
 BuildRequires: %{_host_rpmprefix}expat-devel
 %endif
 %endif
@@ -91,7 +116,7 @@ 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.8"
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gdb-6.8-rtems4.9-20080917.diff
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gdb-6.8-rtems4.9-20090312.diff
 %endif
 
 %description
@@ -123,13 +148,16 @@ 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
 %if "%{gdb_version}" >= "6.6"
     --with-expat \
 %endif
+%if "%{gdb_version}" >= "6.8.50"
+    --without-python \
+%endif
     --prefix=%{_prefix} --bindir=%{_bindir} \
     --includedir=%{_includedir} --libdir=%{_libdir} \
     --mandir=%{_mandir} --infodir=%{_infodir}
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 18cea73fcf..94724ab2fa 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
@@ -40,7 +40,7 @@
 %endif
 
 %if "%{_build}" != "%{_host}"
-%define _host_rpmprefix rtems-4.9-%{_host}-
+%define _host_rpmprefix %{_host}-
 %else
 %define _host_rpmprefix %{nil}
 %endif
@@ -52,7 +52,7 @@ Name:		rtems-4.9-powerpc-rtems4.9-gdb
 Summary:	Gdb for target powerpc-rtems4.9
 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)
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 acf5915f7f..6c0c59465d 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
@@ -40,7 +40,7 @@
 %endif
 
 %if "%{_build}" != "%{_host}"
-%define _host_rpmprefix rtems-4.9-%{_host}-
+%define _host_rpmprefix %{_host}-
 %else
 %define _host_rpmprefix %{nil}
 %endif
@@ -52,23 +52,48 @@ Name:		rtems-4.9-sh-rtems4.9-gdb
 Summary:	Gdb for target sh-rtems4.9
 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
+%if "%{_build}" != "%{_host}"
+# psim doesn't support Cdn-X
+%if "sh-rtems4.9" == "powerpc-rtems4.9"
+%define build_sim --disable-sim
+%endif
+%endif
+
+%ifos mingw mingw32
+# Mingw lacks functions required by the simulator
+%if "sh-rtems4.9" == "sparc-rtems4.9"
+%define build_sim --disable-sim
+%endif
+%if "sh-rtems4.9" == "h8300-rtems4.9"
+%define build_sim --disable-sim
+%endif
+%if "%{gdb_version}" >= "6.8.50"
+%if "sh-rtems4.9" == "m32c-rtems4.9"
+%define build_sim --disable-sim
+%endif
+%endif
+%if "sh-rtems4.9" == "lm32-rtems4.9"
+%define build_sim --disable-sim
+%endif
+%if "sh-rtems4.9" == "mipstx39-rtems4.9"
+%define build_sim --disable-sim
+%endif
+%endif
+
 %if "%{gdb_version}" >= "6.6"
 # suse
-%if "%{?suse}"
 %if "%{?suse}" >= "10.3"
 BuildRequires: libexpat-devel
 %else
-BuildRequires: expat
-%endif
-%else
-# fedora/redhat/cygwin
+# Fedora/CentOS/Cygwin/MinGW
 BuildRequires: %{_host_rpmprefix}expat-devel
 %endif
 %endif
@@ -91,7 +116,7 @@ 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.8"
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gdb-6.8-rtems4.9-20080917.diff
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gdb-6.8-rtems4.9-20090312.diff
 %endif
 
 %description
@@ -123,13 +148,16 @@ 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
 %if "%{gdb_version}" >= "6.6"
     --with-expat \
 %endif
+%if "%{gdb_version}" >= "6.8.50"
+    --without-python \
+%endif
     --prefix=%{_prefix} --bindir=%{_bindir} \
     --includedir=%{_includedir} --libdir=%{_libdir} \
     --mandir=%{_mandir} --infodir=%{_infodir}
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 63a5821ce8..e795c7adc3 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
@@ -40,7 +40,7 @@
 %endif
 
 %if "%{_build}" != "%{_host}"
-%define _host_rpmprefix rtems-4.9-%{_host}-
+%define _host_rpmprefix %{_host}-
 %else
 %define _host_rpmprefix %{nil}
 %endif
@@ -52,23 +52,48 @@ Name:		rtems-4.9-sparc-rtems4.9-gdb
 Summary:	Gdb for target sparc-rtems4.9
 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
+%if "%{_build}" != "%{_host}"
+# psim doesn't support Cdn-X
+%if "sparc-rtems4.9" == "powerpc-rtems4.9"
+%define build_sim --disable-sim
+%endif
+%endif
+
+%ifos mingw mingw32
+# Mingw lacks functions required by the simulator
+%if "sparc-rtems4.9" == "sparc-rtems4.9"
+%define build_sim --disable-sim
+%endif
+%if "sparc-rtems4.9" == "h8300-rtems4.9"
+%define build_sim --disable-sim
+%endif
+%if "%{gdb_version}" >= "6.8.50"
+%if "sparc-rtems4.9" == "m32c-rtems4.9"
+%define build_sim --disable-sim
+%endif
+%endif
+%if "sparc-rtems4.9" == "lm32-rtems4.9"
+%define build_sim --disable-sim
+%endif
+%if "sparc-rtems4.9" == "mipstx39-rtems4.9"
+%define build_sim --disable-sim
+%endif
+%endif
+
 %if "%{gdb_version}" >= "6.6"
 # suse
-%if "%{?suse}"
 %if "%{?suse}" >= "10.3"
 BuildRequires: libexpat-devel
 %else
-BuildRequires: expat
-%endif
-%else
-# fedora/redhat/cygwin
+# Fedora/CentOS/Cygwin/MinGW
 BuildRequires: %{_host_rpmprefix}expat-devel
 %endif
 %endif
@@ -91,7 +116,7 @@ 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.8"
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gdb-6.8-rtems4.9-20080917.diff
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gdb-6.8-rtems4.9-20090312.diff
 %endif
 
 %description
@@ -123,13 +148,16 @@ 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
 %if "%{gdb_version}" >= "6.6"
     --with-expat \
 %endif
+%if "%{gdb_version}" >= "6.8.50"
+    --without-python \
+%endif
     --prefix=%{_prefix} --bindir=%{_bindir} \
     --includedir=%{_includedir} --libdir=%{_libdir} \
     --mandir=%{_mandir} --infodir=%{_infodir}