Regenerate.

13 files changed, 130 insertions, 104 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 67ef1f41a4..04b3d15cbc 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
@@ -52,7 +52,7 @@ Name:		rtems-4.10-arm-rtems4.10-gdb
 Summary:	Gdb for target arm-rtems4.10
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	7%{?dist}
+Release:	8%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -60,10 +60,13 @@ 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.10" == "powerpc-rtems4.10") && ("%{_build}" != "%{_host}")
+%if "arm-rtems4.10" == "powerpc-rtems4.10"
 %define build_sim --disable-sim
 %endif
+%endif
+
 %ifos mingw mingw32
 # Mingw lacks functions required by the simulator
 %if "arm-rtems4.10" == "sparc-rtems4.10"
@@ -72,18 +75,17 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %if "arm-rtems4.10" == "h8300-rtems4.10"
 %define build_sim --disable-sim
 %endif
+%if "arm-rtems4.10" == "mipstx39-rtems4.10"
+%define build_sim --disable-sim
+%endif
 %endif
 
 %if "%{gdb_version}" >= "6.6"
 # suse
-%if "%{?suse}"
-%if "%{?suse}" >= "10.3"
+%if 0%{?suse}
 BuildRequires: libexpat-devel
 %else
-BuildRequires: expat
-%endif
-%else
-# fedora/redhat/cygwin
+# Fedora/CentOS/Cygwin/MinGW
 BuildRequires: %{_host_rpmprefix}expat-devel
 %endif
 %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 6b28169757..f3ec64bd84 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
@@ -52,7 +52,7 @@ Name:		rtems-4.10-avr-rtems4.10-gdb
 Summary:	Gdb for target avr-rtems4.10
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	7%{?dist}
+Release:	8%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -60,10 +60,13 @@ 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.10" == "powerpc-rtems4.10") && ("%{_build}" != "%{_host}")
+%if "avr-rtems4.10" == "powerpc-rtems4.10"
 %define build_sim --disable-sim
 %endif
+%endif
+
 %ifos mingw mingw32
 # Mingw lacks functions required by the simulator
 %if "avr-rtems4.10" == "sparc-rtems4.10"
@@ -72,18 +75,17 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %if "avr-rtems4.10" == "h8300-rtems4.10"
 %define build_sim --disable-sim
 %endif
+%if "avr-rtems4.10" == "mipstx39-rtems4.10"
+%define build_sim --disable-sim
+%endif
 %endif
 
 %if "%{gdb_version}" >= "6.6"
 # suse
-%if "%{?suse}"
-%if "%{?suse}" >= "10.3"
+%if 0%{?suse}
 BuildRequires: libexpat-devel
 %else
-BuildRequires: expat
-%endif
-%else
-# fedora/redhat/cygwin
+# Fedora/CentOS/Cygwin/MinGW
 BuildRequires: %{_host_rpmprefix}expat-devel
 %endif
 %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 26dd99e05c..ae995aec6c 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
@@ -52,7 +52,7 @@ Name:		rtems-4.10-bfin-rtems4.10-gdb
 Summary:	Gdb for target bfin-rtems4.10
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -60,10 +60,13 @@ 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.10" == "powerpc-rtems4.10") && ("%{_build}" != "%{_host}")
+%if "bfin-rtems4.10" == "powerpc-rtems4.10"
 %define build_sim --disable-sim
 %endif
+%endif
+
 %ifos mingw mingw32
 # Mingw lacks functions required by the simulator
 %if "bfin-rtems4.10" == "sparc-rtems4.10"
@@ -72,18 +75,17 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %if "bfin-rtems4.10" == "h8300-rtems4.10"
 %define build_sim --disable-sim
 %endif
+%if "bfin-rtems4.10" == "mipstx39-rtems4.10"
+%define build_sim --disable-sim
+%endif
 %endif
 
 %if "%{gdb_version}" >= "6.6"
 # suse
-%if "%{?suse}"
-%if "%{?suse}" >= "10.3"
+%if 0%{?suse}
 BuildRequires: libexpat-devel
 %else
-BuildRequires: expat
-%endif
-%else
-# fedora/redhat/cygwin
+# Fedora/CentOS/Cygwin/MinGW
 BuildRequires: %{_host_rpmprefix}expat-devel
 %endif
 %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 b303685e6b..53106a4596 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
@@ -52,7 +52,7 @@ Name:		rtems-4.10-h8300-rtems4.10-gdb
 Summary:	Gdb for target h8300-rtems4.10
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	7%{?dist}
+Release:	8%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -60,10 +60,13 @@ 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.10" == "powerpc-rtems4.10") && ("%{_build}" != "%{_host}")
+%if "h8300-rtems4.10" == "powerpc-rtems4.10"
 %define build_sim --disable-sim
 %endif
