Changeset 257d1e4 in rtems-source-builder

Timestamp:

08/21/14 12:40:47 (8 years ago)

Author:

Chris Johns <chrisj@…>

Branches:

4.10, 4.11, 4.9, 5, master

Children:

cd93d89

Parents:

05cea12

Message:

rtems-4.11: Fix building the SPARC simulator.

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

Files:

• rtems/config/4.11/rtems-mips.bset (modified) (1 diff)
• rtems/config/4.11/rtems-powerpc.bset (modified) (1 diff)
• rtems/config/4.11/rtems-sparc.bset (modified) (1 diff)
• source-builder/config/gdb-7-1.cfg (modified) (2 diffs)
• source-builder/sb/config.py (modified) (1 diff)

rtems/config/4.11/rtems-mips.bset

@@ -11 +11 @@
 #
 %include rtems-4.11-base.bset
+
+#
+# Simulator options.
+#
+%define gdb-sim-options --enable-sim-hardware
 
 #

rtems/config/4.11/rtems-powerpc.bset

@@ -11 +11 @@
 #
 %include rtems-4.11-base.bset
+
+#
+# Simulator options.
+#
+%define gdb-sim-options --enable-sim-hardware --enable-timebase --enable-sim-trace
 
 #

rtems/config/4.11/rtems-sparc.bset

@@ -21 +21 @@
 # If Windows (MinGW) do not build the simulator.
 #
-%if %{_build_os} == win32
- %define gdb-disable-sim
-%endif
+%define win32-gdb-disable-sim
 
 #

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

@@ -19 +19 @@
 %ifn %{defined gdb-disable-sim}
  %define gdb-disable-sim 0
+%else
+ %undefine gdb-sim-options
 %endif
 
@@ -91 +93 @@
     --disable-werror \
     %{!?gdb-disable-sim:--enable-sim}%{?gdb-disable-sim:--disable-sim} \
+    %{?gdb-sim-options:%{gdb-sim-options}} \
     --without-zlib \
     --with-expat \

source-builder/sb/config.py

@@ -532 +532 @@
                     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