Sync w/ cvs-head.

contrib/crossrpms/gdb/build.add

@@ -15,12 +15,15 @@
     --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
     --with-sysroot=%{_prefix}/@tool_target@/sys-root \
     --prefix=%{_prefix} --bindir=%{_bindir} \

contrib/crossrpms/gdb/gdb.add

@@ -12,16 +12,41 @@ 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 "@tool_target@" == "powerpc-rtems@rtems_api@"
+%define build_sim --disable-sim
+%endif
+%endif
+
+%ifos mingw mingw32
+# Mingw lacks functions required by the simulator
+%if "@tool_target@" == "sparc-rtems@rtems_api@"
+%define build_sim --disable-sim
+%endif
+%if "@tool_target@" == "h8300-rtems@rtems_api@"
+%define build_sim --disable-sim
+%endif
+%if "%{gdb_version}" >= "6.8.50"
+%if "@tool_target@" == "m32c-rtems@rtems_api@"
+%define build_sim --disable-sim
+%endif
+%endif
+%if "@tool_target@" == "lm32-rtems@rtems_api@"
+%define build_sim --disable-sim
+%endif
+%if "@tool_target@" == "mipstx39-rtems@rtems_api@"
+%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
+# Fedora/CentOS/Cygwin/MinGW
-%endif
-%else
-# fedora/redhat/cygwin
 BuildRequires: %{_host_rpmprefix}expat-devel
 %endif
 %endif