From aaa015eda065310123dccccb4632caf9d7c86086 Mon Sep 17 00:00:00 2001
From: Chris Johns <chrisj@rtems.org>
Date: Tue, 5 Aug 2014 22:54:33 +0000
Subject: [PATCH] rtems-4.11: Do not build GDB sim on MinGW32 for some targets.

They are:
  m32c
  microblaze
  mips
  moxie
  powerpc
  sparc
  v850
---
 rtems/config/4.11/rtems-m32c.bset       |  5 +++++
 rtems/config/4.11/rtems-microblaze.bset |  5 +++++
 rtems/config/4.11/rtems-mips.bset       |  5 +++++
 rtems/config/4.11/rtems-moxie.bset      |  5 +++++
 rtems/config/4.11/rtems-powerpc.bset    |  5 +++++
 rtems/config/4.11/rtems-sparc.bset      |  7 +++++++
 rtems/config/4.11/rtems-v850.bset       |  5 +++++
 source-builder/config/gdb-7-1.cfg       | 11 ++++++++++-
 8 files changed, 47 insertions(+), 1 deletion(-)

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
@@ -30,6 +30,11 @@
 %define _targetcflags -g -O0
 %define _targetcxxflags -g -O0
 
+#
+# If Windows (MinGW) do not build the simulator.
+#
+%define win32-gdb-disable-sim
+
 #
 # Tools configuration.
 #
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
@@ -17,6 +17,11 @@
 %patch add gcc %{rtems_gcc_patches}/microblaze/gcc-4.7.2-microblaze-ldscript-2.diff
 %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.
 #
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
@@ -11,6 +11,11 @@
 #
 %include rtems-4.11-base.bset
 
+#
+# If Windows (MinGW) do not build the simulator.
+#
+%define win32-gdb-disable-sim
+
 #
 # Tools configuration.
 #
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
@@ -11,6 +11,11 @@
 #
 %include rtems-4.11-base.bset
 
+#
+# If Windows (MinGW) do not build the simulator.
+#
+%define win32-gdb-disable-sim
+
 #
 # Tools configuration.
 #
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
@@ -11,6 +11,11 @@
 #
 %include rtems-4.11-base.bset
 
+#
+# If Windows (MinGW) do not build the simulator.
+#
+%define win32-gdb-disable-sim
+
 #
 # Tools configuration.
 #
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
@@ -17,6 +17,13 @@
 %patch add gdb %{rtems_gdb_patches}/sparc/gdb-7.7-sis-output-nouartrx.diff
 %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.
 #
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
@@ -11,6 +11,11 @@
 #
 %include rtems-4.11-base.bset
 
+#
+# If Windows (MinGW) do not build the simulator.
+#
+%define win32-gdb-disable-sim
+
 #
 # Tools configuration.
 #
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
@@ -4,11 +4,20 @@
 # This configuration file configure's, make's and install's gdb.
 #
 
+#
+# 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