sim: overhaul alignment settings management

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

diff --git a/sim/m32r/configure.ac b/sim/m32r/configure.ac
index f0422a2c3481887ee1872b362a15e24852b79937..a5cea83849e7bfd403d9042a5ff67ef88d276c2f 100644 (file)
--- a/sim/m32r/configure.ac
+++ b/sim/m32r/configure.ac
@@ -1,17 +1,13 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.64)dnl
 AC_INIT(Makefile.in)
-sinclude(../common/acinclude.m4)
+AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])
 
 SIM_AC_COMMON
 
-SIM_AC_OPTION_ENDIAN(BIG_ENDIAN)
-SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT)
-SIM_AC_OPTION_HOSTENDIAN
+SIM_AC_OPTION_ENDIAN(BIG)
 SIM_AC_OPTION_SCACHE(16384)
 SIM_AC_OPTION_DEFAULT_MODEL(m32r/d)
-SIM_AC_OPTION_ENVIRONMENT
-SIM_AC_OPTION_INLINE()
+SIM_AC_OPTION_WARNINGS(no)
 SIM_AC_OPTION_CGEN_MAINT
 
   case "${target_alias}" in
@@ -27,13 +23,6 @@ SIM_AC_OPTION_CGEN_MAINT
 AC_SUBST(traps_obj)
 AC_SUBST(sim_extra_cflags)
 
-SIM_AC_OPTION_HARDWARE(always,"","")
-
-if test -z "$SIM_DV_SOCKSER_O"; then
-       AC_MSG_ERROR([Sorry, but hardware support in this simulator unconditionally
-relies on dv-sockser.o which is unavailable for your host. Please fix this
-simulator.])
-fi
-
+SIM_AC_OPTION_HARDWARE(m32r_cache m32r_uart)
 
 SIM_AC_OUTPUT