+%endif
+
 %ifos mingw mingw32
 # Mingw lacks functions required by the simulator
 %if "h8300-rtems4.10" == "sparc-rtems4.10"
@@ -72,18 +75,17 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %if "h8300-rtems4.10" == "h8300-rtems4.10"
 %define build_sim --disable-sim
 %endif
+%if "h8300-rtems4.10" == "mipstx39-rtems4.10"
+%define build_sim --disable-sim
+%endif
 %endif
 
 %if "%{gdb_version}" >= "6.6"
 # suse
-%if "%{?suse}"
-%if "%{?suse}" >= "10.3"
+%if 0%{?suse}
 BuildRequires: libexpat-devel
 %else
-BuildRequires: expat
-%endif
-%else
-# fedora/redhat/cygwin
+# Fedora/CentOS/Cygwin/MinGW
 BuildRequires: %{_host_rpmprefix}expat-devel
 %endif
 %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 caafea3720..9b86cb7309 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
@@ -52,7 +52,7 @@ Name:		rtems-4.10-i386-rtems4.10-gdb
 Summary:	Gdb for target i386-rtems4.10
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	7%{?dist}
+Release:	8%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -60,10 +60,13 @@ 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.10" == "powerpc-rtems4.10") && ("%{_build}" != "%{_host}")
+%if "i386-rtems4.10" == "powerpc-rtems4.10"
 %define build_sim --disable-sim
 %endif
+%endif
+
 %ifos mingw mingw32
 # Mingw lacks functions required by the simulator
 %if "i386-rtems4.10" == "sparc-rtems4.10"
@@ -72,18 +75,17 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %if "i386-rtems4.10" == "h8300-rtems4.10"
 %define build_sim --disable-sim
 %endif
+%if "i386-rtems4.10" == "mipstx39-rtems4.10"
+%define build_sim --disable-sim
+%endif
 %endif
 
 %if "%{gdb_version}" >= "6.6"
 # suse
-%if "%{?suse}"
-%if "%{?suse}" >= "10.3"
+%if 0%{?suse}
 BuildRequires: libexpat-devel
 %else
-BuildRequires: expat
-%endif
-%else
-# fedora/redhat/cygwin
+# Fedora/CentOS/Cygwin/MinGW
 BuildRequires: %{_host_rpmprefix}expat-devel
 %endif
 %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 5de2e84172..7570d07831 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
@@ -52,7 +52,7 @@ Name:		rtems-4.10-m32c-rtems4.10-gdb
 Summary:	Gdb for target m32c-rtems4.10
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	7%{?dist}
+Release:	8%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -60,10 +60,13 @@ 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 ("m32c-rtems4.10" == "powerpc-rtems4.10") && ("%{_build}" != "%{_host}")
+%if "m32c-rtems4.10" == "powerpc-rtems4.10"
 %define build_sim --disable-sim
 %endif
+%endif
+
 %ifos mingw mingw32
 # Mingw lacks functions required by the simulator
 %if "m32c-rtems4.10" == "sparc-rtems4.10"
@@ -72,18 +75,17 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %if "m32c-rtems4.10" == "h8300-rtems4.10"
 %define build_sim --disable-sim
 %endif
+%if "m32c-rtems4.10" == "mipstx39-rtems4.10"
+%define build_sim --disable-sim
+%endif
 %endif
 
 %if "%{gdb_version}" >= "6.6"
 # suse
-%if "%{?suse}"
-%if "%{?suse}" >= "10.3"
+%if 0%{?suse}
 BuildRequires: libexpat-devel
 %else
-BuildRequires: expat
-%endif
-%else
-# fedora/redhat/cygwin
+# Fedora/CentOS/Cygwin/MinGW
 BuildRequires: %{_host_rpmprefix}expat-devel
 %endif
 %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 dfb23606f3..f0fe5d5d38 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
@@ -52,7 +52,7 @@ Name:		rtems-4.10-m32r-rtems4.10-gdb
 Summary:	Gdb for target m32r-rtems4.10
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	7%{?dist}
+Release:	8%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -60,10 +60,13 @@ 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 ("m32r-rtems4.10" == "powerpc-rtems4.10") && ("%{_build}" != "%{_host}")
+%if "m32r-rtems4.10" == "powerpc-rtems4.10"
 %define build_sim --disable-sim
 %endif
+%endif
+
 %ifos mingw mingw32
 # Mingw lacks functions required by the simulator
 %if "m32r-rtems4.10" == "sparc-rtems4.10"
