[PATCH/committed] sim: rx: scope the unique configure flag

Message ID 20210620051425.27899-1-vapier@gentoo.org
State New
Headers show
Series
  • [PATCH/committed] sim: rx: scope the unique configure flag
Related show

Commit Message

Eli Zaretskii via Gdb-patches June 20, 2021, 5:14 a.m.
This will make it possible to merge into the common configure by
making sure we never collide with other arches.
---
 sim/rx/ChangeLog    |  7 +++++++
 sim/rx/Makefile.in  |  2 +-
 sim/rx/configure    | 28 ++++++++++++++++------------
 sim/rx/configure.ac | 19 ++++++++++---------
 4 files changed, 34 insertions(+), 22 deletions(-)

-- 
2.31.1

Patch

diff --git a/sim/rx/ChangeLog b/sim/rx/ChangeLog
index e27cba46a62c..f1c0a29d7950 100644
--- a/sim/rx/ChangeLog
+++ b/sim/rx/ChangeLog
@@ -1,3 +1,10 @@ 
+2021-06-20  Mike Frysinger  <vapier@gentoo.org>
+
+	* Makefile.in: Rename sim_cycle_accurate_flags to
+	sim_rx_cycle_accurate_flags.
+	* configure.ac: Likewise.
+	* configure: Regenerate.
+
 2021-06-20  Mike Frysinger  <vapier@gentoo.org>
 
 	* configure.ac (SIM_AC_COMMON): Delete.
diff --git a/sim/rx/Makefile.in b/sim/rx/Makefile.in
index 799febd61b5c..b1023dd2b9cf 100644
--- a/sim/rx/Makefile.in
+++ b/sim/rx/Makefile.in
@@ -20,7 +20,7 @@ 
 
 ## COMMON_PRE_CONFIG_FRAG
 
-SIM_EXTRA_CFLAGS = @sim_cycle_accurate_flags@
+SIM_EXTRA_CFLAGS = @sim_rx_cycle_accurate_flags@
 
 SIM_RUN_OBJS = \
 	main.o \
diff --git a/sim/rx/configure.ac b/sim/rx/configure.ac
index 78fc33bac37a..2f012f981487 100644
--- a/sim/rx/configure.ac
+++ b/sim/rx/configure.ac
@@ -21,19 +21,20 @@  dnl
 AC_INIT(Makefile.in)
 AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])
 
-AC_ARG_ENABLE(cycle-accurate,
-[AS_HELP_STRING([--disable-cycle-accurate],
+AC_MSG_CHECKING([whether sim rx should be cycle accurate])
+AC_ARG_ENABLE(sim-rx-cycle-accurate,
+[AS_HELP_STRING([--disable-sim-rx-cycle-accurate],
 		[Disable cycle accurate simulation (faster runtime)])],
 [case "${enableval}" in
 yes | no) ;;
-*)	AC_MSG_ERROR(bad value ${enableval} given for --enable-cycle-accurate option) ;;
+*)	AC_MSG_ERROR(bad value ${enableval} given for --enable-sim-rx-cycle-accurate option) ;;
 esac])
-
-echo enable_cycle_accurate is $enable_cycle_accurate
-
-if test "x${enable_cycle_accurate}" != xno; then
-  sim_cycle_accurate_flags="-DCYCLE_ACCURATE"
+if test "x${enable_sim_rx_cycle_accurate}" != xno; then
+  sim_rx_cycle_accurate_flags="-DCYCLE_ACCURATE"
+  AC_MSG_RESULT([yes])
+else
+  AC_MSG_RESULT([no])
 fi
-AC_SUBST(sim_cycle_accurate_flags)
+AC_SUBST(sim_rx_cycle_accurate_flags)
 
 SIM_AC_OUTPUT