Regenerate.

8 files changed, 312 insertions, 64 deletions

diff --git a/contrib/crossrpms/rtems4.8/arm/rtems-4.8-arm-rtems4.8-gdb.spec b/contrib/crossrpms/rtems4.8/arm/rtems-4.8-arm-rtems4.8-gdb.spec
index 5755fe576c..70d48f9848 100644
--- a/contrib/crossrpms/rtems4.8/arm/rtems-4.8-arm-rtems4.8-gdb.spec
+++ b/contrib/crossrpms/rtems4.8/arm/rtems-4.8-arm-rtems4.8-gdb.spec
@@ -52,23 +52,48 @@ Name:		rtems-4.8-arm-rtems4.8-gdb
 Summary:	Gdb for target arm-rtems4.8
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	14%{?dist}
+Release:	15%{?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.8" == "powerpc-rtems4.8"
+%define build_sim --disable-sim
+%endif
+%endif
+
+%ifos mingw mingw32
+# Mingw lacks functions required by the simulator
+%if "arm-rtems4.8" == "sparc-rtems4.8"
+%define build_sim --disable-sim
+%endif
+%if "arm-rtems4.8" == "h8300-rtems4.8"
+%define build_sim --disable-sim
+%endif
+%if "%{gdb_version}" >= "6.8.50"
+%if "arm-rtems4.8" == "m32c-rtems4.8"
+%define build_sim --disable-sim
+%endif
+%endif
+%if "arm-rtems4.8" == "lm32-rtems4.8"
+%define build_sim --disable-sim
+%endif
+%if "arm-rtems4.8" == "mipstx39-rtems4.8"
+%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,10 @@ Requires:	rtems-4.8-gdb-common
 Source0:	ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2
 %{?_without_sources:NoSource:	0}
 %if "%{gdb_version}" == "6.6"
-Patch0:		gdb-6.6-rtems4.8-20071216.diff
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.8/gdb-6.6-rtems4.8-20090724.diff
+%endif
+%if "%{gdb_version}" == "6.8"
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.8/gdb-6.8-rtems4.8-20080429.diff
 %endif
 
 %description
@@ -123,13 +151,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.8/h8300/rtems-4.8-h8300-rtems4.8-gdb.spec b/contrib/crossrpms/rtems4.8/h8300/rtems-4.8-h8300-rtems4.8-gdb.spec
index 49e23e3b46..e36ff63589 100644
--- a/contrib/crossrpms/rtems4.8/h8300/rtems-4.8-h8300-rtems4.8-gdb.spec
+++ b/contrib/crossrpms/rtems4.8/h8300/rtems-4.8-h8300-rtems4.8-gdb.spec
@@ -52,23 +52,48 @@ Name:		rtems-4.8-h8300-rtems4.8-gdb
 Summary:	Gdb for target h8300-rtems4.8
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	14%{?dist}
+Release:	15%{?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.8" == "powerpc-rtems4.8"
+%define build_sim --disable-sim
+%endif
+%endif
+
+%ifos mingw mingw32
+# Mingw lacks functions required by the simulator
+%if "h8300-rtems4.8" == "sparc-rtems4.8"
+%define build_sim --disable-sim
+%endif
+%if "h8300-rtems4.8" == "h8300-rtems4.8"
+%define build_sim --disable-sim
+%endif
+%if "%{gdb_version}" >= "6.8.50"
+%if "h8300-rtems4.8" == "m32c-rtems4.8"
+%define build_sim --disable-sim
+%endif
+%endif
+%if "h8300-rtems4.8" == "lm32-rtems4.8"
+%define build_sim --disable-sim
+%endif
+%if "h8300-rtems4.8" == "mipstx39-rtems4.8"
+%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,10 @@ Requires:	rtems-4.8-gdb-common
 Source0:	ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2
 %{?_without_sources:NoSource:	0}
 %if "%{gdb_version}" == "6.6"
-Patch0:		gdb-6.6-rtems4.8-20071216.diff
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.8/gdb-6.6-rtems4.8-20090724.diff
+%endif
+%if "%{gdb_version}" == "6.8"
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.8/gdb-6.8-rtems4.8-20080429.diff
 %endif
 
 %description
@@ -123,13 +151,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.8/i386/rtems-4.8-i386-rtems4.8-gdb.spec b/contrib/crossrpms/rtems4.8/i386/rtems-4.8-i386-rtems4.8-gdb.spec
index 2699271339..b1c60e5a20 100644
--- a/contrib/crossrpms/rtems4.8/i386/rtems-4.8-i386-rtems4.8-gdb.spec
+++ b/contrib/crossrpms/rtems4.8/i386/rtems-4.8-i386-rtems4.8-gdb.spec
@@ -52,23 +52,48 @@ Name:		rtems-4.8-i386-rtems4.8-gdb
 Summary:	Gdb for target i386-rtems4.8
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	14%{?dist}
+Release:	15%{?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.8" == "powerpc-rtems4.8"
+%define build_sim --disable-sim
+%endif
+%endif
+
+%ifos mingw mingw32
+# Mingw lacks functions required by the simulator
+%if "i386-rtems4.8" == "sparc-rtems4.8"
+%define build_sim --disable-sim
+%endif
+%if "i386-rtems4.8" == "h8300-rtems4.8"
+%define build_sim --disable-sim
+%endif
+%if "%{gdb_version}" >= "6.8.50"
+%if "i386-rtems4.8" == "m32c-rtems4.8"
+%define build_sim --disable-sim
+%endif
+%endif
+%if "i386-rtems4.8" == "lm32-rtems4.8"
+%define build_sim --disable-sim
+%endif
+%if "i386-rtems4.8" == "mipstx39-rtems4.8"
+%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,10 @@ Requires:	rtems-4.8-gdb-common
 Source0:	ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2
 %{?_without_sources:NoSource:	0}
 %if "%{gdb_version}" == "6.6"
-Patch0:		gdb-6.6-rtems4.8-20071216.diff
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.8/gdb-6.6-rtems4.8-20090724.diff
+%endif
+%if "%{gdb_version}" == "6.8"
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.8/gdb-6.8-rtems4.8-20080429.diff
 %endif
 
 %description
@@ -123,13 +151,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.8/m68k/rtems-4.8-m68k-rtems4.8-gdb.spec b/contrib/crossrpms/rtems4.8/m68k/rtems-4.8-m68k-rtems4.8-gdb.spec
index 218e8d6af2..3ee05ed05e 100644
--- a/contrib/crossrpms/rtems4.8/m68k/rtems-4.8-m68k-rtems4.8-gdb.spec
+++ b/contrib/crossrpms/rtems4.8/m68k/rtems-4.8-m68k-rtems4.8-gdb.spec
@@ -52,23 +52,48 @@ Name:		rtems-4.8-m68k-rtems4.8-gdb
 Summary:	Gdb for target m68k-rtems4.8
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	14%{?dist}
+Release:	15%{?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.8" == "powerpc-rtems4.8"
+%define build_sim --disable-sim
+%endif
+%endif
+
+%ifos mingw mingw32
+# Mingw lacks functions required by the simulator
+%if "m68k-rtems4.8" == "sparc-rtems4.8"
+%define build_sim --disable-sim
+%endif
+%if "m68k-rtems4.8" == "h8300-rtems4.8"
+%define build_sim --disable-sim
+%endif
+%if "%{gdb_version}" >= "6.8.50"
+%if "m68k-rtems4.8" == "m32c-rtems4.8"
+%define build_sim --disable-sim
+%endif
+%endif
+%if "m68k-rtems4.8" == "lm32-rtems4.8"
+%define build_sim --disable-sim
+%endif
+%if "m68k-rtems4.8" == "mipstx39-rtems4.8"
+%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,10 @@ Requires:	rtems-4.8-gdb-common
 Source0:	ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2
 %{?_without_sources:NoSource:	0}
 %if "%{gdb_version}" == "6.6"
-Patch0:		gdb-6.6-rtems4.8-20071216.diff
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.8/gdb-6.6-rtems4.8-20090724.diff
+%endif
+%if "%{gdb_version}" == "6.8"
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.8/gdb-6.8-rtems4.8-20080429.diff
 %endif
 
 %description
@@ -123,13 +151,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.8/mips/rtems-4.8-mips-rtems4.8-gdb.spec b/contrib/crossrpms/rtems4.8/mips/rtems-4.8-mips-rtems4.8-gdb.spec
index 3bfeb58d83..ac9280f52f 100644
--- a/contrib/crossrpms/rtems4.8/mips/rtems-4.8-mips-rtems4.8-gdb.spec
+++ b/contrib/crossrpms/rtems4.8/mips/rtems-4.8-mips-rtems4.8-gdb.spec
@@ -52,23 +52,48 @@ Name:		rtems-4.8-mips-rtems4.8-gdb
 Summary:	Gdb for target mips-rtems4.8
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	14%{?dist}
+Release:	15%{?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.8" == "powerpc-rtems4.8"
+%define build_sim --disable-sim
+%endif
+%endif
+
+%ifos mingw mingw32
+# Mingw lacks functions required by the simulator
+%if "mips-rtems4.8" == "sparc-rtems4.8"
+%define build_sim --disable-sim
+%endif
+%if "mips-rtems4.8" == "h8300-rtems4.8"
+%define build_sim --disable-sim
+%endif
+%if "%{gdb_version}" >= "6.8.50"
+%if "mips-rtems4.8" == "m32c-rtems4.8"
+%define build_sim --disable-sim
+%endif
+%endif
+%if "mips-rtems4.8" == "lm32-rtems4.8"
+%define build_sim --disable-sim
+%endif
+%if "mips-rtems4.8" == "mipstx39-rtems4.8"
+%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,10 @@ Requires:	rtems-4.8-gdb-common
 Source0:	ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2
 %{?_without_sources:NoSource:	0}
 %if "%{gdb_version}" == "6.6"
-Patch0:		gdb-6.6-rtems4.8-20071216.diff
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.8/gdb-6.6-rtems4.8-20090724.diff
+%endif
+%if "%{gdb_version}" == "6.8"
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.8/gdb-6.8-rtems4.8-20080429.diff
 %endif
 
 %description
@@ -123,13 +151,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.8/mipstx39/rtems-4.8-mipstx39-rtems4.8-gdb.spec b/contrib/crossrpms/rtems4.8/mipstx39/rtems-4.8-mipstx39-rtems4.8-gdb.spec
index af903fa166..d91dd2eda7 100644
--- a/contrib/crossrpms/rtems4.8/mipstx39/rtems-4.8-mipstx39-rtems4.8-gdb.spec
+++ b/contrib/crossrpms/rtems4.8/mipstx39/rtems-4.8-mipstx39-rtems4.8-gdb.spec
@@ -52,23 +52,48 @@ Name:		rtems-4.8-mipstx39-rtems4.8-gdb
 Summary:	Gdb for target mipstx39-rtems4.8
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	14%{?dist}
+Release:	15%{?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.8" == "powerpc-rtems4.8"
+%define build_sim --disable-sim
+%endif
+%endif
+
+%ifos mingw mingw32
+# Mingw lacks functions required by the simulator
+%if "mipstx39-rtems4.8" == "sparc-rtems4.8"
+%define build_sim --disable-sim
+%endif
+%if "mipstx39-rtems4.8" == "h8300-rtems4.8"
+%define build_sim --disable-sim
+%endif
+%if "%{gdb_version}" >= "6.8.50"
+%if "mipstx39-rtems4.8" == "m32c-rtems4.8"
+%define build_sim --disable-sim
+%endif
+%endif
+%if "mipstx39-rtems4.8" == "lm32-rtems4.8"
+%define build_sim --disable-sim
+%endif
+%if "mipstx39-rtems4.8" == "mipstx39-rtems4.8"
+%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,10 @@ Requires:	rtems-4.8-gdb-common
 Source0:	ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2
 %{?_without_sources:NoSource:	0}
 %if "%{gdb_version}" == "6.6"
-Patch0:		gdb-6.6-rtems4.8-20071216.diff
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.8/gdb-6.6-rtems4.8-20090724.diff
+%endif
+%if "%{gdb_version}" == "6.8"
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.8/gdb-6.8-rtems4.8-20080429.diff
 %endif
 
 %description
@@ -123,13 +151,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.8/powerpc/rtems-4.8-powerpc-rtems4.8-gdb.spec b/contrib/crossrpms/rtems4.8/powerpc/rtems-4.8-powerpc-rtems4.8-gdb.spec
index d608aeb635..2ca8cca9d4 100644
--- a/contrib/crossrpms/rtems4.8/powerpc/rtems-4.8-powerpc-rtems4.8-gdb.spec
+++ b/contrib/crossrpms/rtems4.8/powerpc/rtems-4.8-powerpc-rtems4.8-gdb.spec
@@ -52,23 +52,48 @@ Name:		rtems-4.8-powerpc-rtems4.8-gdb
 Summary:	Gdb for target powerpc-rtems4.8
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	14%{?dist}
+Release:	15%{?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 "powerpc-rtems4.8" == "powerpc-rtems4.8"
+%define build_sim --disable-sim
+%endif
+%endif
+
+%ifos mingw mingw32
+# Mingw lacks functions required by the simulator
+%if "powerpc-rtems4.8" == "sparc-rtems4.8"
+%define build_sim --disable-sim
+%endif
+%if "powerpc-rtems4.8" == "h8300-rtems4.8"
+%define build_sim --disable-sim
+%endif
+%if "%{gdb_version}" >= "6.8.50"
+%if "powerpc-rtems4.8" == "m32c-rtems4.8"
+%define build_sim --disable-sim
+%endif
+%endif
+%if "powerpc-rtems4.8" == "lm32-rtems4.8"
+%define build_sim --disable-sim
+%endif
+%if "powerpc-rtems4.8" == "mipstx39-rtems4.8"
+%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,10 @@ Requires:	rtems-4.8-gdb-common
 Source0:	ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2
 %{?_without_sources:NoSource:	0}
 %if "%{gdb_version}" == "6.6"
-Patch0:		gdb-6.6-rtems4.8-20071216.diff
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.8/gdb-6.6-rtems4.8-20090724.diff
+%endif
+%if "%{gdb_version}" == "6.8"
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.8/gdb-6.8-rtems4.8-20080429.diff
 %endif
 
 %description
@@ -123,13 +151,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.8/sh/rtems-4.8-sh-rtems4.8-gdb.spec b/contrib/crossrpms/rtems4.8/sh/rtems-4.8-sh-rtems4.8-gdb.spec
index 127037ac75..920d42cd7e 100644
--- a/contrib/crossrpms/rtems4.8/sh/rtems-4.8-sh-rtems4.8-gdb.spec
+++ b/contrib/crossrpms/rtems4.8/sh/rtems-4.8-sh-rtems4.8-gdb.spec
@@ -52,23 +52,48 @@ Name:		rtems-4.8-sh-rtems4.8-gdb
 Summary:	Gdb for target sh-rtems4.8
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	14%{?dist}
+Release:	15%{?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.8" == "powerpc-rtems4.8"
+%define build_sim --disable-sim
+%endif
+%endif
+
+%ifos mingw mingw32
+# Mingw lacks functions required by the simulator
+%if "sh-rtems4.8" == "sparc-rtems4.8"
+%define build_sim --disable-sim
+%endif
+%if "sh-rtems4.8" == "h8300-rtems4.8"
+%define build_sim --disable-sim
+%endif
+%if "%{gdb_version}" >= "6.8.50"
+%if "sh-rtems4.8" == "m32c-rtems4.8"
+%define build_sim --disable-sim
+%endif
+%endif
+%if "sh-rtems4.8" == "lm32-rtems4.8"
+%define build_sim --disable-sim
+%endif
+%if "sh-rtems4.8" == "mipstx39-rtems4.8"
+%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,10 @@ Requires:	rtems-4.8-gdb-common
 Source0:	ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2
 %{?_without_sources:NoSource:	0}
 %if "%{gdb_version}" == "6.6"
-Patch0:		gdb-6.6-rtems4.8-20071216.diff
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.8/gdb-6.6-rtems4.8-20090724.diff
+%endif
+%if "%{gdb_version}" == "6.8"
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.8/gdb-6.8-rtems4.8-20080429.diff
 %endif
 
 %description
@@ -123,13 +151,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}