aboutsummaryrefslogtreecommitdiff
path: root/sim
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2021-06-20 00:50:30 -0400
committerMike Frysinger <vapier@gentoo.org>2021-06-20 01:13:14 -0400
commit4488e43c4948da31fe03df5de0cd95e410a8c9e0 (patch)
treee12249302756e0036da44007f3199a6578f780a5 /sim
parent3eda63f2e4fc1c8e7a472f2db128c7acfe95bd39 (diff)
downloadgdb-4488e43c4948da31fe03df5de0cd95e410a8c9e0.zip
gdb-4488e43c4948da31fe03df5de0cd95e410a8c9e0.tar.gz
gdb-4488e43c4948da31fe03df5de0cd95e410a8c9e0.tar.bz2
sim: rx: scope the unique configure flag
This will make it possible to merge into the common configure by making sure we never collide with other arches.
Diffstat (limited to 'sim')
-rw-r--r--sim/rx/ChangeLog7
-rw-r--r--sim/rx/Makefile.in2
-rwxr-xr-xsim/rx/configure28
-rw-r--r--sim/rx/configure.ac19
4 files changed, 34 insertions, 22 deletions
diff --git a/sim/rx/ChangeLog b/sim/rx/ChangeLog
index e27cba4..f1c0a29 100644
--- a/sim/rx/ChangeLog
+++ b/sim/rx/ChangeLog
@@ -1,5 +1,12 @@
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.
* aclocal.m4, configure: Regenerate.
diff --git a/sim/rx/Makefile.in b/sim/rx/Makefile.in
index 799febd..b1023dd 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 b/sim/rx/configure
index e5fbf24..38e6ed0 100755
--- a/sim/rx/configure
+++ b/sim/rx/configure
@@ -590,7 +590,7 @@ sim_scache
sim_float
sim_bitsize
cgen_breaks
-sim_cycle_accurate_flags
+sim_rx_cycle_accurate_flags
target_alias
host_alias
build_alias
@@ -635,7 +635,7 @@ sim_hw_cflags'
ac_subst_files=''
ac_user_opts='
enable_option_checking
-enable_cycle_accurate
+enable_sim_rx_cycle_accurate
enable_sim_hardware
'
ac_precious_vars='build_alias
@@ -1248,7 +1248,7 @@ Optional Features:
--disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --disable-cycle-accurate
+ --disable-sim-rx-cycle-accurate
Disable cycle accurate simulation (faster runtime)
--enable-sim-hardware=LIST
Specify the hardware to be included in the build.
@@ -1683,19 +1683,23 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-# Check whether --enable-cycle-accurate was given.
-if test "${enable_cycle_accurate+set}" = set; then :
- enableval=$enable_cycle_accurate; case "${enableval}" in
+{ $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-cycle-accurate option" "$LINENO" 5 ;;
+*) as_fn_error $? "bad value ${enableval} given for --enable-sim-rx-cycle-accurate option" "$LINENO" 5 ;;
esac
fi
-
-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"
+ { $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
diff --git a/sim/rx/configure.ac b/sim/rx/configure.ac
index 78fc33b..2f012f9 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