Fix test step-and-next-inline.cc

[binutils-gdb.git] / sim / configure.ac

diff --git a/sim/configure.ac b/sim/configure.ac
index 7e6d01360b6e69e75ad803011b66e1a79f4de3eb..5d36e5556d342d922b31413f6fc0db25ff5f9ae9 100644 (file)
--- a/sim/configure.ac
+++ b/sim/configure.ac
@@ -107,6 +107,9 @@ dnl WHEN ADDING ENTRIES TO THIS MATRIX:
 dnl Make sure that the left side always has two dashes.  Otherwise you can get
 dnl spurious matches.  Even for unambiguous cases, do this as a convention, else
 dnl the table becomes a real mess to understand and maintain.
+dnl
+dnl NB: Target matching is aligned with gdb/configure.tgt.  Changes must be kept
+dnl in sync with that file.
 if test "${enable_sim}" != no; then
   sim_igen=no
   for targ in `echo $target $enable_targets | sed 's/,/ /g'`
@@ -117,30 +120,30 @@ if test "${enable_sim}" != no; then
     SIM_TARGET([bfin-*-*], [bfin])
     SIM_TARGET([bpf-*-*], [bpf], [true])
     SIM_TARGET([cr16*-*-*], [cr16])
-    SIM_TARGET([cris-*-* | crisv32-*-*], [cris], [true])
+    SIM_TARGET([cris-*-* | crisv32-*-*], [cris])
     SIM_TARGET([d10v-*-*], [d10v])
-    SIM_TARGET([frv-*-*], [frv], [true])
+    SIM_TARGET([frv-*-*], [frv])
     SIM_TARGET([ft32-*-*], [ft32])
     SIM_TARGET([h8300*-*-*], [h8300])
-    SIM_TARGET([iq2000-*-*], [iq2000], [true])
-    SIM_TARGET([lm32-*-*], [lm32], [true])
+    SIM_TARGET([iq2000-*-*], [iq2000])
+    SIM_TARGET([lm32-*-*], [lm32])
     SIM_TARGET([m32c-*-*], [m32c])
-    SIM_TARGET([m32r-*-*], [m32r], [true])
+    SIM_TARGET([m32r-*-*], [m32r])
     SIM_TARGET([m68hc11-*-*|m6811-*-*], [m68hc11])
     SIM_TARGET([mcore-*-*], [mcore])
-    SIM_TARGET([microblaze-*-*], [microblaze])
+    SIM_TARGET([microblaze*-*-*], [microblaze])
     SIM_TARGET([mips*-*-*], [mips], [true], [sim_igen=yes])
     SIM_TARGET([mn10300*-*-*], [mn10300], [true], [sim_igen=yes])
     SIM_TARGET([moxie-*-*], [moxie])
     SIM_TARGET([msp430*-*-*], [msp430])
-    SIM_TARGET([or1k-*-* | or1knd-*-*], [or1k], [true])
+    SIM_TARGET([or1k*-*-*], [or1k], [true])
+    SIM_TARGET([powerpc*-*-*], [ppc], [true])
     SIM_TARGET([pru*-*-*], [pru])
     SIM_TARGET([riscv*-*-*], [riscv], [true])
     SIM_TARGET([rl78-*-*], [rl78])
     SIM_TARGET([rx-*-*], [rx])
     SIM_TARGET([sh*-*-*], [sh])
-    SIM_TARGET([sparc-*-rtems*|sparc-*-elf*], [erc32])
-    SIM_TARGET([powerpc*-*-*], [ppc], [true])
+    SIM_TARGET([sparc-*-*], [erc32])
     SIM_TARGET([v850*-*-*], [v850], [true], [sim_igen=yes])
   done
 
@@ -161,6 +164,7 @@ SIM_AC_OPTION_ENVIRONMENT
 SIM_AC_OPTION_HARDWARE
 SIM_AC_OPTION_INLINE
 SIM_AC_OPTION_PROFILE
+SIM_AC_OPTION_RESERVED_BITS
 SIM_AC_OPTION_SCACHE
 SIM_AC_OPTION_STDIO
 SIM_AC_OPTION_TRACE
@@ -172,9 +176,9 @@ dnl when the rest of the code is in the respective macros.  Once we merge the
 dnl respective SIM_AC_OPTION_xxx call above, we can drop these.
 AC_SUBST(sim_bitsize)
 AC_SUBST(sim_float)
-AC_SUBST(sim_reserved_bits)
 
 dnl Some arches have unique configure flags.
+m4_include([frv/acinclude.m4])
 m4_include([rx/acinclude.m4])
 
 AC_CONFIG_FILES([arch-subdir.mk Makefile])