@@ -72,18 +75,17 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %if "m32r-rtems4.10" == "h8300-rtems4.10"
 %define build_sim --disable-sim
 %endif
+%if "m32r-rtems4.10" == "mipstx39-rtems4.10"
+%define build_sim --disable-sim
+%endif
 %endif
 
 %if "%{gdb_version}" >= "6.6"
 # suse
-%if "%{?suse}"
-%if "%{?suse}" >= "10.3"
+%if 0%{?suse}
 BuildRequires: libexpat-devel
 %else
-BuildRequires: expat
-%endif
-%else
-# fedora/redhat/cygwin
+# Fedora/CentOS/Cygwin/MinGW
 BuildRequires: %{_host_rpmprefix}expat-devel
 %endif
 %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 d1cc995e53..2d782f9706 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
@@ -52,7 +52,7 @@ Name:		rtems-4.10-m68k-rtems4.10-gdb
 Summary:	Gdb for target m68k-rtems4.10
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	7%{?dist}
+Release:	8%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -60,10 +60,13 @@ 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.10" == "powerpc-rtems4.10") && ("%{_build}" != "%{_host}")
+%if "m68k-rtems4.10" == "powerpc-rtems4.10"
 %define build_sim --disable-sim
 %endif
+%endif
+
 %ifos mingw mingw32
 # Mingw lacks functions required by the simulator
 %if "m68k-rtems4.10" == "sparc-rtems4.10"
@@ -72,18 +75,17 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %if "m68k-rtems4.10" == "h8300-rtems4.10"
 %define build_sim --disable-sim
 %endif
+%if "m68k-rtems4.10" == "mipstx39-rtems4.10"
+%define build_sim --disable-sim
+%endif
 %endif
 
 %if "%{gdb_version}" >= "6.6"
 # suse
-%if "%{?suse}"
-%if "%{?suse}" >= "10.3"
+%if 0%{?suse}
 BuildRequires: libexpat-devel
 %else
-BuildRequires: expat
-%endif
-%else
-# fedora/redhat/cygwin
+# Fedora/CentOS/Cygwin/MinGW
 BuildRequires: %{_host_rpmprefix}expat-devel
 %endif
 %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 b33f7073dc..d86f3b5bb7 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
@@ -52,7 +52,7 @@ Name:		rtems-4.10-mips-rtems4.10-gdb
 Summary:	Gdb for target mips-rtems4.10
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	7%{?dist}
+Release:	8%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -60,10 +60,13 @@ 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.10" == "powerpc-rtems4.10") && ("%{_build}" != "%{_host}")
+%if "mips-rtems4.10" == "powerpc-rtems4.10"
 %define build_sim --disable-sim
 %endif
+%endif
+
 %ifos mingw mingw32
 # Mingw lacks functions required by the simulator
 %if "mips-rtems4.10" == "sparc-rtems4.10"
@@ -72,18 +75,17 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %if "mips-rtems4.10" == "h8300-rtems4.10"
 %define build_sim --disable-sim
 %endif
+%if "mips-rtems4.10" == "mipstx39-rtems4.10"
+%define build_sim --disable-sim
+%endif
 %endif
 
 %if "%{gdb_version}" >= "6.6"
 # suse
-%if "%{?suse}"
-%if "%{?suse}" >= "10.3"
+%if 0%{?suse}
 BuildRequires: libexpat-devel
 %else
-BuildRequires: expat
-%endif
-%else
-# fedora/redhat/cygwin
+# Fedora/CentOS/Cygwin/MinGW
 BuildRequires: %{_host_rpmprefix}expat-devel
 %endif
 %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 68d92923d2..9040bce1db 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
@@ -52,7 +52,7 @@ Name:		rtems-4.10-mipstx39-rtems4.10-gdb
 Summary:	Gdb for target mipstx39-rtems4.10
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	7%{?dist}
+Release:	8%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -60,10 +60,13 @@ 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.10" == "powerpc-rtems4.10") && ("%{_build}" != "%{_host}")
+%if "mipstx39-rtems4.10" == "powerpc-rtems4.10"
 %define build_sim --disable-sim
 %endif
+%endif
+
 %ifos mingw mingw32
 # Mingw lacks functions required by the simulator
 %if "mipstx39-rtems4.10" == "sparc-rtems4.10"
@@ -72,18 +75,17 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %if "mipstx39-rtems4.10" == "h8300-rtems4.10"
 %define build_sim --disable-sim
 %endif
+%if "mipstx39-rtems4.10" == "mipstx39-rtems4.10"
+%define build_sim --disable-sim
+%endif
 %endif
 
 %if "%{gdb_version}" >= "6.6"
 # suse
