[binutils-gdb] sim: clean up explicit environment build calls
Michael Frysinger
vapier@sourceware.org
Wed May 12 04:48:33 GMT 2021
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=425b0b1a98456359084466b755aad51c462603df
commit 425b0b1a98456359084466b755aad51c462603df
Author: Mike Frysinger <vapier@gentoo.org>
Date: Wed May 12 00:46:19 2021 -0400
sim: clean up explicit environment build calls
This was enabled by default for all targets, but a few ports still
include an explicit call. Clean that up, and update the docs.
Diff:
---
sim/ChangeLog | 4 ++++
sim/README-HACKING | 4 ++--
sim/or1k/ChangeLog | 5 +++++
sim/or1k/configure | 22 ----------------------
sim/or1k/configure.ac | 1 -
sim/riscv/ChangeLog | 5 +++++
sim/riscv/configure | 22 ----------------------
sim/riscv/configure.ac | 1 -
8 files changed, 16 insertions(+), 48 deletions(-)
diff --git a/sim/ChangeLog b/sim/ChangeLog
index 96588c7a780..236b156c696 100644
--- a/sim/ChangeLog
+++ b/sim/ChangeLog
@@ -1,3 +1,7 @@
+2021-05-12 Mike Frysinger <vapier@gentoo.org>
+
+ * README-HACKING: Delete mention of SIM_AC_OPTION_ENVIRONMENT.
+
2021-05-12 Luis Machado <luis.machado@linaro.org>
* d10v/interp.c (sim_create_inferior): Fix memset call.
diff --git a/sim/README-HACKING b/sim/README-HACKING
index bd0054fd22e..69d08ff1ecf 100644
--- a/sim/README-HACKING
+++ b/sim/README-HACKING
@@ -278,8 +278,8 @@ Environment Simulation
The simplest simulator doesn't include environment support -- it merely
simulates the Instruction Set Architecture (ISA). Once you're ready to move
-on to the next level, call the common macro in your configure.ac:
-SIM_AC_OPTION_ENVIRONMENT
+on to the next level, it's time to start handling the --env option. It's
+enabled by default for all ports already.
This will support for the user, virtual, and operating environments. See the
sim-config.h header for a more detailed description of them. The former are
diff --git a/sim/or1k/ChangeLog b/sim/or1k/ChangeLog
index 55b923ddfdf..ece6160c43f 100644
--- a/sim/or1k/ChangeLog
+++ b/sim/or1k/ChangeLog
@@ -1,3 +1,8 @@
+2021-05-12 Mike Frysinger <vapier@gentoo.org>
+
+ * configure.ac: Delete SIM_AC_OPTION_ENVIRONMENT call.
+ * configure: Regenerate.
+
2021-05-04 Tom Tromey <tromey@adacore.com>
* mloop.in: Include <stdlib.h>.
diff --git a/sim/or1k/configure b/sim/or1k/configure
index 6ebe791ad3d..ef0a6c7b162 100755
--- a/sim/or1k/configure
+++ b/sim/or1k/configure
@@ -12147,28 +12147,6 @@ $as_echo "${WARN_CFLAGS} ${WERROR_CFLAGS}" >&6; }
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking default sim environment setting" >&5
-$as_echo_n "checking default sim environment setting... " >&6; }
-sim_environment="ALL_ENVIRONMENT"
-# Check whether --enable-sim-environment was given.
-if test "${enable_sim_environment+set}" = set; then :
- enableval=$enable_sim_environment; case "${enableval}" in
- all | ALL) sim_environment="ALL_ENVIRONMENT";;
- user | USER) sim_environment="USER_ENVIRONMENT";;
- virtual | VIRTUAL) sim_environment="VIRTUAL_ENVIRONMENT";;
- operating | OPERATING) sim_environment="OPERATING_ENVIRONMENT";;
- *) as_fn_error $? "Unknown value $enableval passed to --enable-sim-environment" "$LINENO" 5;;
-esac
-fi
-
-cat >>confdefs.h <<_ACEOF
-#define WITH_ENVIRONMENT $sim_environment
-_ACEOF
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_environment" >&5
-$as_echo "$sim_environment" >&6; }
-
-
cgen_maint=no
cgen=guile
cgendir='$(srcdir)/../../cgen'
diff --git a/sim/or1k/configure.ac b/sim/or1k/configure.ac
index ed0739f74a5..32fb0d49b95 100644
--- a/sim/or1k/configure.ac
+++ b/sim/or1k/configure.ac
@@ -10,7 +10,6 @@ SIM_AC_OPTION_BITSIZE([32], [31], [32])
SIM_AC_OPTION_SCACHE(16384)
SIM_AC_OPTION_DEFAULT_MODEL([or1200])
SIM_AC_OPTION_WARNINGS(no)
-SIM_AC_OPTION_ENVIRONMENT
SIM_AC_OPTION_CGEN_MAINT
SIM_AC_OUTPUT
diff --git a/sim/riscv/ChangeLog b/sim/riscv/ChangeLog
index c121d486b0c..557b722da25 100644
--- a/sim/riscv/ChangeLog
+++ b/sim/riscv/ChangeLog
@@ -1,3 +1,8 @@
+2021-05-12 Mike Frysinger <vapier@gentoo.org>
+
+ * configure.ac: Delete SIM_AC_OPTION_ENVIRONMENT call.
+ * configure: Regenerate.
+
2021-05-04 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.
diff --git a/sim/riscv/configure b/sim/riscv/configure
index 6e9c9ab02f2..c41f800ce9f 100755
--- a/sim/riscv/configure
+++ b/sim/riscv/configure
@@ -11948,28 +11948,6 @@ fi
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking default sim environment setting" >&5
-$as_echo_n "checking default sim environment setting... " >&6; }
-sim_environment="ALL_ENVIRONMENT"
-# Check whether --enable-sim-environment was given.
-if test "${enable_sim_environment+set}" = set; then :
- enableval=$enable_sim_environment; case "${enableval}" in
- all | ALL) sim_environment="ALL_ENVIRONMENT";;
- user | USER) sim_environment="USER_ENVIRONMENT";;
- virtual | VIRTUAL) sim_environment="VIRTUAL_ENVIRONMENT";;
- operating | OPERATING) sim_environment="OPERATING_ENVIRONMENT";;
- *) as_fn_error $? "Unknown value $enableval passed to --enable-sim-environment" "$LINENO" 5;;
-esac
-fi
-
-cat >>confdefs.h <<_ACEOF
-#define WITH_ENVIRONMENT $sim_environment
-_ACEOF
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_environment" >&5
-$as_echo "$sim_environment" >&6; }
-
-
# Check whether --enable-werror was given.
if test "${enable_werror+set}" = set; then :
enableval=$enable_werror; case "${enableval}" in
diff --git a/sim/riscv/configure.ac b/sim/riscv/configure.ac
index 84b236adf4f..e5a07bbc46b 100644
--- a/sim/riscv/configure.ac
+++ b/sim/riscv/configure.ac
@@ -6,7 +6,6 @@ SIM_AC_COMMON
SIM_AC_OPTION_ENDIAN(LITTLE)
SIM_AC_OPTION_ALIGNMENT(NONSTRICT_ALIGNMENT)
-SIM_AC_OPTION_ENVIRONMENT
SIM_AC_OPTION_WARNINGS
# Select the default model for the target.
More information about the Gdb-cvs
mailing list