8 files changed, 47 insertions, 1 deletions
diff --git a/rtems/config/4.11/rtems-m32c.bset b/rtems/config/4.11/rtems-m32c.bset
index 50ba2d4..9c9993d 100644
--- a/rtems/config/4.11/rtems-m32c.bset
+++ b/rtems/config/4.11/rtems-m32c.bset
@@ -31,6 +31,11 @@
 %define _targetcxxflags -g -O0
 
 #
+# If Windows (MinGW) do not build the simulator.
+#
+%define win32-gdb-disable-sim
+
+#
 # Tools configuration.
 #
 4.11/rtems-autotools
diff --git a/rtems/config/4.11/rtems-microblaze.bset b/rtems/config/4.11/rtems-microblaze.bset
index 0e74307..3dccd45 100644
--- a/rtems/config/4.11/rtems-microblaze.bset
+++ b/rtems/config/4.11/rtems-microblaze.bset
@@ -18,6 +18,11 @@
 %hash  md5 gcc-4.7.2-microblaze-ldscript-2.diff a34f87dfa792193ade7f95e0b084a262
 
 #
+# If Windows (MinGW) do not build the simulator.
+#
+%define win32-gdb-disable-sim
+
+#
 # Tools configuration.
 #
 4.11/rtems-autotools
diff --git a/rtems/config/4.11/rtems-mips.bset b/rtems/config/4.11/rtems-mips.bset
index eb03ebf..ff4cc54 100644
--- a/rtems/config/4.11/rtems-mips.bset
+++ b/rtems/config/4.11/rtems-mips.bset
@@ -12,6 +12,11 @@
 %include rtems-4.11-base.bset
 
 #
+# If Windows (MinGW) do not build the simulator.
+#
+%define win32-gdb-disable-sim
+
+#
 # Tools configuration.
 #
 4.11/rtems-autotools
diff --git a/rtems/config/4.11/rtems-moxie.bset b/rtems/config/4.11/rtems-moxie.bset
index 9d4a4b7..202d456 100644
--- a/rtems/config/4.11/rtems-moxie.bset
+++ b/rtems/config/4.11/rtems-moxie.bset
@@ -12,6 +12,11 @@
 %include rtems-4.11-base.bset
 
 #
+# If Windows (MinGW) do not build the simulator.
+#
+%define win32-gdb-disable-sim
+
+#
 # Tools configuration.
 #
 4.11/rtems-autotools
diff --git a/rtems/config/4.11/rtems-powerpc.bset b/rtems/config/4.11/rtems-powerpc.bset
index 35255fb..f592d84 100644
--- a/rtems/config/4.11/rtems-powerpc.bset
+++ b/rtems/config/4.11/rtems-powerpc.bset
@@ -12,6 +12,11 @@
 %include rtems-4.11-base.bset
 
 #
+# If Windows (MinGW) do not build the simulator.
+#
+%define win32-gdb-disable-sim
+
+#
 # Tools configuration.
 #
 4.11/rtems-autotools
diff --git a/rtems/config/4.11/rtems-sparc.bset b/rtems/config/4.11/rtems-sparc.bset
index fd10efd..fb64734 100644
--- a/rtems/config/4.11/rtems-sparc.bset
+++ b/rtems/config/4.11/rtems-sparc.bset
@@ -18,6 +18,13 @@
 %hash  md5 gdb-7.7-sis-output-nouartrx.diff bc35b15de1325f3c4461ac3cda027bea
 
 #
+# If Windows (MinGW) do not build the simulator.
+#
+%if %{_build_os} == win32
+ %define gdb-disable-sim
+%endif
+
+#
 # Tools configuration.
 #
 4.11/rtems-autotools
diff --git a/rtems/config/4.11/rtems-v850.bset b/rtems/config/4.11/rtems-v850.bset
index 87ee3dc..5646c46 100644
--- a/rtems/config/4.11/rtems-v850.bset
+++ b/rtems/config/4.11/rtems-v850.bset
@@ -12,6 +12,11 @@
 %include rtems-4.11-base.bset
 
 #
+# If Windows (MinGW) do not build the simulator.
+#
+%define win32-gdb-disable-sim
+
+#
 # Tools configuration.
 #
 4.11/rtems-autotools
diff --git a/source-builder/config/gdb-7-1.cfg b/source-builder/config/gdb-7-1.cfg
index 8e4343a..e013b08 100644
--- a/source-builder/config/gdb-7-1.cfg
+++ b/source-builder/config/gdb-7-1.cfg
@@ -5,10 +5,19 @@
 #
 
 #
+# See if the simulator has been disabled for Windows.
+#
+%if %{_host_os} == mingw32
+ %if %{defined win32-gdb-disable-sim}
+  %define gdb-disable-sim 1
+  %endif
+%endif
+
+#
 # Default to building simulators.
 #
 %ifn %{defined gdb-disable-sim}
-%define gdb-disable-sim 0
+ %define gdb-disable-sim 0
 %endif
 
 %include %{_configdir}/checks.cfg