diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2021-06-06 18:45:05 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2021-06-12 10:58:22 -0400 |
| commit | dba333c1e4051400983d3cb8b13c9c4a2d766e9c (patch) | |
| tree | 73dbf6f84c54dbfe766ca52c5f967246a86f1a4f /sim/riscv | |
| parent | b15c5d7a516d4e3466753e19df77d34b404d397e (diff) | |
| download | gdb-dba333c1e4051400983d3cb8b13c9c4a2d766e9c.zip gdb-dba333c1e4051400983d3cb8b13c9c4a2d766e9c.tar.gz gdb-dba333c1e4051400983d3cb8b13c9c4a2d766e9c.tar.bz2 | |
sim: unify assert build settings
Move the --sim-enable-assert option up to the common dir so we only
test & export it once across all ports.
Diffstat (limited to 'sim/riscv')
| -rw-r--r-- | sim/riscv/ChangeLog | 4 | ||||
| -rw-r--r-- | sim/riscv/aclocal.m4 | 1 | ||||
| -rw-r--r-- | sim/riscv/config.in | 3 | ||||
| -rwxr-xr-x | sim/riscv/configure | 26 |
4 files changed, 6 insertions, 28 deletions
diff --git a/sim/riscv/ChangeLog b/sim/riscv/ChangeLog index c460bdf..0427805 100644 --- a/sim/riscv/ChangeLog +++ b/sim/riscv/ChangeLog @@ -1,5 +1,9 @@ 2021-06-12 Mike Frysinger <vapier@gentoo.org> + * aclocal.m4, config.in, configure: Regenerate. + +2021-06-12 Mike Frysinger <vapier@gentoo.org> + * config.in, configure: Regenerate. 2021-05-17 Mike Frysinger <vapier@gentoo.org> diff --git a/sim/riscv/aclocal.m4 b/sim/riscv/aclocal.m4 index 9710f3f..487fd07 100644 --- a/sim/riscv/aclocal.m4 +++ b/sim/riscv/aclocal.m4 @@ -112,7 +112,6 @@ m4_include([../../ltversion.m4]) m4_include([../../lt~obsolete.m4]) m4_include([../m4/sim_ac_common.m4]) m4_include([../m4/sim_ac_option_alignment.m4]) -m4_include([../m4/sim_ac_option_assert.m4]) m4_include([../m4/sim_ac_option_bitsize.m4]) m4_include([../m4/sim_ac_option_default_model.m4]) m4_include([../m4/sim_ac_option_endian.m4]) diff --git a/sim/riscv/config.in b/sim/riscv/config.in index bcc3ce5..0b237bf 100644 --- a/sim/riscv/config.in +++ b/sim/riscv/config.in @@ -114,9 +114,6 @@ #endif -/* Sim assert settings */ -#undef WITH_ASSERT - /* Sim debug setting */ #undef WITH_DEBUG diff --git a/sim/riscv/configure b/sim/riscv/configure index d627d24..1c59cfa 100755 --- a/sim/riscv/configure +++ b/sim/riscv/configure @@ -775,7 +775,6 @@ enable_sim_debug enable_sim_stdio enable_sim_trace enable_sim_profile -enable_sim_assert enable_sim_environment enable_sim_inline with_pkgversion @@ -1431,7 +1430,6 @@ Optional Features: --enable-sim-trace=opts Enable tracing of simulated programs --enable-sim-profile=opts Enable profiling flags - --enable-sim-assert Specify whether to perform random assertions --enable-sim-environment=environment Specify mixed, user, virtual or operating environment @@ -10789,7 +10787,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10792 "configure" +#line 10790 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10895,7 +10893,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10898 "configure" +#line 10896 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11278,26 +11276,6 @@ $as_echo "$sim_profile" >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable sim asserts" >&5 -$as_echo_n "checking whether to enable sim asserts... " >&6; } -sim_assert="1" -# Check whether --enable-sim-assert was given. -if test "${enable_sim_assert+set}" = set; then : - enableval=$enable_sim_assert; case "${enableval}" in - yes) sim_assert="1";; - no) sim_assert="0";; - *) as_fn_error $? "--enable-sim-assert does not take a value" "$LINENO" 5;; -esac -fi - -cat >>confdefs.h <<_ACEOF -#define WITH_ASSERT $sim_assert -_ACEOF - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_assert" >&5 -$as_echo "$sim_assert" >&6; } - - { $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" |