sim: rx: merge with common configure script

Move the unique configure flag to acinclude.m4 so the common code
can include it, then delete the rx configure logic entirely.

1 files changed, 45 insertions, 4 deletions

diff --git a/sim/configure b/sim/configure
index d07ba35..d2b57f8 100755
--- a/sim/configure
+++ b/sim/configure
@@ -638,6 +638,7 @@ enable_option_checking=no
 ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
+SIM_RX_CYCLE_ACCURATE_FLAGS
 sim_reserved_bits
 sim_default_model
 sim_scache
@@ -837,6 +838,7 @@ enable_sim_trace
 enable_werror
 enable_build_warnings
 enable_sim_build_warnings
+enable_sim_rx_cycle_accurate
 '
       ac_precious_vars='build_alias
 host_alias
@@ -858,7 +860,6 @@ mips
 mn10300
 or1k
 riscv
-rx
 erc32
 ppc
 v850'
@@ -1523,6 +1524,8 @@ Optional Features:
   --enable-sim-build-warnings
                           enable SIM specific build-time compiler warnings if
                           gcc is used
+  --disable-sim-rx-cycle-accurate
+                          Disable cycle accurate simulation (faster runtime)
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -12038,7 +12041,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12041 "configure"
+#line 12044 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12144,7 +12147,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12147 "configure"
+#line 12150 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13740,8 +13743,11 @@ subdirs="$subdirs bfin"
       if test "${targ}" = "${target}"; then
         SIM_PRIMARY_TARGET=rx
       fi
-            subdirs="$subdirs rx"
+            ac_config_files="$ac_config_files rx/Makefile.sim:rx/Makefile.in"
 
+    ac_config_commands="$ac_config_commands rx/Makefile"
+
+    as_fn_append SIM_SUBDIRS " rx"
 
     ac_config_commands="$ac_config_commands depdir-rx"
 
@@ -14242,6 +14248,27 @@ fi
 
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether sim rx should be cycle accurate" >&5
+$as_echo_n "checking whether sim rx should be cycle accurate... " >&6; }
+# Check whether --enable-sim-rx-cycle-accurate was given.
+if test "${enable_sim_rx_cycle_accurate+set}" = set; then :
+  enableval=$enable_sim_rx_cycle_accurate; case "${enableval}" in
+yes | no) ;;
+*)	as_fn_error $? "bad value ${enableval} given for --enable-sim-rx-cycle-accurate option" "$LINENO" 5 ;;
+esac
+fi
+
+if test "x${enable_sim_rx_cycle_accurate}" != xno; then
+  SIM_RX_CYCLE_ACCURATE_FLAGS="-DCYCLE_ACCURATE"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
 ac_config_files="$ac_config_files arch-subdir.mk Makefile"
 
 cat >confcache <<\_ACEOF
@@ -15339,6 +15366,8 @@ do
     "rl78/Makefile.sim") CONFIG_FILES="$CONFIG_FILES rl78/Makefile.sim:rl78/Makefile.in" ;;
     "rl78/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS rl78/Makefile" ;;
     "depdir-rl78") CONFIG_COMMANDS="$CONFIG_COMMANDS depdir-rl78" ;;
+    "rx/Makefile.sim") CONFIG_FILES="$CONFIG_FILES rx/Makefile.sim:rx/Makefile.in" ;;
+    "rx/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS rx/Makefile" ;;
     "depdir-rx") CONFIG_COMMANDS="$CONFIG_COMMANDS depdir-rx" ;;
     "sh/Makefile.sim") CONFIG_FILES="$CONFIG_FILES sh/Makefile.sim:sh/Makefile.in" ;;
     "sh/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS sh/Makefile" ;;
@@ -16884,6 +16913,18 @@ $as_echo X"$file" |
  rm -f rl78/Makesim1.tmp rl78/Makesim2.tmp
  ;;
     "depdir-rl78":C) $SHELL $ac_aux_dir/mkinstalldirs rl78/$DEPDIR ;;
+    "rx/Makefile":C) sed -n \
+	-e '/^## COMMON_PRE_/,/^## End COMMON_PRE_/ {
+		/^srcdir / { s:= := ../:; s:$:/rx:; }
+		p
+	}' \
+	<Make-common.sim >rx/Makesim1.tmp
+ sed -n -e '/^## COMMON_POST_/,/^## End COMMON_POST_/ p' <Make-common.sim >rx/Makesim2.tmp
+ sed -e '/^## COMMON_PRE_/ r rx/Makesim1.tmp' \
+	-e '/^## COMMON_POST_/ r rx/Makesim2.tmp' \
+	<rx/Makefile.sim >rx/Makefile
+ rm -f rx/Makesim1.tmp rx/Makesim2.tmp
+ ;;
     "depdir-rx":C) $SHELL $ac_aux_dir/mkinstalldirs rx/$DEPDIR ;;
     "sh/Makefile":C) sed -n \
 	-e '/^## COMMON_PRE_/,/^## End COMMON_PRE_/ {