Also check e_machine when merging sections

[deliverable/binutils-gdb.git] / sim / mn10300 / configure

diff --git a/sim/mn10300/configure b/sim/mn10300/configure
index 54425b1c642df5a79d118c3fee3fb653f2496b85..703063f93d5a05be804561f1ff198045eda6ed6b 100755 (executable)
--- a/sim/mn10300/configure
+++ b/sim/mn10300/configure
@@ -1407,23 +1407,34 @@ Optional Features:
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --enable-maintainer-mode  enable make rules and dependencies not useful
                          (and sometimes confusing) to the casual installer
-  --enable-sim-bswap                   Use Host specific BSWAP instruction.
-  --enable-sim-cflags=opts             Extra CFLAGS for use in building simulator
-  --enable-sim-debug=opts              Enable debugging flags
-  --enable-sim-stdio                   Specify whether to use stdio for console input/output.
-  --enable-sim-trace=opts              Enable tracing flags
-  --enable-sim-profile=opts            Enable profiling flags
-  --enable-sim-endian=endian           Specify target byte endian orientation.
-  --enable-sim-alignment=align         Specify strict,  nonstrict or forced alignment of memory accesses.
-  --enable-sim-hostendian=end          Specify host byte endian orientation.
+  --enable-sim-bswap      Use Host specific BSWAP instruction
+  --enable-sim-cflags=opts
+                          Extra CFLAGS for use in building simulator
+  --enable-sim-debug=opts Enable debugging flags (for developers of the sim
+                          itself)
+  --enable-sim-stdio      Specify whether to use stdio for console
+                          input/output
+  --enable-sim-trace=opts Enable tracing of simulated programs
+  --enable-sim-profile=opts
+                          Enable profiling flags
+  --enable-sim-endian=endian
+                          Specify target byte endian orientation
+  --enable-sim-alignment=align
+                          Specify strict, nonstrict or forced alignment of
+                          memory accesses
+  --enable-sim-hostendian=end
+                          Specify host byte endian orientation
   --enable-werror         treat compile warnings as errors
   --enable-build-warnings enable build-time compiler warnings if gcc is used
   --enable-sim-build-warnings
                           enable SIM specific build-time compiler warnings if
                           gcc is used
-  --enable-sim-reserved-bits           Specify whether to check reserved bits in instruction.
-  --enable-sim-bitsize=N               Specify target bitsize (32 or 64).
-  --enable-sim-inline=inlines          Specify which functions should be inlined.
+  --enable-sim-reserved-bits
+                          Specify whether to check reserved bits in
+                          instruction
+  --enable-sim-bitsize=N  Specify target bitsize (32 or 64)
+  --enable-sim-inline=inlines
+                          Specify which functions should be inlined
   --enable-sim-hardware=LIST
                           Specify the hardware to be included in the build.
 
@@ -2232,7 +2243,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 # SIM_AC_OUTPUT is a cover function to AC_OUTPUT to generate the Makefile.
 # It is intended to be invoked last.
 #
-# The simulator's configure.in should look like:
+# The simulator's configure.ac should look like:
 #
 # dnl Process this file with autoconf to produce a configure script.
 # AC_PREREQ(2.64)dnl
@@ -12311,7 +12322,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12314 "configure"
+#line 12325 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12417,7 +12428,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12420 "configure"
+#line 12431 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12753,10 +12764,10 @@ fi
 # Check whether --enable-sim-trace was given.
 if test "${enable_sim_trace+set}" = set; then :
   enableval=$enable_sim_trace; case "${enableval}" in
-  yes) sim_trace="-DTRACE=1 -DWITH_TRACE=-1";;
-  no)  sim_trace="-DTRACE=0 -DWITH_TRACE=0";;
+  yes) sim_trace="-DWITH_TRACE=-1";;
+  no)  sim_trace="-DWITH_TRACE=0";;
   [-0-9]*)
-       sim_trace="-DTRACE='(${enableval})' -DWITH_TRACE='(${enableval})'";;
+       sim_trace="-DWITH_TRACE='(${enableval})'";;
   [[:lower:]]*)
        sim_trace=""
        for x in `echo "$enableval" | sed -e "s/,/ /g"`; do