-%if "%{?suse}"
-%if "%{?suse}" >= "10.3"
+%if 0%{?suse}
 BuildRequires: libexpat-devel
 %else
-BuildRequires: expat
-%endif
-%else
-# fedora/redhat/cygwin
+# Fedora/CentOS/Cygwin/MinGW
 BuildRequires: %{_host_rpmprefix}expat-devel
 %endif
 %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 d2affa0f4e..b68ecffba6 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
@@ -52,7 +52,7 @@ Name:		rtems-4.10-powerpc-rtems4.10-gdb
 Summary:	Gdb for target powerpc-rtems4.10
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	7%{?dist}
+Release:	8%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -60,10 +60,13 @@ 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.10" == "powerpc-rtems4.10") && ("%{_build}" != "%{_host}")
+%if "powerpc-rtems4.10" == "powerpc-rtems4.10"
 %define build_sim --disable-sim
 %endif
+%endif
+
 %ifos mingw mingw32
 # Mingw lacks functions required by the simulator
 %if "powerpc-rtems4.10" == "sparc-rtems4.10"
@@ -72,18 +75,17 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %if "powerpc-rtems4.10" == "h8300-rtems4.10"
 %define build_sim --disable-sim
 %endif
+%if "powerpc-rtems4.10" == "mipstx39-rtems4.10"
+%define build_sim --disable-sim
+%endif
 %endif
 
 %if "%{gdb_version}" >= "6.6"
 # suse
-%if "%{?suse}"
-%if "%{?suse}" >= "10.3"
+%if 0%{?suse}
 BuildRequires: libexpat-devel
 %else
-BuildRequires: expat
-%endif
-%else
-# fedora/redhat/cygwin
+# Fedora/CentOS/Cygwin/MinGW
 BuildRequires: %{_host_rpmprefix}expat-devel
 %endif
 %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 0c2c7871b2..1e95c608c6 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
@@ -52,7 +52,7 @@ Name:		rtems-4.10-sh-rtems4.10-gdb
 Summary:	Gdb for target sh-rtems4.10
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	7%{?dist}
+Release:	8%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -60,10 +60,13 @@ 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.10" == "powerpc-rtems4.10") && ("%{_build}" != "%{_host}")
+%if "sh-rtems4.10" == "powerpc-rtems4.10"
 %define build_sim --disable-sim
 %endif
+%endif
+
 %ifos mingw mingw32
 # Mingw lacks functions required by the simulator
 %if "sh-rtems4.10" == "sparc-rtems4.10"
@@ -72,18 +75,17 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %if "sh-rtems4.10" == "h8300-rtems4.10"
 %define build_sim --disable-sim
 %endif
+%if "sh-rtems4.10" == "mipstx39-rtems4.10"
+%define build_sim --disable-sim
+%endif
 %endif
 
 %if "%{gdb_version}" >= "6.6"
 # suse
-%if "%{?suse}"
-%if "%{?suse}" >= "10.3"
+%if 0%{?suse}
 BuildRequires: libexpat-devel
 %else
-BuildRequires: expat
-%endif
-%else
-# fedora/redhat/cygwin
+# Fedora/CentOS/Cygwin/MinGW
 BuildRequires: %{_host_rpmprefix}expat-devel
 %endif
 %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 2247ed0190..b0436de768 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
@@ -52,7 +52,7 @@ Name:		rtems-4.10-sparc-rtems4.10-gdb
 Summary:	Gdb for target sparc-rtems4.10
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	7%{?dist}
+Release:	8%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -60,10 +60,13 @@ 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.10" == "powerpc-rtems4.10") && ("%{_build}" != "%{_host}")
+%if "sparc-rtems4.10" == "powerpc-rtems4.10"
 %define build_sim --disable-sim
 %endif
+%endif
+
 %ifos mingw mingw32
 # Mingw lacks functions required by the simulator
 %if "sparc-rtems4.10" == "sparc-rtems4.10"
@@ -72,18 +75,17 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %if "sparc-rtems4.10" == "h8300-rtems4.10"
 %define build_sim --disable-sim
 %endif
+%if "sparc-rtems4.10" == "mipstx39-rtems4.10"
+%define build_sim --disable-sim
+%endif
 %endif
 
 %if "%{gdb_version}" >= "6.6"
 # suse
-%if "%{?suse}"
-%if "%{?suse}" >= "10.3"
+%if 0%{?suse}
 BuildRequires: libexpat-devel
 %else
-BuildRequires: expat
-%endif
-%else
-# fedora/redhat/cygwin
+# Fedora/CentOS/Cygwin/MinGW
 BuildRequires: %{_host_rpmprefix}expat-devel
 %endif
 %endif