rtems-4.11: Fix building the SPARC simulator.

Add support for simulator options to enable special features of
some gdb simulators.

rtems/config/4.11/rtems-mips.bset

@@ -11,6 +11,11 @@
 #
 %include rtems-4.11-base.bset
 
+#
+# Simulator options.
+#
+%define gdb-sim-options --enable-sim-hardware
+
 #
 # If Windows (MinGW) do not build the simulator.
 #

rtems/config/4.11/rtems-powerpc.bset

@@ -11,6 +11,11 @@
 #
 %include rtems-4.11-base.bset
 
+#
+# Simulator options.
+#
+%define gdb-sim-options --enable-sim-hardware --enable-timebase --enable-sim-trace
+
 #
 # If Windows (MinGW) do not build the simulator.
 #

rtems/config/4.11/rtems-sparc.bset

@@ -20,9 +20,7 @@
 #
 # If Windows (MinGW) do not build the simulator.
 #
-%if %{_build_os} == win32
+%define win32-gdb-disable-sim
- %define gdb-disable-sim
-%endif
 
 #
 # Tools configuration.

source-builder/config/gdb-7-1.cfg

@@ -18,6 +18,8 @@
 #
 %ifn %{defined gdb-disable-sim}
  %define gdb-disable-sim 0
+%else
+ %undefine gdb-sim-options
 %endif
 
 %include %{_configdir}/checks.cfg
@@ -90,6 +92,7 @@ BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
     --disable-win32-registry \
     --disable-werror \
     %{!?gdb-disable-sim:--enable-sim}%{?gdb-disable-sim:--disable-sim} \
+    %{?gdb-sim-options:%{gdb-sim-options}} \
     --without-zlib \
     --with-expat \
     %{!?without_python:--with-python} \

source-builder/sb/config.py

@@ -531,7 +531,7 @@ class file:
                         log.warning('malformed expand macro, no colon found')
                     else:
                         e = self._expand(m[colon + 1:-1].strip())
-                        s = s.replace(m, e)
+                        s = s.replace(m, self._label(e))
                         expanded = True
                         mn = None
                 elif m.startswith('%{with '):