From 456ef1c1d43c0407801fb2d59db355472be8a554 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 19 Jun 2021 20:06:12 -0400 Subject: [PATCH] sim: unify hardware settings Move these options up to the common dir so we only test & export them once across all ports. --- sim/ChangeLog | 8 +++++ sim/Makefile.in | 3 ++ sim/aarch64/ChangeLog | 5 +++ sim/aarch64/aclocal.m4 | 1 - sim/aarch64/configure | 53 ------------------------------- sim/aclocal.m4 | 1 + sim/arch-subdir.mk.in | 5 +++ sim/arm/ChangeLog | 5 +++ sim/arm/aclocal.m4 | 1 - sim/arm/configure | 53 ------------------------------- sim/avr/ChangeLog | 5 +++ sim/avr/aclocal.m4 | 1 - sim/avr/configure | 53 ------------------------------- sim/bfin/ChangeLog | 5 +++ sim/bfin/aclocal.m4 | 1 - sim/bfin/configure | 48 ---------------------------- sim/bpf/ChangeLog | 5 +++ sim/bpf/aclocal.m4 | 1 - sim/bpf/configure | 48 ---------------------------- sim/common/ChangeLog | 4 +++ sim/common/Make-common.in | 4 --- sim/configure | 54 ++++++++++++++++++++++++++++++-- sim/configure.ac | 1 + sim/cr16/ChangeLog | 5 +++ sim/cr16/aclocal.m4 | 1 - sim/cr16/configure | 53 ------------------------------- sim/cris/ChangeLog | 5 +++ sim/cris/aclocal.m4 | 1 - sim/cris/configure | 48 ---------------------------- sim/d10v/ChangeLog | 5 +++ sim/d10v/aclocal.m4 | 1 - sim/d10v/configure | 53 ------------------------------- sim/erc32/ChangeLog | 5 +++ sim/erc32/aclocal.m4 | 1 - sim/erc32/configure | 53 ------------------------------- sim/example-synacor/ChangeLog | 5 +++ sim/example-synacor/aclocal.m4 | 1 - sim/example-synacor/configure | 53 ------------------------------- sim/frv/ChangeLog | 5 +++ sim/frv/aclocal.m4 | 1 - sim/frv/configure | 48 ---------------------------- sim/ft32/ChangeLog | 5 +++ sim/ft32/aclocal.m4 | 1 - sim/ft32/configure | 53 ------------------------------- sim/h8300/ChangeLog | 5 +++ sim/h8300/aclocal.m4 | 1 - sim/h8300/configure | 53 ------------------------------- sim/iq2000/ChangeLog | 5 +++ sim/iq2000/aclocal.m4 | 1 - sim/iq2000/configure | 48 ---------------------------- sim/lm32/ChangeLog | 5 +++ sim/lm32/aclocal.m4 | 1 - sim/lm32/configure | 48 ---------------------------- sim/m32c/ChangeLog | 5 +++ sim/m32c/aclocal.m4 | 1 - sim/m32c/configure | 53 ------------------------------- sim/m32r/ChangeLog | 5 +++ sim/m32r/aclocal.m4 | 1 - sim/m32r/configure | 48 ---------------------------- sim/m4/sim_ac_option_hardware.m4 | 11 +------ sim/m4/sim_ac_output.m4 | 2 -- sim/m68hc11/ChangeLog | 5 +++ sim/m68hc11/aclocal.m4 | 1 - sim/m68hc11/configure | 53 ------------------------------- sim/mcore/ChangeLog | 5 +++ sim/mcore/aclocal.m4 | 1 - sim/mcore/configure | 53 ------------------------------- sim/microblaze/ChangeLog | 5 +++ sim/microblaze/aclocal.m4 | 1 - sim/microblaze/configure | 53 ------------------------------- sim/mips/ChangeLog | 5 +++ sim/mips/aclocal.m4 | 1 - sim/mips/configure | 48 ---------------------------- sim/mn10300/ChangeLog | 5 +++ sim/mn10300/aclocal.m4 | 1 - sim/mn10300/configure | 48 ---------------------------- sim/moxie/ChangeLog | 5 +++ sim/moxie/aclocal.m4 | 1 - sim/moxie/configure | 53 ------------------------------- sim/msp430/ChangeLog | 5 +++ sim/msp430/aclocal.m4 | 1 - sim/msp430/configure | 53 ------------------------------- sim/or1k/ChangeLog | 5 +++ sim/or1k/aclocal.m4 | 1 - sim/or1k/configure | 48 ---------------------------- sim/pru/ChangeLog | 5 +++ sim/pru/aclocal.m4 | 1 - sim/pru/configure | 53 ------------------------------- sim/riscv/ChangeLog | 5 +++ sim/riscv/aclocal.m4 | 1 - sim/riscv/configure | 48 ---------------------------- sim/rl78/ChangeLog | 5 +++ sim/rl78/aclocal.m4 | 1 - sim/rl78/configure | 53 ------------------------------- sim/rx/ChangeLog | 5 +++ sim/rx/aclocal.m4 | 1 - sim/rx/configure | 48 ---------------------------- sim/sh/ChangeLog | 5 +++ sim/sh/aclocal.m4 | 1 - sim/sh/configure | 53 ------------------------------- sim/v850/ChangeLog | 5 +++ sim/v850/aclocal.m4 | 1 - sim/v850/configure | 48 ---------------------------- 103 files changed, 230 insertions(+), 1627 deletions(-) diff --git a/sim/ChangeLog b/sim/ChangeLog index bdc0ad86b3..04384e5bd5 100644 --- a/sim/ChangeLog +++ b/sim/ChangeLog @@ -1,3 +1,11 @@ +2021-06-21 Mike Frysinger + + * arch-subdir.mk.in: Move sim-hw settings from common/Make-common.in. + * configure.ac: Call SIM_AC_OPTION_HARDWARE. + * m4/sim_ac_option_hardware.m4: Use AM_CONDITIONAL for SIM_ENABLE_HW. + * m4/sim_ac_output.m4: Do not require SIM_AC_OPTION_HARDWARE. + * aclocal.m4, configure, Makefile.in: Regenerate. + 2021-06-21 Mike Frysinger * README-HACKING: Change SIM_AC_OPTION_HARDWARE to diff --git a/sim/Makefile.in b/sim/Makefile.in index 2737e102d2..62942d8836 100644 --- a/sim/Makefile.in +++ b/sim/Makefile.in @@ -209,6 +209,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ $(top_srcdir)/m4/sim_ac_option_debug.m4 \ $(top_srcdir)/m4/sim_ac_option_endian.m4 \ $(top_srcdir)/m4/sim_ac_option_environment.m4 \ + $(top_srcdir)/m4/sim_ac_option_hardware.m4 \ $(top_srcdir)/m4/sim_ac_option_inline.m4 \ $(top_srcdir)/m4/sim_ac_option_profile.m4 \ $(top_srcdir)/m4/sim_ac_option_stdio.m4 \ @@ -759,6 +760,8 @@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +sim_hw_cflags = @sim_hw_cflags@ +sim_hw_sockser = @sim_hw_sockser@ srcdir = @srcdir@ subdirs = @subdirs@ sysconfdir = @sysconfdir@ diff --git a/sim/aarch64/ChangeLog b/sim/aarch64/ChangeLog index 139e3e55fe..80cf4a45f1 100644 --- a/sim/aarch64/ChangeLog +++ b/sim/aarch64/ChangeLog @@ -1,3 +1,8 @@ +2021-06-21 Mike Frysinger + + * aclocal.m4: Regenerate. + * configure: Regenerate. + 2021-06-21 Mike Frysinger * configure: Regenerate. diff --git a/sim/aarch64/aclocal.m4 b/sim/aarch64/aclocal.m4 index 1e96f107be..c9414d4680 100644 --- a/sim/aarch64/aclocal.m4 +++ b/sim/aarch64/aclocal.m4 @@ -12,5 +12,4 @@ # PARTICULAR PURPOSE. m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -m4_include([../m4/sim_ac_option_hardware.m4]) m4_include([../m4/sim_ac_output.m4]) diff --git a/sim/aarch64/configure b/sim/aarch64/configure index f3b1467d75..cc3fa8b0d9 100755 --- a/sim/aarch64/configure +++ b/sim/aarch64/configure @@ -590,10 +590,6 @@ sim_scache sim_float sim_bitsize cgen_breaks -sim_hw_sockser -sim_hw_cflags -SIM_ENABLE_HW_FALSE -SIM_ENABLE_HW_TRUE target_alias host_alias build_alias @@ -635,7 +631,6 @@ SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking -enable_sim_hardware ' ac_precious_vars='build_alias host_alias @@ -1243,12 +1238,6 @@ if test -n "$ac_init_help"; then cat <<\_ACEOF -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] - --enable-sim-hardware Whether to enable hardware/device simulation - Report bugs to the package provider. _ACEOF ac_status=$? @@ -1679,48 +1668,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5 -$as_echo_n "checking for sim hardware settings... " >&6; } -# Check whether --enable-sim-hardware was given. -if test "${enable_sim_hardware+set}" = set; then : - enableval=$enable_sim_hardware; -else - enable_sim_hardware="yes" -fi - -sim_hw_sockser= -if test "$enable_sim_hardware" = no; then - sim_hw_cflags="-DWITH_HW=0" -elif test "$enable_sim_hardware" = yes; then - sim_hw_cflags="-DWITH_HW=1" - # mingw does not support sockser - case ${host} in - *mingw*) ;; - *) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device - # that you instatiate. Instead, other code will call into it directly. - # At some point, we should convert it over. - sim_hw_sockser="dv-sockser.o" - sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER" - ;; - esac -else - as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5 -fi -if test "$enable_sim_hardware" = "yes"; then - SIM_ENABLE_HW_TRUE= - SIM_ENABLE_HW_FALSE='#' -else - SIM_ENABLE_HW_TRUE='#' - SIM_ENABLE_HW_FALSE= -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5 -$as_echo "${enable_sim_hardware}" >&6; } - - - - cgen_breaks="" if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then cgen_breaks="break cgen_rtx_error"; diff --git a/sim/aclocal.m4 b/sim/aclocal.m4 index 400bc876b4..84f2878baa 100644 --- a/sim/aclocal.m4 +++ b/sim/aclocal.m4 @@ -1185,6 +1185,7 @@ m4_include([m4/sim_ac_option_cgen_maint.m4]) m4_include([m4/sim_ac_option_debug.m4]) m4_include([m4/sim_ac_option_endian.m4]) m4_include([m4/sim_ac_option_environment.m4]) +m4_include([m4/sim_ac_option_hardware.m4]) m4_include([m4/sim_ac_option_inline.m4]) m4_include([m4/sim_ac_option_profile.m4]) m4_include([m4/sim_ac_option_stdio.m4]) diff --git a/sim/arch-subdir.mk.in b/sim/arch-subdir.mk.in index 92b217d20b..f145f1a3c6 100644 --- a/sim/arch-subdir.mk.in +++ b/sim/arch-subdir.mk.in @@ -68,3 +68,8 @@ CGEN_MAINT = ; @true CGENDIR = @cgendir@ SIM_INLINE = @SIM_INLINE@ + +SIM_HW_CFLAGS = @sim_hw_cflags@ +SIM_HW_SOCKSER = @sim_hw_sockser@ +SIM_HW_OBJS = $(SIM_COMMON_HW_OBJS) $(SIM_HW_DEVICES:%=dv-%.o) $(SIM_HW_SOCKSER) +@SIM_ENABLE_HW_FALSE@SIM_HW_OBJS = diff --git a/sim/arm/ChangeLog b/sim/arm/ChangeLog index 9abf46133b..ea1a81ad81 100644 --- a/sim/arm/ChangeLog +++ b/sim/arm/ChangeLog @@ -1,3 +1,8 @@ +2021-06-21 Mike Frysinger + + * aclocal.m4: Regenerate. + * configure: Regenerate. + 2021-06-21 Mike Frysinger * configure: Regenerate. diff --git a/sim/arm/aclocal.m4 b/sim/arm/aclocal.m4 index 1e96f107be..c9414d4680 100644 --- a/sim/arm/aclocal.m4 +++ b/sim/arm/aclocal.m4 @@ -12,5 +12,4 @@ # PARTICULAR PURPOSE. m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -m4_include([../m4/sim_ac_option_hardware.m4]) m4_include([../m4/sim_ac_output.m4]) diff --git a/sim/arm/configure b/sim/arm/configure index f3b1467d75..cc3fa8b0d9 100755 --- a/sim/arm/configure +++ b/sim/arm/configure @@ -590,10 +590,6 @@ sim_scache sim_float sim_bitsize cgen_breaks -sim_hw_sockser -sim_hw_cflags -SIM_ENABLE_HW_FALSE -SIM_ENABLE_HW_TRUE target_alias host_alias build_alias @@ -635,7 +631,6 @@ SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking -enable_sim_hardware ' ac_precious_vars='build_alias host_alias @@ -1243,12 +1238,6 @@ if test -n "$ac_init_help"; then cat <<\_ACEOF -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] - --enable-sim-hardware Whether to enable hardware/device simulation - Report bugs to the package provider. _ACEOF ac_status=$? @@ -1679,48 +1668,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5 -$as_echo_n "checking for sim hardware settings... " >&6; } -# Check whether --enable-sim-hardware was given. -if test "${enable_sim_hardware+set}" = set; then : - enableval=$enable_sim_hardware; -else - enable_sim_hardware="yes" -fi - -sim_hw_sockser= -if test "$enable_sim_hardware" = no; then - sim_hw_cflags="-DWITH_HW=0" -elif test "$enable_sim_hardware" = yes; then - sim_hw_cflags="-DWITH_HW=1" - # mingw does not support sockser - case ${host} in - *mingw*) ;; - *) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device - # that you instatiate. Instead, other code will call into it directly. - # At some point, we should convert it over. - sim_hw_sockser="dv-sockser.o" - sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER" - ;; - esac -else - as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5 -fi -if test "$enable_sim_hardware" = "yes"; then - SIM_ENABLE_HW_TRUE= - SIM_ENABLE_HW_FALSE='#' -else - SIM_ENABLE_HW_TRUE='#' - SIM_ENABLE_HW_FALSE= -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5 -$as_echo "${enable_sim_hardware}" >&6; } - - - - cgen_breaks="" if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then cgen_breaks="break cgen_rtx_error"; diff --git a/sim/avr/ChangeLog b/sim/avr/ChangeLog index 9a7ed8516f..80b6c97346 100644 --- a/sim/avr/ChangeLog +++ b/sim/avr/ChangeLog @@ -1,3 +1,8 @@ +2021-06-21 Mike Frysinger + + * aclocal.m4: Regenerate. + * configure: Regenerate. + 2021-06-21 Mike Frysinger * configure: Regenerate. diff --git a/sim/avr/aclocal.m4 b/sim/avr/aclocal.m4 index 1e96f107be..c9414d4680 100644 --- a/sim/avr/aclocal.m4 +++ b/sim/avr/aclocal.m4 @@ -12,5 +12,4 @@ # PARTICULAR PURPOSE. m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -m4_include([../m4/sim_ac_option_hardware.m4]) m4_include([../m4/sim_ac_output.m4]) diff --git a/sim/avr/configure b/sim/avr/configure index f3b1467d75..cc3fa8b0d9 100755 --- a/sim/avr/configure +++ b/sim/avr/configure @@ -590,10 +590,6 @@ sim_scache sim_float sim_bitsize cgen_breaks -sim_hw_sockser -sim_hw_cflags -SIM_ENABLE_HW_FALSE -SIM_ENABLE_HW_TRUE target_alias host_alias build_alias @@ -635,7 +631,6 @@ SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking -enable_sim_hardware ' ac_precious_vars='build_alias host_alias @@ -1243,12 +1238,6 @@ if test -n "$ac_init_help"; then cat <<\_ACEOF -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] - --enable-sim-hardware Whether to enable hardware/device simulation - Report bugs to the package provider. _ACEOF ac_status=$? @@ -1679,48 +1668,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5 -$as_echo_n "checking for sim hardware settings... " >&6; } -# Check whether --enable-sim-hardware was given. -if test "${enable_sim_hardware+set}" = set; then : - enableval=$enable_sim_hardware; -else - enable_sim_hardware="yes" -fi - -sim_hw_sockser= -if test "$enable_sim_hardware" = no; then - sim_hw_cflags="-DWITH_HW=0" -elif test "$enable_sim_hardware" = yes; then - sim_hw_cflags="-DWITH_HW=1" - # mingw does not support sockser - case ${host} in - *mingw*) ;; - *) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device - # that you instatiate. Instead, other code will call into it directly. - # At some point, we should convert it over. - sim_hw_sockser="dv-sockser.o" - sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER" - ;; - esac -else - as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5 -fi -if test "$enable_sim_hardware" = "yes"; then - SIM_ENABLE_HW_TRUE= - SIM_ENABLE_HW_FALSE='#' -else - SIM_ENABLE_HW_TRUE='#' - SIM_ENABLE_HW_FALSE= -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5 -$as_echo "${enable_sim_hardware}" >&6; } - - - - cgen_breaks="" if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then cgen_breaks="break cgen_rtx_error"; diff --git a/sim/bfin/ChangeLog b/sim/bfin/ChangeLog index 7c34a4f50c..ea737353b0 100644 --- a/sim/bfin/ChangeLog +++ b/sim/bfin/ChangeLog @@ -1,3 +1,8 @@ +2021-06-21 Mike Frysinger + + * aclocal.m4: Regenerate. + * configure: Regenerate. + 2021-06-21 Mike Frysinger * Makefile.in (SIM_EXTRA_HW_DEVICES): Define. diff --git a/sim/bfin/aclocal.m4 b/sim/bfin/aclocal.m4 index abca26eeaa..b61c9617f3 100644 --- a/sim/bfin/aclocal.m4 +++ b/sim/bfin/aclocal.m4 @@ -14,5 +14,4 @@ m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_include([../../config/pkg.m4]) m4_include([../m4/sim_ac_option_default_model.m4]) -m4_include([../m4/sim_ac_option_hardware.m4]) m4_include([../m4/sim_ac_output.m4]) diff --git a/sim/bfin/configure b/sim/bfin/configure index a8a383a868..8f14a5aa2b 100755 --- a/sim/bfin/configure +++ b/sim/bfin/configure @@ -589,10 +589,6 @@ sim_scache sim_float sim_bitsize cgen_breaks -sim_hw_sockser -sim_hw_cflags -SIM_ENABLE_HW_FALSE -SIM_ENABLE_HW_TRUE OBJEXT EXEEXT ac_ct_CC @@ -648,7 +644,6 @@ ac_subst_files='' ac_user_opts=' enable_option_checking enable_sim_default_model -enable_sim_hardware ' ac_precious_vars='build_alias host_alias @@ -1272,7 +1267,6 @@ Optional Features: --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --enable-sim-default-model=model Specify default model to simulate - --enable-sim-hardware Whether to enable hardware/device simulation Some influential environment variables: PKG_CONFIG path to pkg-config utility @@ -2878,48 +2872,6 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5 -$as_echo_n "checking for sim hardware settings... " >&6; } -# Check whether --enable-sim-hardware was given. -if test "${enable_sim_hardware+set}" = set; then : - enableval=$enable_sim_hardware; -else - enable_sim_hardware="yes" -fi - -sim_hw_sockser= -if test "$enable_sim_hardware" = no; then - sim_hw_cflags="-DWITH_HW=0" -elif test "$enable_sim_hardware" = yes; then - sim_hw_cflags="-DWITH_HW=1" - # mingw does not support sockser - case ${host} in - *mingw*) ;; - *) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device - # that you instatiate. Instead, other code will call into it directly. - # At some point, we should convert it over. - sim_hw_sockser="dv-sockser.o" - sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER" - ;; - esac -else - as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5 -fi -if test "$enable_sim_hardware" = "yes"; then - SIM_ENABLE_HW_TRUE= - SIM_ENABLE_HW_FALSE='#' -else - SIM_ENABLE_HW_TRUE='#' - SIM_ENABLE_HW_FALSE= -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5 -$as_echo "${enable_sim_hardware}" >&6; } - - - - cgen_breaks="" if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then cgen_breaks="break cgen_rtx_error"; diff --git a/sim/bpf/ChangeLog b/sim/bpf/ChangeLog index d4b61cab23..6115832701 100644 --- a/sim/bpf/ChangeLog +++ b/sim/bpf/ChangeLog @@ -1,3 +1,8 @@ +2021-06-21 Mike Frysinger + + * aclocal.m4: Regenerate. + * configure: Regenerate. + 2021-06-21 Mike Frysinger * configure: Regenerate. diff --git a/sim/bpf/aclocal.m4 b/sim/bpf/aclocal.m4 index c7a63712ed..d0f761fd80 100644 --- a/sim/bpf/aclocal.m4 +++ b/sim/bpf/aclocal.m4 @@ -14,6 +14,5 @@ m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_include([../m4/sim_ac_option_bitsize.m4]) m4_include([../m4/sim_ac_option_default_model.m4]) -m4_include([../m4/sim_ac_option_hardware.m4]) m4_include([../m4/sim_ac_option_scache.m4]) m4_include([../m4/sim_ac_output.m4]) diff --git a/sim/bpf/configure b/sim/bpf/configure index d6cbb9d8aa..57e37559d5 100755 --- a/sim/bpf/configure +++ b/sim/bpf/configure @@ -587,10 +587,6 @@ LIBOBJS sim_reserved_bits sim_float cgen_breaks -sim_hw_sockser -sim_hw_cflags -SIM_ENABLE_HW_FALSE -SIM_ENABLE_HW_TRUE target_alias host_alias build_alias @@ -638,7 +634,6 @@ enable_option_checking enable_sim_bitsize enable_sim_scache enable_sim_default_model -enable_sim_hardware ' ac_precious_vars='build_alias host_alias @@ -1255,7 +1250,6 @@ Optional Features: Specify simulator execution cache size --enable-sim-default-model=model Specify default model to simulate - --enable-sim-hardware Whether to enable hardware/device simulation Report bugs to the package provider. _ACEOF @@ -1782,48 +1776,6 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5 -$as_echo_n "checking for sim hardware settings... " >&6; } -# Check whether --enable-sim-hardware was given. -if test "${enable_sim_hardware+set}" = set; then : - enableval=$enable_sim_hardware; -else - enable_sim_hardware="yes" -fi - -sim_hw_sockser= -if test "$enable_sim_hardware" = no; then - sim_hw_cflags="-DWITH_HW=0" -elif test "$enable_sim_hardware" = yes; then - sim_hw_cflags="-DWITH_HW=1" - # mingw does not support sockser - case ${host} in - *mingw*) ;; - *) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device - # that you instatiate. Instead, other code will call into it directly. - # At some point, we should convert it over. - sim_hw_sockser="dv-sockser.o" - sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER" - ;; - esac -else - as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5 -fi -if test "$enable_sim_hardware" = "yes"; then - SIM_ENABLE_HW_TRUE= - SIM_ENABLE_HW_FALSE='#' -else - SIM_ENABLE_HW_TRUE='#' - SIM_ENABLE_HW_FALSE= -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5 -$as_echo "${enable_sim_hardware}" >&6; } - - - - cgen_breaks="" if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then cgen_breaks="break cgen_rtx_error"; diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index 02540a047d..9e1d3008cf 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,3 +1,7 @@ +2021-06-21 Mike Frysinger + + * Make-common.in: Move sim-hw settings to ../arch-subdir.mk.in. + 2021-06-21 Mike Frysinger * Make-common.in (SIM_HW): Delete. diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in index 6d7c9c47b6..41becaa05f 100644 --- a/sim/common/Make-common.in +++ b/sim/common/Make-common.in @@ -72,8 +72,6 @@ SHELL = @SHELL@ SIM_BITSIZE = @sim_bitsize@ SIM_DEFAULT_MODEL = @sim_default_model@ SIM_FLOAT = @sim_float@ -SIM_HW_CFLAGS = @sim_hw_cflags@ -SIM_HW_SOCKSER = @sim_hw_sockser@ SIM_RESERVED_BITS = @sim_reserved_bits@ SIM_SCACHE = @sim_scache@ SIM_WARN_CFLAGS = $(WARN_CFLAGS) @@ -216,8 +214,6 @@ BUILD_CFLAGS = $(CFLAGS_FOR_BUILD) $(CSEARCH) COMMON_DEP_CFLAGS = $(CONFIG_CFLAGS) $(CSEARCH) $(SIM_EXTRA_CFLAGS) SIM_HW_DEVICES = cfi core pal glue $(SIM_EXTRA_HW_DEVICES) -SIM_HW_OBJS = $(SIM_COMMON_HW_OBJS) $(SIM_HW_DEVICES:%=dv-%.o) $(SIM_HW_SOCKSER) -@SIM_ENABLE_HW_FALSE@SIM_HW_OBJS = ZLIB = $(zlibdir) -lz LIBIBERTY_LIB = ../../libiberty/libiberty.a diff --git a/sim/configure b/sim/configure index 246845328a..dac37c64c2 100755 --- a/sim/configure +++ b/sim/configure @@ -639,6 +639,10 @@ ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS SIM_INLINE +sim_hw_sockser +sim_hw_cflags +SIM_ENABLE_HW_FALSE +SIM_ENABLE_HW_TRUE cgen cgendir CGEN_MAINT @@ -817,6 +821,7 @@ enable_cgen_maint enable_sim_debug enable_sim_endian enable_sim_environment +enable_sim_hardware enable_sim_inline enable_sim_profile enable_sim_stdio @@ -1514,6 +1519,7 @@ Optional Features: --enable-sim-environment=environment Specify mixed, user, virtual or operating environment + --enable-sim-hardware Whether to enable hardware/device simulation --enable-sim-inline=inlines Specify which functions should be inlined --enable-sim-profile=opts @@ -12041,7 +12047,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12044 "configure" +#line 12050 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12147,7 +12153,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12150 "configure" +#line 12156 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13887,6 +13893,46 @@ _ACEOF { $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_environment" >&5 $as_echo "$sim_environment" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5 +$as_echo_n "checking for sim hardware settings... " >&6; } +# Check whether --enable-sim-hardware was given. +if test "${enable_sim_hardware+set}" = set; then : + enableval=$enable_sim_hardware; +else + enable_sim_hardware="yes" +fi + +sim_hw_sockser= +if test "$enable_sim_hardware" = no; then + sim_hw_cflags="-DWITH_HW=0" +elif test "$enable_sim_hardware" = yes; then + sim_hw_cflags="-DWITH_HW=1" + # mingw does not support sockser + case ${host} in + *mingw*) ;; + *) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device + # that you instatiate. Instead, other code will call into it directly. + # At some point, we should convert it over. + sim_hw_sockser="dv-sockser.o" + sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER" + ;; + esac +else + as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5 +fi + if test "$enable_sim_hardware" = "yes"; then + SIM_ENABLE_HW_TRUE= + SIM_ENABLE_HW_FALSE='#' +else + SIM_ENABLE_HW_TRUE='#' + SIM_ENABLE_HW_FALSE= +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5 +$as_echo "${enable_sim_hardware}" >&6; } + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking sim inline settings" >&5 $as_echo_n "checking sim inline settings... " >&6; } sim_inline="-DDEFAULT_INLINE=0" @@ -14254,6 +14300,10 @@ if test -z "${SIM_ENABLE_IGEN_TRUE}" && test -z "${SIM_ENABLE_IGEN_FALSE}"; then as_fn_error $? "conditional \"SIM_ENABLE_IGEN\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${SIM_ENABLE_HW_TRUE}" && test -z "${SIM_ENABLE_HW_FALSE}"; then + as_fn_error $? "conditional \"SIM_ENABLE_HW\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 diff --git a/sim/configure.ac b/sim/configure.ac index 9530268ddc..042bfbfd1c 100644 --- a/sim/configure.ac +++ b/sim/configure.ac @@ -122,6 +122,7 @@ SIM_AC_OPTION_CGEN_MAINT SIM_AC_OPTION_DEBUG SIM_AC_OPTION_ENDIAN SIM_AC_OPTION_ENVIRONMENT +SIM_AC_OPTION_HARDWARE SIM_AC_OPTION_INLINE SIM_AC_OPTION_PROFILE SIM_AC_OPTION_STDIO diff --git a/sim/cr16/ChangeLog b/sim/cr16/ChangeLog index dd2215a802..5b7cc190a0 100644 --- a/sim/cr16/ChangeLog +++ b/sim/cr16/ChangeLog @@ -1,3 +1,8 @@ +2021-06-21 Mike Frysinger + + * aclocal.m4: Regenerate. + * configure: Regenerate. + 2021-06-21 Mike Frysinger * configure: Regenerate. diff --git a/sim/cr16/aclocal.m4 b/sim/cr16/aclocal.m4 index 1e96f107be..c9414d4680 100644 --- a/sim/cr16/aclocal.m4 +++ b/sim/cr16/aclocal.m4 @@ -12,5 +12,4 @@ # PARTICULAR PURPOSE. m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -m4_include([../m4/sim_ac_option_hardware.m4]) m4_include([../m4/sim_ac_output.m4]) diff --git a/sim/cr16/configure b/sim/cr16/configure index f3b1467d75..cc3fa8b0d9 100755 --- a/sim/cr16/configure +++ b/sim/cr16/configure @@ -590,10 +590,6 @@ sim_scache sim_float sim_bitsize cgen_breaks -sim_hw_sockser -sim_hw_cflags -SIM_ENABLE_HW_FALSE -SIM_ENABLE_HW_TRUE target_alias host_alias build_alias @@ -635,7 +631,6 @@ SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking -enable_sim_hardware ' ac_precious_vars='build_alias host_alias @@ -1243,12 +1238,6 @@ if test -n "$ac_init_help"; then cat <<\_ACEOF -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] - --enable-sim-hardware Whether to enable hardware/device simulation - Report bugs to the package provider. _ACEOF ac_status=$? @@ -1679,48 +1668,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5 -$as_echo_n "checking for sim hardware settings... " >&6; } -# Check whether --enable-sim-hardware was given. -if test "${enable_sim_hardware+set}" = set; then : - enableval=$enable_sim_hardware; -else - enable_sim_hardware="yes" -fi - -sim_hw_sockser= -if test "$enable_sim_hardware" = no; then - sim_hw_cflags="-DWITH_HW=0" -elif test "$enable_sim_hardware" = yes; then - sim_hw_cflags="-DWITH_HW=1" - # mingw does not support sockser - case ${host} in - *mingw*) ;; - *) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device - # that you instatiate. Instead, other code will call into it directly. - # At some point, we should convert it over. - sim_hw_sockser="dv-sockser.o" - sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER" - ;; - esac -else - as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5 -fi -if test "$enable_sim_hardware" = "yes"; then - SIM_ENABLE_HW_TRUE= - SIM_ENABLE_HW_FALSE='#' -else - SIM_ENABLE_HW_TRUE='#' - SIM_ENABLE_HW_FALSE= -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5 -$as_echo "${enable_sim_hardware}" >&6; } - - - - cgen_breaks="" if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then cgen_breaks="break cgen_rtx_error"; diff --git a/sim/cris/ChangeLog b/sim/cris/ChangeLog index d570ba9ea3..77670a262c 100644 --- a/sim/cris/ChangeLog +++ b/sim/cris/ChangeLog @@ -1,3 +1,8 @@ +2021-06-21 Mike Frysinger + + * aclocal.m4: Regenerate. + * configure: Regenerate. + 2021-06-21 Mike Frysinger * Makefile.in (SIM_EXTRA_HW_DEVICES): Define. diff --git a/sim/cris/aclocal.m4 b/sim/cris/aclocal.m4 index 08ac8b16a7..212a399016 100644 --- a/sim/cris/aclocal.m4 +++ b/sim/cris/aclocal.m4 @@ -13,6 +13,5 @@ m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_include([../m4/sim_ac_option_default_model.m4]) -m4_include([../m4/sim_ac_option_hardware.m4]) m4_include([../m4/sim_ac_option_scache.m4]) m4_include([../m4/sim_ac_output.m4]) diff --git a/sim/cris/configure b/sim/cris/configure index 89a7beec37..293463e42a 100755 --- a/sim/cris/configure +++ b/sim/cris/configure @@ -588,10 +588,6 @@ sim_reserved_bits sim_float sim_bitsize cgen_breaks -sim_hw_sockser -sim_hw_cflags -SIM_ENABLE_HW_FALSE -SIM_ENABLE_HW_TRUE target_alias host_alias build_alias @@ -637,7 +633,6 @@ ac_user_opts=' enable_option_checking enable_sim_scache enable_sim_default_model -enable_sim_hardware ' ac_precious_vars='build_alias host_alias @@ -1253,7 +1248,6 @@ Optional Features: Specify simulator execution cache size --enable-sim-default-model=model Specify default model to simulate - --enable-sim-hardware Whether to enable hardware/device simulation Report bugs to the package provider. _ACEOF @@ -1723,48 +1717,6 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5 -$as_echo_n "checking for sim hardware settings... " >&6; } -# Check whether --enable-sim-hardware was given. -if test "${enable_sim_hardware+set}" = set; then : - enableval=$enable_sim_hardware; -else - enable_sim_hardware="yes" -fi - -sim_hw_sockser= -if test "$enable_sim_hardware" = no; then - sim_hw_cflags="-DWITH_HW=0" -elif test "$enable_sim_hardware" = yes; then - sim_hw_cflags="-DWITH_HW=1" - # mingw does not support sockser - case ${host} in - *mingw*) ;; - *) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device - # that you instatiate. Instead, other code will call into it directly. - # At some point, we should convert it over. - sim_hw_sockser="dv-sockser.o" - sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER" - ;; - esac -else - as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5 -fi -if test "$enable_sim_hardware" = "yes"; then - SIM_ENABLE_HW_TRUE= - SIM_ENABLE_HW_FALSE='#' -else - SIM_ENABLE_HW_TRUE='#' - SIM_ENABLE_HW_FALSE= -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5 -$as_echo "${enable_sim_hardware}" >&6; } - - - - cgen_breaks="" if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then cgen_breaks="break cgen_rtx_error"; diff --git a/sim/d10v/ChangeLog b/sim/d10v/ChangeLog index 4aa76081ab..8433b91551 100644 --- a/sim/d10v/ChangeLog +++ b/sim/d10v/ChangeLog @@ -1,3 +1,8 @@ +2021-06-21 Mike Frysinger + + * aclocal.m4: Regenerate. + * configure: Regenerate. + 2021-06-21 Mike Frysinger * configure: Regenerate. diff --git a/sim/d10v/aclocal.m4 b/sim/d10v/aclocal.m4 index 1e96f107be..c9414d4680 100644 --- a/sim/d10v/aclocal.m4 +++ b/sim/d10v/aclocal.m4 @@ -12,5 +12,4 @@ # PARTICULAR PURPOSE. m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -m4_include([../m4/sim_ac_option_hardware.m4]) m4_include([../m4/sim_ac_output.m4]) diff --git a/sim/d10v/configure b/sim/d10v/configure index f3b1467d75..cc3fa8b0d9 100755 --- a/sim/d10v/configure +++ b/sim/d10v/configure @@ -590,10 +590,6 @@ sim_scache sim_float sim_bitsize cgen_breaks -sim_hw_sockser -sim_hw_cflags -SIM_ENABLE_HW_FALSE -SIM_ENABLE_HW_TRUE target_alias host_alias build_alias @@ -635,7 +631,6 @@ SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking -enable_sim_hardware ' ac_precious_vars='build_alias host_alias @@ -1243,12 +1238,6 @@ if test -n "$ac_init_help"; then cat <<\_ACEOF -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] - --enable-sim-hardware Whether to enable hardware/device simulation - Report bugs to the package provider. _ACEOF ac_status=$? @@ -1679,48 +1668,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5 -$as_echo_n "checking for sim hardware settings... " >&6; } -# Check whether --enable-sim-hardware was given. -if test "${enable_sim_hardware+set}" = set; then : - enableval=$enable_sim_hardware; -else - enable_sim_hardware="yes" -fi - -sim_hw_sockser= -if test "$enable_sim_hardware" = no; then - sim_hw_cflags="-DWITH_HW=0" -elif test "$enable_sim_hardware" = yes; then - sim_hw_cflags="-DWITH_HW=1" - # mingw does not support sockser - case ${host} in - *mingw*) ;; - *) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device - # that you instatiate. Instead, other code will call into it directly. - # At some point, we should convert it over. - sim_hw_sockser="dv-sockser.o" - sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER" - ;; - esac -else - as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5 -fi -if test "$enable_sim_hardware" = "yes"; then - SIM_ENABLE_HW_TRUE= - SIM_ENABLE_HW_FALSE='#' -else - SIM_ENABLE_HW_TRUE='#' - SIM_ENABLE_HW_FALSE= -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5 -$as_echo "${enable_sim_hardware}" >&6; } - - - - cgen_breaks="" if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then cgen_breaks="break cgen_rtx_error"; diff --git a/sim/erc32/ChangeLog b/sim/erc32/ChangeLog index 75446a9857..0e9ee9ffaf 100644 --- a/sim/erc32/ChangeLog +++ b/sim/erc32/ChangeLog @@ -1,3 +1,8 @@ +2021-06-21 Mike Frysinger + + * aclocal.m4: Regenerate. + * configure: Regenerate. + 2021-06-21 Mike Frysinger * configure: Regenerate. diff --git a/sim/erc32/aclocal.m4 b/sim/erc32/aclocal.m4 index 1e96f107be..c9414d4680 100644 --- a/sim/erc32/aclocal.m4 +++ b/sim/erc32/aclocal.m4 @@ -12,5 +12,4 @@ # PARTICULAR PURPOSE. m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -m4_include([../m4/sim_ac_option_hardware.m4]) m4_include([../m4/sim_ac_output.m4]) diff --git a/sim/erc32/configure b/sim/erc32/configure index 474a7826a1..60f947c7b4 100755 --- a/sim/erc32/configure +++ b/sim/erc32/configure @@ -591,10 +591,6 @@ sim_scache sim_float sim_bitsize cgen_breaks -sim_hw_sockser -sim_hw_cflags -SIM_ENABLE_HW_FALSE -SIM_ENABLE_HW_TRUE READLINE_CFLAGS READLINE TERMCAP @@ -649,7 +645,6 @@ SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking -enable_sim_hardware ' ac_precious_vars='build_alias host_alias @@ -1263,12 +1258,6 @@ if test -n "$ac_init_help"; then cat <<\_ACEOF -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] - --enable-sim-hardware Whether to enable hardware/device simulation - Some influential environment variables: CC C compiler command CFLAGS C compiler flags @@ -3032,48 +3021,6 @@ fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5 -$as_echo_n "checking for sim hardware settings... " >&6; } -# Check whether --enable-sim-hardware was given. -if test "${enable_sim_hardware+set}" = set; then : - enableval=$enable_sim_hardware; -else - enable_sim_hardware="yes" -fi - -sim_hw_sockser= -if test "$enable_sim_hardware" = no; then - sim_hw_cflags="-DWITH_HW=0" -elif test "$enable_sim_hardware" = yes; then - sim_hw_cflags="-DWITH_HW=1" - # mingw does not support sockser - case ${host} in - *mingw*) ;; - *) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device - # that you instatiate. Instead, other code will call into it directly. - # At some point, we should convert it over. - sim_hw_sockser="dv-sockser.o" - sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER" - ;; - esac -else - as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5 -fi -if test "$enable_sim_hardware" = "yes"; then - SIM_ENABLE_HW_TRUE= - SIM_ENABLE_HW_FALSE='#' -else - SIM_ENABLE_HW_TRUE='#' - SIM_ENABLE_HW_FALSE= -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5 -$as_echo "${enable_sim_hardware}" >&6; } - - - - cgen_breaks="" if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then cgen_breaks="break cgen_rtx_error"; diff --git a/sim/example-synacor/ChangeLog b/sim/example-synacor/ChangeLog index ed8ddc3b07..de004680a9 100644 --- a/sim/example-synacor/ChangeLog +++ b/sim/example-synacor/ChangeLog @@ -1,3 +1,8 @@ +2021-06-21 Mike Frysinger + + * aclocal.m4: Regenerate. + * configure: Regenerate. + 2021-06-21 Mike Frysinger * configure: Regenerate. diff --git a/sim/example-synacor/aclocal.m4 b/sim/example-synacor/aclocal.m4 index 1e96f107be..c9414d4680 100644 --- a/sim/example-synacor/aclocal.m4 +++ b/sim/example-synacor/aclocal.m4 @@ -12,5 +12,4 @@ # PARTICULAR PURPOSE. m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -m4_include([../m4/sim_ac_option_hardware.m4]) m4_include([../m4/sim_ac_output.m4]) diff --git a/sim/example-synacor/configure b/sim/example-synacor/configure index f3b1467d75..cc3fa8b0d9 100755 --- a/sim/example-synacor/configure +++ b/sim/example-synacor/configure @@ -590,10 +590,6 @@ sim_scache sim_float sim_bitsize cgen_breaks -sim_hw_sockser -sim_hw_cflags -SIM_ENABLE_HW_FALSE -SIM_ENABLE_HW_TRUE target_alias host_alias build_alias @@ -635,7 +631,6 @@ SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking -enable_sim_hardware ' ac_precious_vars='build_alias host_alias @@ -1243,12 +1238,6 @@ if test -n "$ac_init_help"; then cat <<\_ACEOF -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] - --enable-sim-hardware Whether to enable hardware/device simulation - Report bugs to the package provider. _ACEOF ac_status=$? @@ -1679,48 +1668,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5 -$as_echo_n "checking for sim hardware settings... " >&6; } -# Check whether --enable-sim-hardware was given. -if test "${enable_sim_hardware+set}" = set; then : - enableval=$enable_sim_hardware; -else - enable_sim_hardware="yes" -fi - -sim_hw_sockser= -if test "$enable_sim_hardware" = no; then - sim_hw_cflags="-DWITH_HW=0" -elif test "$enable_sim_hardware" = yes; then - sim_hw_cflags="-DWITH_HW=1" - # mingw does not support sockser - case ${host} in - *mingw*) ;; - *) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device - # that you instatiate. Instead, other code will call into it directly. - # At some point, we should convert it over. - sim_hw_sockser="dv-sockser.o" - sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER" - ;; - esac -else - as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5 -fi -if test "$enable_sim_hardware" = "yes"; then - SIM_ENABLE_HW_TRUE= - SIM_ENABLE_HW_FALSE='#' -else - SIM_ENABLE_HW_TRUE='#' - SIM_ENABLE_HW_FALSE= -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5 -$as_echo "${enable_sim_hardware}" >&6; } - - - - cgen_breaks="" if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then cgen_breaks="break cgen_rtx_error"; diff --git a/sim/frv/ChangeLog b/sim/frv/ChangeLog index 6bdcc60b03..c5f241bd0a 100644 --- a/sim/frv/ChangeLog +++ b/sim/frv/ChangeLog @@ -1,3 +1,8 @@ +2021-06-21 Mike Frysinger + + * aclocal.m4: Regenerate. + * configure: Regenerate. + 2021-06-21 Mike Frysinger * configure: Regenerate. diff --git a/sim/frv/aclocal.m4 b/sim/frv/aclocal.m4 index 08ac8b16a7..212a399016 100644 --- a/sim/frv/aclocal.m4 +++ b/sim/frv/aclocal.m4 @@ -13,6 +13,5 @@ m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_include([../m4/sim_ac_option_default_model.m4]) -m4_include([../m4/sim_ac_option_hardware.m4]) m4_include([../m4/sim_ac_option_scache.m4]) m4_include([../m4/sim_ac_output.m4]) diff --git a/sim/frv/configure b/sim/frv/configure index 922b9371db..1d05bb0dd3 100755 --- a/sim/frv/configure +++ b/sim/frv/configure @@ -588,10 +588,6 @@ sim_reserved_bits sim_float sim_bitsize cgen_breaks -sim_hw_sockser -sim_hw_cflags -SIM_ENABLE_HW_FALSE -SIM_ENABLE_HW_TRUE sim_trapdump target_alias host_alias @@ -639,7 +635,6 @@ enable_option_checking enable_sim_scache enable_sim_default_model enable_sim_trapdump -enable_sim_hardware ' ac_precious_vars='build_alias host_alias @@ -1256,7 +1251,6 @@ Optional Features: --enable-sim-default-model=model Specify default model to simulate --enable-sim-trapdump Make unknown traps dump the registers - --enable-sim-hardware Whether to enable hardware/device simulation Report bugs to the package provider. _ACEOF @@ -1742,48 +1736,6 @@ else fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5 -$as_echo_n "checking for sim hardware settings... " >&6; } -# Check whether --enable-sim-hardware was given. -if test "${enable_sim_hardware+set}" = set; then : - enableval=$enable_sim_hardware; -else - enable_sim_hardware="yes" -fi - -sim_hw_sockser= -if test "$enable_sim_hardware" = no; then - sim_hw_cflags="-DWITH_HW=0" -elif test "$enable_sim_hardware" = yes; then - sim_hw_cflags="-DWITH_HW=1" - # mingw does not support sockser - case ${host} in - *mingw*) ;; - *) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device - # that you instatiate. Instead, other code will call into it directly. - # At some point, we should convert it over. - sim_hw_sockser="dv-sockser.o" - sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER" - ;; - esac -else - as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5 -fi -if test "$enable_sim_hardware" = "yes"; then - SIM_ENABLE_HW_TRUE= - SIM_ENABLE_HW_FALSE='#' -else - SIM_ENABLE_HW_TRUE='#' - SIM_ENABLE_HW_FALSE= -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5 -$as_echo "${enable_sim_hardware}" >&6; } - - - - cgen_breaks="" if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then cgen_breaks="break cgen_rtx_error"; diff --git a/sim/ft32/ChangeLog b/sim/ft32/ChangeLog index c8a4629bec..450e8d1486 100644 --- a/sim/ft32/ChangeLog +++ b/sim/ft32/ChangeLog @@ -1,3 +1,8 @@ +2021-06-21 Mike Frysinger + + * aclocal.m4: Regenerate. + * configure: Regenerate. + 2021-06-21 Mike Frysinger * configure: Regenerate. diff --git a/sim/ft32/aclocal.m4 b/sim/ft32/aclocal.m4 index 1e96f107be..c9414d4680 100644 --- a/sim/ft32/aclocal.m4 +++ b/sim/ft32/aclocal.m4 @@ -12,5 +12,4 @@ # PARTICULAR PURPOSE. m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -m4_include([../m4/sim_ac_option_hardware.m4]) m4_include([../m4/sim_ac_output.m4]) diff --git a/sim/ft32/configure b/sim/ft32/configure index f3b1467d75..cc3fa8b0d9 100755 --- a/sim/ft32/configure +++ b/sim/ft32/configure @@ -590,10 +590,6 @@ sim_scache sim_float sim_bitsize cgen_breaks -sim_hw_sockser -sim_hw_cflags -SIM_ENABLE_HW_FALSE -SIM_ENABLE_HW_TRUE target_alias host_alias build_alias @@ -635,7 +631,6 @@ SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking -enable_sim_hardware ' ac_precious_vars='build_alias host_alias @@ -1243,12 +1238,6 @@ if test -n "$ac_init_help"; then cat <<\_ACEOF -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] - --enable-sim-hardware Whether to enable hardware/device simulation - Report bugs to the package provider. _ACEOF ac_status=$? @@ -1679,48 +1668,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5 -$as_echo_n "checking for sim hardware settings... " >&6; } -# Check whether --enable-sim-hardware was given. -if test "${enable_sim_hardware+set}" = set; then : - enableval=$enable_sim_hardware; -else - enable_sim_hardware="yes" -fi - -sim_hw_sockser= -if test "$enable_sim_hardware" = no; then - sim_hw_cflags="-DWITH_HW=0" -elif test "$enable_sim_hardware" = yes; then - sim_hw_cflags="-DWITH_HW=1" - # mingw does not support sockser - case ${host} in - *mingw*) ;; - *) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device - # that you instatiate. Instead, other code will call into it directly. - # At some point, we should convert it over. - sim_hw_sockser="dv-sockser.o" - sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER" - ;; - esac -else - as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5 -fi -if test "$enable_sim_hardware" = "yes"; then - SIM_ENABLE_HW_TRUE= - SIM_ENABLE_HW_FALSE='#' -else - SIM_ENABLE_HW_TRUE='#' - SIM_ENABLE_HW_FALSE= -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5 -$as_echo "${enable_sim_hardware}" >&6; } - - - - cgen_breaks="" if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then cgen_breaks="break cgen_rtx_error"; diff --git a/sim/h8300/ChangeLog b/sim/h8300/ChangeLog index 94b6f3b055..4fa308d7d7 100644 --- a/sim/h8300/ChangeLog +++ b/sim/h8300/ChangeLog @@ -1,3 +1,8 @@ +2021-06-21 Mike Frysinger + + * aclocal.m4: Regenerate. + * configure: Regenerate. + 2021-06-21 Mike Frysinger * configure: Regenerate. diff --git a/sim/h8300/aclocal.m4 b/sim/h8300/aclocal.m4 index 1e96f107be..c9414d4680 100644 --- a/sim/h8300/aclocal.m4 +++ b/sim/h8300/aclocal.m4 @@ -12,5 +12,4 @@ # PARTICULAR PURPOSE. m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -m4_include([../m4/sim_ac_option_hardware.m4]) m4_include([../m4/sim_ac_output.m4]) diff --git a/sim/h8300/configure b/sim/h8300/configure index f3b1467d75..cc3fa8b0d9 100755 --- a/sim/h8300/configure +++ b/sim/h8300/configure @@ -590,10 +590,6 @@ sim_scache sim_float sim_bitsize cgen_breaks -sim_hw_sockser -sim_hw_cflags -SIM_ENABLE_HW_FALSE -SIM_ENABLE_HW_TRUE target_alias host_alias build_alias @@ -635,7 +631,6 @@ SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking -enable_sim_hardware ' ac_precious_vars='build_alias host_alias @@ -1243,12 +1238,6 @@ if test -n "$ac_init_help"; then cat <<\_ACEOF -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] - --enable-sim-hardware Whether to enable hardware/device simulation - Report bugs to the package provider. _ACEOF ac_status=$? @@ -1679,48 +1668,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5 -$as_echo_n "checking for sim hardware settings... " >&6; } -# Check whether --enable-sim-hardware was given. -if test "${enable_sim_hardware+set}" = set; then : - enableval=$enable_sim_hardware; -else - enable_sim_hardware="yes" -fi - -sim_hw_sockser= -if test "$enable_sim_hardware" = no; then - sim_hw_cflags="-DWITH_HW=0" -elif test "$enable_sim_hardware" = yes; then - sim_hw_cflags="-DWITH_HW=1" - # mingw does not support sockser - case ${host} in - *mingw*) ;; - *) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device - # that you instatiate. Instead, other code will call into it directly. - # At some point, we should convert it over. - sim_hw_sockser="dv-sockser.o" - sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER" - ;; - esac -else - as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5 -fi -if test "$enable_sim_hardware" = "yes"; then - SIM_ENABLE_HW_TRUE= - SIM_ENABLE_HW_FALSE='#' -else - SIM_ENABLE_HW_TRUE='#' - SIM_ENABLE_HW_FALSE= -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5 -$as_echo "${enable_sim_hardware}" >&6; } - - - - cgen_breaks="" if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then cgen_breaks="break cgen_rtx_error"; diff --git a/sim/iq2000/ChangeLog b/sim/iq2000/ChangeLog index d54be42edd..e771530983 100644 --- a/sim/iq2000/ChangeLog +++ b/sim/iq2000/ChangeLog @@ -1,3 +1,8 @@ +2021-06-21 Mike Frysinger + + * aclocal.m4: Regenerate. + * configure: Regenerate. + 2021-06-21 Mike Frysinger * configure: Regenerate. diff --git a/sim/iq2000/aclocal.m4 b/sim/iq2000/aclocal.m4 index 08ac8b16a7..212a399016 100644 --- a/sim/iq2000/aclocal.m4 +++ b/sim/iq2000/aclocal.m4 @@ -13,6 +13,5 @@ m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_include([../m4/sim_ac_option_default_model.m4]) -m4_include([../m4/sim_ac_option_hardware.m4]) m4_include([../m4/sim_ac_option_scache.m4]) m4_include([../m4/sim_ac_output.m4]) diff --git a/sim/iq2000/configure b/sim/iq2000/configure index 72799cef83..511dbf3955 100755 --- a/sim/iq2000/configure +++ b/sim/iq2000/configure @@ -588,10 +588,6 @@ sim_reserved_bits sim_float sim_bitsize cgen_breaks -sim_hw_sockser -sim_hw_cflags -SIM_ENABLE_HW_FALSE -SIM_ENABLE_HW_TRUE target_alias host_alias build_alias @@ -637,7 +633,6 @@ ac_user_opts=' enable_option_checking enable_sim_scache enable_sim_default_model -enable_sim_hardware ' ac_precious_vars='build_alias host_alias @@ -1253,7 +1248,6 @@ Optional Features: Specify simulator execution cache size --enable-sim-default-model=model Specify default model to simulate - --enable-sim-hardware Whether to enable hardware/device simulation Report bugs to the package provider. _ACEOF @@ -1721,48 +1715,6 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5 -$as_echo_n "checking for sim hardware settings... " >&6; } -# Check whether --enable-sim-hardware was given. -if test "${enable_sim_hardware+set}" = set; then : - enableval=$enable_sim_hardware; -else - enable_sim_hardware="yes" -fi - -sim_hw_sockser= -if test "$enable_sim_hardware" = no; then - sim_hw_cflags="-DWITH_HW=0" -elif test "$enable_sim_hardware" = yes; then - sim_hw_cflags="-DWITH_HW=1" - # mingw does not support sockser - case ${host} in - *mingw*) ;; - *) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device - # that you instatiate. Instead, other code will call into it directly. - # At some point, we should convert it over. - sim_hw_sockser="dv-sockser.o" - sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER" - ;; - esac -else - as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5 -fi -if test "$enable_sim_hardware" = "yes"; then - SIM_ENABLE_HW_TRUE= - SIM_ENABLE_HW_FALSE='#' -else - SIM_ENABLE_HW_TRUE='#' - SIM_ENABLE_HW_FALSE= -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5 -$as_echo "${enable_sim_hardware}" >&6; } - - - - cgen_breaks="" if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then cgen_breaks="break cgen_rtx_error"; diff --git a/sim/lm32/ChangeLog b/sim/lm32/ChangeLog index 00da0a93f6..2508e40570 100644 --- a/sim/lm32/ChangeLog +++ b/sim/lm32/ChangeLog @@ -1,3 +1,8 @@ +2021-06-21 Mike Frysinger + + * aclocal.m4: Regenerate. + * configure: Regenerate. + 2021-06-21 Mike Frysinger * Makefile.in (SIM_EXTRA_HW_DEVICES): Define. diff --git a/sim/lm32/aclocal.m4 b/sim/lm32/aclocal.m4 index 08ac8b16a7..212a399016 100644 --- a/sim/lm32/aclocal.m4 +++ b/sim/lm32/aclocal.m4 @@ -13,6 +13,5 @@ m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_include([../m4/sim_ac_option_default_model.m4]) -m4_include([../m4/sim_ac_option_hardware.m4]) m4_include([../m4/sim_ac_option_scache.m4]) m4_include([../m4/sim_ac_output.m4]) diff --git a/sim/lm32/configure b/sim/lm32/configure index 7a2d07c3ed..85e28ca9ad 100755 --- a/sim/lm32/configure +++ b/sim/lm32/configure @@ -588,10 +588,6 @@ sim_reserved_bits sim_float sim_bitsize cgen_breaks -sim_hw_sockser -sim_hw_cflags -SIM_ENABLE_HW_FALSE -SIM_ENABLE_HW_TRUE target_alias host_alias build_alias @@ -637,7 +633,6 @@ ac_user_opts=' enable_option_checking enable_sim_scache enable_sim_default_model -enable_sim_hardware ' ac_precious_vars='build_alias host_alias @@ -1253,7 +1248,6 @@ Optional Features: Specify simulator execution cache size --enable-sim-default-model=model Specify default model to simulate - --enable-sim-hardware Whether to enable hardware/device simulation Report bugs to the package provider. _ACEOF @@ -1721,48 +1715,6 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5 -$as_echo_n "checking for sim hardware settings... " >&6; } -# Check whether --enable-sim-hardware was given. -if test "${enable_sim_hardware+set}" = set; then : - enableval=$enable_sim_hardware; -else - enable_sim_hardware="yes" -fi - -sim_hw_sockser= -if test "$enable_sim_hardware" = no; then - sim_hw_cflags="-DWITH_HW=0" -elif test "$enable_sim_hardware" = yes; then - sim_hw_cflags="-DWITH_HW=1" - # mingw does not support sockser - case ${host} in - *mingw*) ;; - *) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device - # that you instatiate. Instead, other code will call into it directly. - # At some point, we should convert it over. - sim_hw_sockser="dv-sockser.o" - sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER" - ;; - esac -else - as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5 -fi -if test "$enable_sim_hardware" = "yes"; then - SIM_ENABLE_HW_TRUE= - SIM_ENABLE_HW_FALSE='#' -else - SIM_ENABLE_HW_TRUE='#' - SIM_ENABLE_HW_FALSE= -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5 -$as_echo "${enable_sim_hardware}" >&6; } - - - - cgen_breaks="" if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then cgen_breaks="break cgen_rtx_error"; diff --git a/sim/m32c/ChangeLog b/sim/m32c/ChangeLog index 428c348d24..bfdc53d6f2 100644 --- a/sim/m32c/ChangeLog +++ b/sim/m32c/ChangeLog @@ -1,3 +1,8 @@ +2021-06-21 Mike Frysinger + + * aclocal.m4: Regenerate. + * configure: Regenerate. + 2021-06-21 Mike Frysinger * configure: Regenerate. diff --git a/sim/m32c/aclocal.m4 b/sim/m32c/aclocal.m4 index 1e96f107be..c9414d4680 100644 --- a/sim/m32c/aclocal.m4 +++ b/sim/m32c/aclocal.m4 @@ -12,5 +12,4 @@ # PARTICULAR PURPOSE. m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -m4_include([../m4/sim_ac_option_hardware.m4]) m4_include([../m4/sim_ac_output.m4]) diff --git a/sim/m32c/configure b/sim/m32c/configure index f3b1467d75..cc3fa8b0d9 100755 --- a/sim/m32c/configure +++ b/sim/m32c/configure @@ -590,10 +590,6 @@ sim_scache sim_float sim_bitsize cgen_breaks -sim_hw_sockser -sim_hw_cflags -SIM_ENABLE_HW_FALSE -SIM_ENABLE_HW_TRUE target_alias host_alias build_alias @@ -635,7 +631,6 @@ SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking -enable_sim_hardware ' ac_precious_vars='build_alias host_alias @@ -1243,12 +1238,6 @@ if test -n "$ac_init_help"; then cat <<\_ACEOF -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] - --enable-sim-hardware Whether to enable hardware/device simulation - Report bugs to the package provider. _ACEOF ac_status=$? @@ -1679,48 +1668,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5 -$as_echo_n "checking for sim hardware settings... " >&6; } -# Check whether --enable-sim-hardware was given. -if test "${enable_sim_hardware+set}" = set; then : - enableval=$enable_sim_hardware; -else - enable_sim_hardware="yes" -fi - -sim_hw_sockser= -if test "$enable_sim_hardware" = no; then - sim_hw_cflags="-DWITH_HW=0" -elif test "$enable_sim_hardware" = yes; then - sim_hw_cflags="-DWITH_HW=1" - # mingw does not support sockser - case ${host} in - *mingw*) ;; - *) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device - # that you instatiate. Instead, other code will call into it directly. - # At some point, we should convert it over. - sim_hw_sockser="dv-sockser.o" - sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER" - ;; - esac -else - as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5 -fi -if test "$enable_sim_hardware" = "yes"; then - SIM_ENABLE_HW_TRUE= - SIM_ENABLE_HW_FALSE='#' -else - SIM_ENABLE_HW_TRUE='#' - SIM_ENABLE_HW_FALSE= -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5 -$as_echo "${enable_sim_hardware}" >&6; } - - - - cgen_breaks="" if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then cgen_breaks="break cgen_rtx_error"; diff --git a/sim/m32r/ChangeLog b/sim/m32r/ChangeLog index 87d6a42835..7bbeadc63a 100644 --- a/sim/m32r/ChangeLog +++ b/sim/m32r/ChangeLog @@ -1,3 +1,8 @@ +2021-06-21 Mike Frysinger + + * aclocal.m4: Regenerate. + * configure: Regenerate. + 2021-06-21 Mike Frysinger * Makefile.in (SIM_EXTRA_HW_DEVICES): Define. diff --git a/sim/m32r/aclocal.m4 b/sim/m32r/aclocal.m4 index 08ac8b16a7..212a399016 100644 --- a/sim/m32r/aclocal.m4 +++ b/sim/m32r/aclocal.m4 @@ -13,6 +13,5 @@ m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_include([../m4/sim_ac_option_default_model.m4]) -m4_include([../m4/sim_ac_option_hardware.m4]) m4_include([../m4/sim_ac_option_scache.m4]) m4_include([../m4/sim_ac_output.m4]) diff --git a/sim/m32r/configure b/sim/m32r/configure index b115b957da..c258ee5041 100755 --- a/sim/m32r/configure +++ b/sim/m32r/configure @@ -588,10 +588,6 @@ sim_reserved_bits sim_float sim_bitsize cgen_breaks -sim_hw_sockser -sim_hw_cflags -SIM_ENABLE_HW_FALSE -SIM_ENABLE_HW_TRUE sim_extra_cflags traps_obj target_alias @@ -639,7 +635,6 @@ ac_user_opts=' enable_option_checking enable_sim_scache enable_sim_default_model -enable_sim_hardware ' ac_precious_vars='build_alias host_alias @@ -1255,7 +1250,6 @@ Optional Features: Specify simulator execution cache size --enable-sim-default-model=model Specify default model to simulate - --enable-sim-hardware Whether to enable hardware/device simulation Report bugs to the package provider. _ACEOF @@ -1736,48 +1730,6 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5 -$as_echo_n "checking for sim hardware settings... " >&6; } -# Check whether --enable-sim-hardware was given. -if test "${enable_sim_hardware+set}" = set; then : - enableval=$enable_sim_hardware; -else - enable_sim_hardware="yes" -fi - -sim_hw_sockser= -if test "$enable_sim_hardware" = no; then - sim_hw_cflags="-DWITH_HW=0" -elif test "$enable_sim_hardware" = yes; then - sim_hw_cflags="-DWITH_HW=1" - # mingw does not support sockser - case ${host} in - *mingw*) ;; - *) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device - # that you instatiate. Instead, other code will call into it directly. - # At some point, we should convert it over. - sim_hw_sockser="dv-sockser.o" - sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER" - ;; - esac -else - as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5 -fi -if test "$enable_sim_hardware" = "yes"; then - SIM_ENABLE_HW_TRUE= - SIM_ENABLE_HW_FALSE='#' -else - SIM_ENABLE_HW_TRUE='#' - SIM_ENABLE_HW_FALSE= -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5 -$as_echo "${enable_sim_hardware}" >&6; } - - - - cgen_breaks="" if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then cgen_breaks="break cgen_rtx_error"; diff --git a/sim/m4/sim_ac_option_hardware.m4 b/sim/m4/sim_ac_option_hardware.m4 index 14101830e8..ed53cd2f12 100644 --- a/sim/m4/sim_ac_option_hardware.m4 +++ b/sim/m4/sim_ac_option_hardware.m4 @@ -39,16 +39,7 @@ elif test "$enable_sim_hardware" = yes; then else AC_MSG_ERROR([unknown argument "$enable_sim_hardware"]) fi -dnl AM_CONDITIONAL([SIM_ENABLE_HW], [test "$enable_sim_hardware" = "yes"]) -if test "$enable_sim_hardware" = "yes"; then - SIM_ENABLE_HW_TRUE= - SIM_ENABLE_HW_FALSE='#' -else - SIM_ENABLE_HW_TRUE='#' - SIM_ENABLE_HW_FALSE= -fi -AC_SUBST(SIM_ENABLE_HW_TRUE) -AC_SUBST(SIM_ENABLE_HW_FALSE) +AM_CONDITIONAL([SIM_ENABLE_HW], [test "$enable_sim_hardware" = "yes"]) AC_MSG_RESULT(${enable_sim_hardware}) AC_SUBST(sim_hw_cflags) AC_SUBST(sim_hw_sockser) diff --git a/sim/m4/sim_ac_output.m4 b/sim/m4/sim_ac_output.m4 index 8d260421e0..aba45b0bc3 100644 --- a/sim/m4/sim_ac_output.m4 +++ b/sim/m4/sim_ac_output.m4 @@ -21,8 +21,6 @@ dnl one afterwards. The two pieces of the common fragment are inserted into dnl the target's fragment at the appropriate points. AC_DEFUN([SIM_AC_OUTPUT], [dnl -AC_REQUIRE([SIM_AC_OPTION_HARDWARE])dnl - dnl Make @cgen_breaks@ non-null only if the sim uses CGEN. cgen_breaks="" if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then diff --git a/sim/m68hc11/ChangeLog b/sim/m68hc11/ChangeLog index ea7373a0be..986d371360 100644 --- a/sim/m68hc11/ChangeLog +++ b/sim/m68hc11/ChangeLog @@ -1,3 +1,8 @@ +2021-06-21 Mike Frysinger + + * aclocal.m4: Regenerate. + * configure: Regenerate. + 2021-06-21 Mike Frysinger * Makefile.in (SIM_EXTRA_HW_DEVICES): Define. diff --git a/sim/m68hc11/aclocal.m4 b/sim/m68hc11/aclocal.m4 index 1e96f107be..c9414d4680 100644 --- a/sim/m68hc11/aclocal.m4 +++ b/sim/m68hc11/aclocal.m4 @@ -12,5 +12,4 @@ # PARTICULAR PURPOSE. m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -m4_include([../m4/sim_ac_option_hardware.m4]) m4_include([../m4/sim_ac_output.m4]) diff --git a/sim/m68hc11/configure b/sim/m68hc11/configure index f3b1467d75..cc3fa8b0d9 100755 --- a/sim/m68hc11/configure +++ b/sim/m68hc11/configure @@ -590,10 +590,6 @@ sim_scache sim_float sim_bitsize cgen_breaks -sim_hw_sockser -sim_hw_cflags -SIM_ENABLE_HW_FALSE -SIM_ENABLE_HW_TRUE target_alias host_alias build_alias @@ -635,7 +631,6 @@ SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking -enable_sim_hardware ' ac_precious_vars='build_alias host_alias @@ -1243,12 +1238,6 @@ if test -n "$ac_init_help"; then cat <<\_ACEOF -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] - --enable-sim-hardware Whether to enable hardware/device simulation - Report bugs to the package provider. _ACEOF ac_status=$? @@ -1679,48 +1668,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5 -$as_echo_n "checking for sim hardware settings... " >&6; } -# Check whether --enable-sim-hardware was given. -if test "${enable_sim_hardware+set}" = set; then : - enableval=$enable_sim_hardware; -else - enable_sim_hardware="yes" -fi - -sim_hw_sockser= -if test "$enable_sim_hardware" = no; then - sim_hw_cflags="-DWITH_HW=0" -elif test "$enable_sim_hardware" = yes; then - sim_hw_cflags="-DWITH_HW=1" - # mingw does not support sockser - case ${host} in - *mingw*) ;; - *) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device - # that you instatiate. Instead, other code will call into it directly. - # At some point, we should convert it over. - sim_hw_sockser="dv-sockser.o" - sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER" - ;; - esac -else - as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5 -fi -if test "$enable_sim_hardware" = "yes"; then - SIM_ENABLE_HW_TRUE= - SIM_ENABLE_HW_FALSE='#' -else - SIM_ENABLE_HW_TRUE='#' - SIM_ENABLE_HW_FALSE= -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5 -$as_echo "${enable_sim_hardware}" >&6; } - - - - cgen_breaks="" if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then cgen_breaks="break cgen_rtx_error"; diff --git a/sim/mcore/ChangeLog b/sim/mcore/ChangeLog index f2a862efe0..3fe68c6778 100644 --- a/sim/mcore/ChangeLog +++ b/sim/mcore/ChangeLog @@ -1,3 +1,8 @@ +2021-06-21 Mike Frysinger + + * aclocal.m4: Regenerate. + * configure: Regenerate. + 2021-06-21 Mike Frysinger * configure: Regenerate. diff --git a/sim/mcore/aclocal.m4 b/sim/mcore/aclocal.m4 index 1e96f107be..c9414d4680 100644 --- a/sim/mcore/aclocal.m4 +++ b/sim/mcore/aclocal.m4 @@ -12,5 +12,4 @@ # PARTICULAR PURPOSE. m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -m4_include([../m4/sim_ac_option_hardware.m4]) m4_include([../m4/sim_ac_output.m4]) diff --git a/sim/mcore/configure b/sim/mcore/configure index f3b1467d75..cc3fa8b0d9 100755 --- a/sim/mcore/configure +++ b/sim/mcore/configure @@ -590,10 +590,6 @@ sim_scache sim_float sim_bitsize cgen_breaks -sim_hw_sockser -sim_hw_cflags -SIM_ENABLE_HW_FALSE -SIM_ENABLE_HW_TRUE target_alias host_alias build_alias @@ -635,7 +631,6 @@ SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking -enable_sim_hardware ' ac_precious_vars='build_alias host_alias @@ -1243,12 +1238,6 @@ if test -n "$ac_init_help"; then cat <<\_ACEOF -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] - --enable-sim-hardware Whether to enable hardware/device simulation - Report bugs to the package provider. _ACEOF ac_status=$? @@ -1679,48 +1668,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5 -$as_echo_n "checking for sim hardware settings... " >&6; } -# Check whether --enable-sim-hardware was given. -if test "${enable_sim_hardware+set}" = set; then : - enableval=$enable_sim_hardware; -else - enable_sim_hardware="yes" -fi - -sim_hw_sockser= -if test "$enable_sim_hardware" = no; then - sim_hw_cflags="-DWITH_HW=0" -elif test "$enable_sim_hardware" = yes; then - sim_hw_cflags="-DWITH_HW=1" - # mingw does not support sockser - case ${host} in - *mingw*) ;; - *) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device - # that you instatiate. Instead, other code will call into it directly. - # At some point, we should convert it over. - sim_hw_sockser="dv-sockser.o" - sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER" - ;; - esac -else - as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5 -fi -if test "$enable_sim_hardware" = "yes"; then - SIM_ENABLE_HW_TRUE= - SIM_ENABLE_HW_FALSE='#' -else - SIM_ENABLE_HW_TRUE='#' - SIM_ENABLE_HW_FALSE= -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5 -$as_echo "${enable_sim_hardware}" >&6; } - - - - cgen_breaks="" if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then cgen_breaks="break cgen_rtx_error"; diff --git a/sim/microblaze/ChangeLog b/sim/microblaze/ChangeLog index d2abcb6a77..da8e4df49e 100644 --- a/sim/microblaze/ChangeLog +++ b/sim/microblaze/ChangeLog @@ -1,3 +1,8 @@ +2021-06-21 Mike Frysinger + + * aclocal.m4: Regenerate. + * configure: Regenerate. + 2021-06-21 Mike Frysinger * configure: Regenerate. diff --git a/sim/microblaze/aclocal.m4 b/sim/microblaze/aclocal.m4 index 1e96f107be..c9414d4680 100644 --- a/sim/microblaze/aclocal.m4 +++ b/sim/microblaze/aclocal.m4 @@ -12,5 +12,4 @@ # PARTICULAR PURPOSE. m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -m4_include([../m4/sim_ac_option_hardware.m4]) m4_include([../m4/sim_ac_output.m4]) diff --git a/sim/microblaze/configure b/sim/microblaze/configure index f3b1467d75..cc3fa8b0d9 100755 --- a/sim/microblaze/configure +++ b/sim/microblaze/configure @@ -590,10 +590,6 @@ sim_scache sim_float sim_bitsize cgen_breaks -sim_hw_sockser -sim_hw_cflags -SIM_ENABLE_HW_FALSE -SIM_ENABLE_HW_TRUE target_alias host_alias build_alias @@ -635,7 +631,6 @@ SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking -enable_sim_hardware ' ac_precious_vars='build_alias host_alias @@ -1243,12 +1238,6 @@ if test -n "$ac_init_help"; then cat <<\_ACEOF -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] - --enable-sim-hardware Whether to enable hardware/device simulation - Report bugs to the package provider. _ACEOF ac_status=$? @@ -1679,48 +1668,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5 -$as_echo_n "checking for sim hardware settings... " >&6; } -# Check whether --enable-sim-hardware was given. -if test "${enable_sim_hardware+set}" = set; then : - enableval=$enable_sim_hardware; -else - enable_sim_hardware="yes" -fi - -sim_hw_sockser= -if test "$enable_sim_hardware" = no; then - sim_hw_cflags="-DWITH_HW=0" -elif test "$enable_sim_hardware" = yes; then - sim_hw_cflags="-DWITH_HW=1" - # mingw does not support sockser - case ${host} in - *mingw*) ;; - *) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device - # that you instatiate. Instead, other code will call into it directly. - # At some point, we should convert it over. - sim_hw_sockser="dv-sockser.o" - sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER" - ;; - esac -else - as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5 -fi -if test "$enable_sim_hardware" = "yes"; then - SIM_ENABLE_HW_TRUE= - SIM_ENABLE_HW_FALSE='#' -else - SIM_ENABLE_HW_TRUE='#' - SIM_ENABLE_HW_FALSE= -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5 -$as_echo "${enable_sim_hardware}" >&6; } - - - - cgen_breaks="" if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then cgen_breaks="break cgen_rtx_error"; diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog index 168ea0a615..e71d6327d2 100644 --- a/sim/mips/ChangeLog +++ b/sim/mips/ChangeLog @@ -1,3 +1,8 @@ +2021-06-21 Mike Frysinger + + * aclocal.m4: Regenerate. + * configure: Regenerate. + 2021-06-21 Mike Frysinger * Makefile.in (SIM_EXTRA_HW_DEVICES): Define. diff --git a/sim/mips/aclocal.m4 b/sim/mips/aclocal.m4 index 95e62b9d98..be0d398dfd 100644 --- a/sim/mips/aclocal.m4 +++ b/sim/mips/aclocal.m4 @@ -14,6 +14,5 @@ m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_include([../m4/sim_ac_option_bitsize.m4]) m4_include([../m4/sim_ac_option_float.m4]) -m4_include([../m4/sim_ac_option_hardware.m4]) m4_include([../m4/sim_ac_option_reserved_bits.m4]) m4_include([../m4/sim_ac_output.m4]) diff --git a/sim/mips/configure b/sim/mips/configure index 98ad8d5023..241879d001 100755 --- a/sim/mips/configure +++ b/sim/mips/configure @@ -587,10 +587,6 @@ LIBOBJS sim_default_model sim_scache cgen_breaks -sim_hw_sockser -sim_hw_cflags -SIM_ENABLE_HW_FALSE -SIM_ENABLE_HW_TRUE sim_multi_obj sim_multi_src sim_multi_igen_configs @@ -648,7 +644,6 @@ enable_option_checking enable_sim_reserved_bits enable_sim_bitsize enable_sim_float -enable_sim_hardware ' ac_precious_vars='build_alias host_alias @@ -1266,7 +1261,6 @@ Optional Features: --enable-sim-bitsize=N Specify target bitsize (32 or 64) --enable-sim-float Specify that the target processor has floating point hardware - --enable-sim-hardware Whether to enable hardware/device simulation Report bugs to the package provider. _ACEOF @@ -2195,48 +2189,6 @@ sim_micromips_flags=" -F ${sim_micromips_filter} ${sim_micromips_machine} ${si -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5 -$as_echo_n "checking for sim hardware settings... " >&6; } -# Check whether --enable-sim-hardware was given. -if test "${enable_sim_hardware+set}" = set; then : - enableval=$enable_sim_hardware; -else - enable_sim_hardware="yes" -fi - -sim_hw_sockser= -if test "$enable_sim_hardware" = no; then - sim_hw_cflags="-DWITH_HW=0" -elif test "$enable_sim_hardware" = yes; then - sim_hw_cflags="-DWITH_HW=1" - # mingw does not support sockser - case ${host} in - *mingw*) ;; - *) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device - # that you instatiate. Instead, other code will call into it directly. - # At some point, we should convert it over. - sim_hw_sockser="dv-sockser.o" - sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER" - ;; - esac -else - as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5 -fi -if test "$enable_sim_hardware" = "yes"; then - SIM_ENABLE_HW_TRUE= - SIM_ENABLE_HW_FALSE='#' -else - SIM_ENABLE_HW_TRUE='#' - SIM_ENABLE_HW_FALSE= -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5 -$as_echo "${enable_sim_hardware}" >&6; } - - - - cgen_breaks="" if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then cgen_breaks="break cgen_rtx_error"; diff --git a/sim/mn10300/ChangeLog b/sim/mn10300/ChangeLog index 99d7a1c396..0cf33559a1 100644 --- a/sim/mn10300/ChangeLog +++ b/sim/mn10300/ChangeLog @@ -1,3 +1,8 @@ +2021-06-21 Mike Frysinger + + * aclocal.m4: Regenerate. + * configure: Regenerate. + 2021-06-21 Mike Frysinger * Makefile.in (SIM_EXTRA_HW_DEVICES): Define. diff --git a/sim/mn10300/aclocal.m4 b/sim/mn10300/aclocal.m4 index 6032284af5..f4393afec6 100644 --- a/sim/mn10300/aclocal.m4 +++ b/sim/mn10300/aclocal.m4 @@ -13,6 +13,5 @@ m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_include([../m4/sim_ac_option_bitsize.m4]) -m4_include([../m4/sim_ac_option_hardware.m4]) m4_include([../m4/sim_ac_option_reserved_bits.m4]) m4_include([../m4/sim_ac_output.m4]) diff --git a/sim/mn10300/configure b/sim/mn10300/configure index 126b69a942..f379168fe4 100755 --- a/sim/mn10300/configure +++ b/sim/mn10300/configure @@ -588,10 +588,6 @@ sim_default_model sim_scache sim_float cgen_breaks -sim_hw_sockser -sim_hw_cflags -SIM_ENABLE_HW_FALSE -SIM_ENABLE_HW_TRUE target_alias host_alias build_alias @@ -637,7 +633,6 @@ ac_user_opts=' enable_option_checking enable_sim_reserved_bits enable_sim_bitsize -enable_sim_hardware ' ac_precious_vars='build_alias host_alias @@ -1253,7 +1248,6 @@ Optional Features: Specify whether to check reserved bits in instruction --enable-sim-bitsize=N Specify target bitsize (32 or 64) - --enable-sim-hardware Whether to enable hardware/device simulation Report bugs to the package provider. _ACEOF @@ -1761,48 +1755,6 @@ fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5 -$as_echo_n "checking for sim hardware settings... " >&6; } -# Check whether --enable-sim-hardware was given. -if test "${enable_sim_hardware+set}" = set; then : - enableval=$enable_sim_hardware; -else - enable_sim_hardware="yes" -fi - -sim_hw_sockser= -if test "$enable_sim_hardware" = no; then - sim_hw_cflags="-DWITH_HW=0" -elif test "$enable_sim_hardware" = yes; then - sim_hw_cflags="-DWITH_HW=1" - # mingw does not support sockser - case ${host} in - *mingw*) ;; - *) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device - # that you instatiate. Instead, other code will call into it directly. - # At some point, we should convert it over. - sim_hw_sockser="dv-sockser.o" - sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER" - ;; - esac -else - as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5 -fi -if test "$enable_sim_hardware" = "yes"; then - SIM_ENABLE_HW_TRUE= - SIM_ENABLE_HW_FALSE='#' -else - SIM_ENABLE_HW_TRUE='#' - SIM_ENABLE_HW_FALSE= -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5 -$as_echo "${enable_sim_hardware}" >&6; } - - - - cgen_breaks="" if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then cgen_breaks="break cgen_rtx_error"; diff --git a/sim/moxie/ChangeLog b/sim/moxie/ChangeLog index 2b1dcca000..aa8fa65ccc 100644 --- a/sim/moxie/ChangeLog +++ b/sim/moxie/ChangeLog @@ -1,3 +1,8 @@ +2021-06-21 Mike Frysinger + + * aclocal.m4: Regenerate. + * configure: Regenerate. + 2021-06-21 Mike Frysinger * configure: Regenerate. diff --git a/sim/moxie/aclocal.m4 b/sim/moxie/aclocal.m4 index 1e96f107be..c9414d4680 100644 --- a/sim/moxie/aclocal.m4 +++ b/sim/moxie/aclocal.m4 @@ -12,5 +12,4 @@ # PARTICULAR PURPOSE. m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -m4_include([../m4/sim_ac_option_hardware.m4]) m4_include([../m4/sim_ac_output.m4]) diff --git a/sim/moxie/configure b/sim/moxie/configure index f3b1467d75..cc3fa8b0d9 100755 --- a/sim/moxie/configure +++ b/sim/moxie/configure @@ -590,10 +590,6 @@ sim_scache sim_float sim_bitsize cgen_breaks -sim_hw_sockser -sim_hw_cflags -SIM_ENABLE_HW_FALSE -SIM_ENABLE_HW_TRUE target_alias host_alias build_alias @@ -635,7 +631,6 @@ SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking -enable_sim_hardware ' ac_precious_vars='build_alias host_alias @@ -1243,12 +1238,6 @@ if test -n "$ac_init_help"; then cat <<\_ACEOF -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] - --enable-sim-hardware Whether to enable hardware/device simulation - Report bugs to the package provider. _ACEOF ac_status=$? @@ -1679,48 +1668,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5 -$as_echo_n "checking for sim hardware settings... " >&6; } -# Check whether --enable-sim-hardware was given. -if test "${enable_sim_hardware+set}" = set; then : - enableval=$enable_sim_hardware; -else - enable_sim_hardware="yes" -fi - -sim_hw_sockser= -if test "$enable_sim_hardware" = no; then - sim_hw_cflags="-DWITH_HW=0" -elif test "$enable_sim_hardware" = yes; then - sim_hw_cflags="-DWITH_HW=1" - # mingw does not support sockser - case ${host} in - *mingw*) ;; - *) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device - # that you instatiate. Instead, other code will call into it directly. - # At some point, we should convert it over. - sim_hw_sockser="dv-sockser.o" - sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER" - ;; - esac -else - as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5 -fi -if test "$enable_sim_hardware" = "yes"; then - SIM_ENABLE_HW_TRUE= - SIM_ENABLE_HW_FALSE='#' -else - SIM_ENABLE_HW_TRUE='#' - SIM_ENABLE_HW_FALSE= -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5 -$as_echo "${enable_sim_hardware}" >&6; } - - - - cgen_breaks="" if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then cgen_breaks="break cgen_rtx_error"; diff --git a/sim/msp430/ChangeLog b/sim/msp430/ChangeLog index d2d4cf4196..5674cb4fa2 100644 --- a/sim/msp430/ChangeLog +++ b/sim/msp430/ChangeLog @@ -1,3 +1,8 @@ +2021-06-21 Mike Frysinger + + * aclocal.m4: Regenerate. + * configure: Regenerate. + 2021-06-21 Mike Frysinger * configure: Regenerate. diff --git a/sim/msp430/aclocal.m4 b/sim/msp430/aclocal.m4 index 1e96f107be..c9414d4680 100644 --- a/sim/msp430/aclocal.m4 +++ b/sim/msp430/aclocal.m4 @@ -12,5 +12,4 @@ # PARTICULAR PURPOSE. m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -m4_include([../m4/sim_ac_option_hardware.m4]) m4_include([../m4/sim_ac_output.m4]) diff --git a/sim/msp430/configure b/sim/msp430/configure index f3b1467d75..cc3fa8b0d9 100755 --- a/sim/msp430/configure +++ b/sim/msp430/configure @@ -590,10 +590,6 @@ sim_scache sim_float sim_bitsize cgen_breaks -sim_hw_sockser -sim_hw_cflags -SIM_ENABLE_HW_FALSE -SIM_ENABLE_HW_TRUE target_alias host_alias build_alias @@ -635,7 +631,6 @@ SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking -enable_sim_hardware ' ac_precious_vars='build_alias host_alias @@ -1243,12 +1238,6 @@ if test -n "$ac_init_help"; then cat <<\_ACEOF -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] - --enable-sim-hardware Whether to enable hardware/device simulation - Report bugs to the package provider. _ACEOF ac_status=$? @@ -1679,48 +1668,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5 -$as_echo_n "checking for sim hardware settings... " >&6; } -# Check whether --enable-sim-hardware was given. -if test "${enable_sim_hardware+set}" = set; then : - enableval=$enable_sim_hardware; -else - enable_sim_hardware="yes" -fi - -sim_hw_sockser= -if test "$enable_sim_hardware" = no; then - sim_hw_cflags="-DWITH_HW=0" -elif test "$enable_sim_hardware" = yes; then - sim_hw_cflags="-DWITH_HW=1" - # mingw does not support sockser - case ${host} in - *mingw*) ;; - *) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device - # that you instatiate. Instead, other code will call into it directly. - # At some point, we should convert it over. - sim_hw_sockser="dv-sockser.o" - sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER" - ;; - esac -else - as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5 -fi -if test "$enable_sim_hardware" = "yes"; then - SIM_ENABLE_HW_TRUE= - SIM_ENABLE_HW_FALSE='#' -else - SIM_ENABLE_HW_TRUE='#' - SIM_ENABLE_HW_FALSE= -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5 -$as_echo "${enable_sim_hardware}" >&6; } - - - - cgen_breaks="" if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then cgen_breaks="break cgen_rtx_error"; diff --git a/sim/or1k/ChangeLog b/sim/or1k/ChangeLog index be72b42533..909fd6d83a 100644 --- a/sim/or1k/ChangeLog +++ b/sim/or1k/ChangeLog @@ -1,3 +1,8 @@ +2021-06-21 Mike Frysinger + + * aclocal.m4: Regenerate. + * configure: Regenerate. + 2021-06-21 Mike Frysinger * configure: Regenerate. diff --git a/sim/or1k/aclocal.m4 b/sim/or1k/aclocal.m4 index c7a63712ed..d0f761fd80 100644 --- a/sim/or1k/aclocal.m4 +++ b/sim/or1k/aclocal.m4 @@ -14,6 +14,5 @@ m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_include([../m4/sim_ac_option_bitsize.m4]) m4_include([../m4/sim_ac_option_default_model.m4]) -m4_include([../m4/sim_ac_option_hardware.m4]) m4_include([../m4/sim_ac_option_scache.m4]) m4_include([../m4/sim_ac_output.m4]) diff --git a/sim/or1k/configure b/sim/or1k/configure index 270eaaf11d..61d6d87f27 100755 --- a/sim/or1k/configure +++ b/sim/or1k/configure @@ -587,10 +587,6 @@ LIBOBJS sim_reserved_bits sim_float cgen_breaks -sim_hw_sockser -sim_hw_cflags -SIM_ENABLE_HW_FALSE -SIM_ENABLE_HW_TRUE target_alias host_alias build_alias @@ -638,7 +634,6 @@ enable_option_checking enable_sim_bitsize enable_sim_scache enable_sim_default_model -enable_sim_hardware ' ac_precious_vars='build_alias host_alias @@ -1255,7 +1250,6 @@ Optional Features: Specify simulator execution cache size --enable-sim-default-model=model Specify default model to simulate - --enable-sim-hardware Whether to enable hardware/device simulation Report bugs to the package provider. _ACEOF @@ -1782,48 +1776,6 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5 -$as_echo_n "checking for sim hardware settings... " >&6; } -# Check whether --enable-sim-hardware was given. -if test "${enable_sim_hardware+set}" = set; then : - enableval=$enable_sim_hardware; -else - enable_sim_hardware="yes" -fi - -sim_hw_sockser= -if test "$enable_sim_hardware" = no; then - sim_hw_cflags="-DWITH_HW=0" -elif test "$enable_sim_hardware" = yes; then - sim_hw_cflags="-DWITH_HW=1" - # mingw does not support sockser - case ${host} in - *mingw*) ;; - *) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device - # that you instatiate. Instead, other code will call into it directly. - # At some point, we should convert it over. - sim_hw_sockser="dv-sockser.o" - sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER" - ;; - esac -else - as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5 -fi -if test "$enable_sim_hardware" = "yes"; then - SIM_ENABLE_HW_TRUE= - SIM_ENABLE_HW_FALSE='#' -else - SIM_ENABLE_HW_TRUE='#' - SIM_ENABLE_HW_FALSE= -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5 -$as_echo "${enable_sim_hardware}" >&6; } - - - - cgen_breaks="" if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then cgen_breaks="break cgen_rtx_error"; diff --git a/sim/pru/ChangeLog b/sim/pru/ChangeLog index 38f482d3a2..33f404e0df 100644 --- a/sim/pru/ChangeLog +++ b/sim/pru/ChangeLog @@ -1,3 +1,8 @@ +2021-06-21 Mike Frysinger + + * aclocal.m4: Regenerate. + * configure: Regenerate. + 2021-06-21 Mike Frysinger * configure: Regenerate. diff --git a/sim/pru/aclocal.m4 b/sim/pru/aclocal.m4 index 1e96f107be..c9414d4680 100644 --- a/sim/pru/aclocal.m4 +++ b/sim/pru/aclocal.m4 @@ -12,5 +12,4 @@ # PARTICULAR PURPOSE. m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -m4_include([../m4/sim_ac_option_hardware.m4]) m4_include([../m4/sim_ac_output.m4]) diff --git a/sim/pru/configure b/sim/pru/configure index f3b1467d75..cc3fa8b0d9 100755 --- a/sim/pru/configure +++ b/sim/pru/configure @@ -590,10 +590,6 @@ sim_scache sim_float sim_bitsize cgen_breaks -sim_hw_sockser -sim_hw_cflags -SIM_ENABLE_HW_FALSE -SIM_ENABLE_HW_TRUE target_alias host_alias build_alias @@ -635,7 +631,6 @@ SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking -enable_sim_hardware ' ac_precious_vars='build_alias host_alias @@ -1243,12 +1238,6 @@ if test -n "$ac_init_help"; then cat <<\_ACEOF -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] - --enable-sim-hardware Whether to enable hardware/device simulation - Report bugs to the package provider. _ACEOF ac_status=$? @@ -1679,48 +1668,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5 -$as_echo_n "checking for sim hardware settings... " >&6; } -# Check whether --enable-sim-hardware was given. -if test "${enable_sim_hardware+set}" = set; then : - enableval=$enable_sim_hardware; -else - enable_sim_hardware="yes" -fi - -sim_hw_sockser= -if test "$enable_sim_hardware" = no; then - sim_hw_cflags="-DWITH_HW=0" -elif test "$enable_sim_hardware" = yes; then - sim_hw_cflags="-DWITH_HW=1" - # mingw does not support sockser - case ${host} in - *mingw*) ;; - *) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device - # that you instatiate. Instead, other code will call into it directly. - # At some point, we should convert it over. - sim_hw_sockser="dv-sockser.o" - sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER" - ;; - esac -else - as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5 -fi -if test "$enable_sim_hardware" = "yes"; then - SIM_ENABLE_HW_TRUE= - SIM_ENABLE_HW_FALSE='#' -else - SIM_ENABLE_HW_TRUE='#' - SIM_ENABLE_HW_FALSE= -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5 -$as_echo "${enable_sim_hardware}" >&6; } - - - - cgen_breaks="" if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then cgen_breaks="break cgen_rtx_error"; diff --git a/sim/riscv/ChangeLog b/sim/riscv/ChangeLog index f7a4494752..dc3f37256e 100644 --- a/sim/riscv/ChangeLog +++ b/sim/riscv/ChangeLog @@ -1,3 +1,8 @@ +2021-06-21 Mike Frysinger + + * aclocal.m4: Regenerate. + * configure: Regenerate. + 2021-06-21 Mike Frysinger * configure: Regenerate. diff --git a/sim/riscv/aclocal.m4 b/sim/riscv/aclocal.m4 index 14d9979ba2..39198e5975 100644 --- a/sim/riscv/aclocal.m4 +++ b/sim/riscv/aclocal.m4 @@ -14,5 +14,4 @@ m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_include([../m4/sim_ac_option_bitsize.m4]) m4_include([../m4/sim_ac_option_default_model.m4]) -m4_include([../m4/sim_ac_option_hardware.m4]) m4_include([../m4/sim_ac_output.m4]) diff --git a/sim/riscv/configure b/sim/riscv/configure index c491d1e3b2..2020e25885 100755 --- a/sim/riscv/configure +++ b/sim/riscv/configure @@ -588,10 +588,6 @@ sim_reserved_bits sim_scache sim_float cgen_breaks -sim_hw_sockser -sim_hw_cflags -SIM_ENABLE_HW_FALSE -SIM_ENABLE_HW_TRUE target_alias host_alias build_alias @@ -637,7 +633,6 @@ ac_user_opts=' enable_option_checking enable_sim_default_model enable_sim_bitsize -enable_sim_hardware ' ac_precious_vars='build_alias host_alias @@ -1252,7 +1247,6 @@ Optional Features: --enable-sim-default-model=model Specify default model to simulate --enable-sim-bitsize=N Specify target bitsize (32 or 64) - --enable-sim-hardware Whether to enable hardware/device simulation Report bugs to the package provider. _ACEOF @@ -1773,48 +1767,6 @@ fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5 -$as_echo_n "checking for sim hardware settings... " >&6; } -# Check whether --enable-sim-hardware was given. -if test "${enable_sim_hardware+set}" = set; then : - enableval=$enable_sim_hardware; -else - enable_sim_hardware="yes" -fi - -sim_hw_sockser= -if test "$enable_sim_hardware" = no; then - sim_hw_cflags="-DWITH_HW=0" -elif test "$enable_sim_hardware" = yes; then - sim_hw_cflags="-DWITH_HW=1" - # mingw does not support sockser - case ${host} in - *mingw*) ;; - *) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device - # that you instatiate. Instead, other code will call into it directly. - # At some point, we should convert it over. - sim_hw_sockser="dv-sockser.o" - sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER" - ;; - esac -else - as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5 -fi -if test "$enable_sim_hardware" = "yes"; then - SIM_ENABLE_HW_TRUE= - SIM_ENABLE_HW_FALSE='#' -else - SIM_ENABLE_HW_TRUE='#' - SIM_ENABLE_HW_FALSE= -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5 -$as_echo "${enable_sim_hardware}" >&6; } - - - - cgen_breaks="" if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then cgen_breaks="break cgen_rtx_error"; diff --git a/sim/rl78/ChangeLog b/sim/rl78/ChangeLog index 8f3a97d964..55f4fc5793 100644 --- a/sim/rl78/ChangeLog +++ b/sim/rl78/ChangeLog @@ -1,3 +1,8 @@ +2021-06-21 Mike Frysinger + + * aclocal.m4: Regenerate. + * configure: Regenerate. + 2021-06-21 Mike Frysinger * configure: Regenerate. diff --git a/sim/rl78/aclocal.m4 b/sim/rl78/aclocal.m4 index 1e96f107be..c9414d4680 100644 --- a/sim/rl78/aclocal.m4 +++ b/sim/rl78/aclocal.m4 @@ -12,5 +12,4 @@ # PARTICULAR PURPOSE. m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -m4_include([../m4/sim_ac_option_hardware.m4]) m4_include([../m4/sim_ac_output.m4]) diff --git a/sim/rl78/configure b/sim/rl78/configure index f3b1467d75..cc3fa8b0d9 100755 --- a/sim/rl78/configure +++ b/sim/rl78/configure @@ -590,10 +590,6 @@ sim_scache sim_float sim_bitsize cgen_breaks -sim_hw_sockser -sim_hw_cflags -SIM_ENABLE_HW_FALSE -SIM_ENABLE_HW_TRUE target_alias host_alias build_alias @@ -635,7 +631,6 @@ SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking -enable_sim_hardware ' ac_precious_vars='build_alias host_alias @@ -1243,12 +1238,6 @@ if test -n "$ac_init_help"; then cat <<\_ACEOF -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] - --enable-sim-hardware Whether to enable hardware/device simulation - Report bugs to the package provider. _ACEOF ac_status=$? @@ -1679,48 +1668,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5 -$as_echo_n "checking for sim hardware settings... " >&6; } -# Check whether --enable-sim-hardware was given. -if test "${enable_sim_hardware+set}" = set; then : - enableval=$enable_sim_hardware; -else - enable_sim_hardware="yes" -fi - -sim_hw_sockser= -if test "$enable_sim_hardware" = no; then - sim_hw_cflags="-DWITH_HW=0" -elif test "$enable_sim_hardware" = yes; then - sim_hw_cflags="-DWITH_HW=1" - # mingw does not support sockser - case ${host} in - *mingw*) ;; - *) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device - # that you instatiate. Instead, other code will call into it directly. - # At some point, we should convert it over. - sim_hw_sockser="dv-sockser.o" - sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER" - ;; - esac -else - as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5 -fi -if test "$enable_sim_hardware" = "yes"; then - SIM_ENABLE_HW_TRUE= - SIM_ENABLE_HW_FALSE='#' -else - SIM_ENABLE_HW_TRUE='#' - SIM_ENABLE_HW_FALSE= -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5 -$as_echo "${enable_sim_hardware}" >&6; } - - - - cgen_breaks="" if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then cgen_breaks="break cgen_rtx_error"; diff --git a/sim/rx/ChangeLog b/sim/rx/ChangeLog index f6f20263b5..083c06181b 100644 --- a/sim/rx/ChangeLog +++ b/sim/rx/ChangeLog @@ -1,3 +1,8 @@ +2021-06-21 Mike Frysinger + + * aclocal.m4: Regenerate. + * configure: Regenerate. + 2021-06-21 Mike Frysinger * configure: Regenerate. diff --git a/sim/rx/aclocal.m4 b/sim/rx/aclocal.m4 index 1e96f107be..c9414d4680 100644 --- a/sim/rx/aclocal.m4 +++ b/sim/rx/aclocal.m4 @@ -12,5 +12,4 @@ # PARTICULAR PURPOSE. m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -m4_include([../m4/sim_ac_option_hardware.m4]) m4_include([../m4/sim_ac_output.m4]) diff --git a/sim/rx/configure b/sim/rx/configure index 5b342b2d99..578fc94a05 100755 --- a/sim/rx/configure +++ b/sim/rx/configure @@ -590,10 +590,6 @@ sim_scache sim_float sim_bitsize cgen_breaks -sim_hw_sockser -sim_hw_cflags -SIM_ENABLE_HW_FALSE -SIM_ENABLE_HW_TRUE sim_rx_cycle_accurate_flags target_alias host_alias @@ -637,7 +633,6 @@ ac_subst_files='' ac_user_opts=' enable_option_checking enable_sim_rx_cycle_accurate -enable_sim_hardware ' ac_precious_vars='build_alias host_alias @@ -1251,7 +1246,6 @@ Optional Features: --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --disable-sim-rx-cycle-accurate Disable cycle accurate simulation (faster runtime) - --enable-sim-hardware Whether to enable hardware/device simulation Report bugs to the package provider. _ACEOF @@ -1703,48 +1697,6 @@ $as_echo "no" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5 -$as_echo_n "checking for sim hardware settings... " >&6; } -# Check whether --enable-sim-hardware was given. -if test "${enable_sim_hardware+set}" = set; then : - enableval=$enable_sim_hardware; -else - enable_sim_hardware="yes" -fi - -sim_hw_sockser= -if test "$enable_sim_hardware" = no; then - sim_hw_cflags="-DWITH_HW=0" -elif test "$enable_sim_hardware" = yes; then - sim_hw_cflags="-DWITH_HW=1" - # mingw does not support sockser - case ${host} in - *mingw*) ;; - *) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device - # that you instatiate. Instead, other code will call into it directly. - # At some point, we should convert it over. - sim_hw_sockser="dv-sockser.o" - sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER" - ;; - esac -else - as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5 -fi -if test "$enable_sim_hardware" = "yes"; then - SIM_ENABLE_HW_TRUE= - SIM_ENABLE_HW_FALSE='#' -else - SIM_ENABLE_HW_TRUE='#' - SIM_ENABLE_HW_FALSE= -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5 -$as_echo "${enable_sim_hardware}" >&6; } - - - - cgen_breaks="" if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then cgen_breaks="break cgen_rtx_error"; diff --git a/sim/sh/ChangeLog b/sim/sh/ChangeLog index a2b7ff1ccd..58fe15d3f5 100644 --- a/sim/sh/ChangeLog +++ b/sim/sh/ChangeLog @@ -1,3 +1,8 @@ +2021-06-21 Mike Frysinger + + * aclocal.m4: Regenerate. + * configure: Regenerate. + 2021-06-21 Mike Frysinger * configure: Regenerate. diff --git a/sim/sh/aclocal.m4 b/sim/sh/aclocal.m4 index 1e96f107be..c9414d4680 100644 --- a/sim/sh/aclocal.m4 +++ b/sim/sh/aclocal.m4 @@ -12,5 +12,4 @@ # PARTICULAR PURPOSE. m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -m4_include([../m4/sim_ac_option_hardware.m4]) m4_include([../m4/sim_ac_output.m4]) diff --git a/sim/sh/configure b/sim/sh/configure index f3b1467d75..cc3fa8b0d9 100755 --- a/sim/sh/configure +++ b/sim/sh/configure @@ -590,10 +590,6 @@ sim_scache sim_float sim_bitsize cgen_breaks -sim_hw_sockser -sim_hw_cflags -SIM_ENABLE_HW_FALSE -SIM_ENABLE_HW_TRUE target_alias host_alias build_alias @@ -635,7 +631,6 @@ SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking -enable_sim_hardware ' ac_precious_vars='build_alias host_alias @@ -1243,12 +1238,6 @@ if test -n "$ac_init_help"; then cat <<\_ACEOF -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] - --enable-sim-hardware Whether to enable hardware/device simulation - Report bugs to the package provider. _ACEOF ac_status=$? @@ -1679,48 +1668,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5 -$as_echo_n "checking for sim hardware settings... " >&6; } -# Check whether --enable-sim-hardware was given. -if test "${enable_sim_hardware+set}" = set; then : - enableval=$enable_sim_hardware; -else - enable_sim_hardware="yes" -fi - -sim_hw_sockser= -if test "$enable_sim_hardware" = no; then - sim_hw_cflags="-DWITH_HW=0" -elif test "$enable_sim_hardware" = yes; then - sim_hw_cflags="-DWITH_HW=1" - # mingw does not support sockser - case ${host} in - *mingw*) ;; - *) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device - # that you instatiate. Instead, other code will call into it directly. - # At some point, we should convert it over. - sim_hw_sockser="dv-sockser.o" - sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER" - ;; - esac -else - as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5 -fi -if test "$enable_sim_hardware" = "yes"; then - SIM_ENABLE_HW_TRUE= - SIM_ENABLE_HW_FALSE='#' -else - SIM_ENABLE_HW_TRUE='#' - SIM_ENABLE_HW_FALSE= -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5 -$as_echo "${enable_sim_hardware}" >&6; } - - - - cgen_breaks="" if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then cgen_breaks="break cgen_rtx_error"; diff --git a/sim/v850/ChangeLog b/sim/v850/ChangeLog index 41badac47f..08e101ab86 100644 --- a/sim/v850/ChangeLog +++ b/sim/v850/ChangeLog @@ -1,3 +1,8 @@ +2021-06-21 Mike Frysinger + + * aclocal.m4: Regenerate. + * configure: Regenerate. + 2021-06-21 Mike Frysinger * configure: Regenerate. diff --git a/sim/v850/aclocal.m4 b/sim/v850/aclocal.m4 index 6032284af5..f4393afec6 100644 --- a/sim/v850/aclocal.m4 +++ b/sim/v850/aclocal.m4 @@ -13,6 +13,5 @@ m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_include([../m4/sim_ac_option_bitsize.m4]) -m4_include([../m4/sim_ac_option_hardware.m4]) m4_include([../m4/sim_ac_option_reserved_bits.m4]) m4_include([../m4/sim_ac_output.m4]) diff --git a/sim/v850/configure b/sim/v850/configure index 126b69a942..f379168fe4 100755 --- a/sim/v850/configure +++ b/sim/v850/configure @@ -588,10 +588,6 @@ sim_default_model sim_scache sim_float cgen_breaks -sim_hw_sockser -sim_hw_cflags -SIM_ENABLE_HW_FALSE -SIM_ENABLE_HW_TRUE target_alias host_alias build_alias @@ -637,7 +633,6 @@ ac_user_opts=' enable_option_checking enable_sim_reserved_bits enable_sim_bitsize -enable_sim_hardware ' ac_precious_vars='build_alias host_alias @@ -1253,7 +1248,6 @@ Optional Features: Specify whether to check reserved bits in instruction --enable-sim-bitsize=N Specify target bitsize (32 or 64) - --enable-sim-hardware Whether to enable hardware/device simulation Report bugs to the package provider. _ACEOF @@ -1761,48 +1755,6 @@ fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5 -$as_echo_n "checking for sim hardware settings... " >&6; } -# Check whether --enable-sim-hardware was given. -if test "${enable_sim_hardware+set}" = set; then : - enableval=$enable_sim_hardware; -else - enable_sim_hardware="yes" -fi - -sim_hw_sockser= -if test "$enable_sim_hardware" = no; then - sim_hw_cflags="-DWITH_HW=0" -elif test "$enable_sim_hardware" = yes; then - sim_hw_cflags="-DWITH_HW=1" - # mingw does not support sockser - case ${host} in - *mingw*) ;; - *) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device - # that you instatiate. Instead, other code will call into it directly. - # At some point, we should convert it over. - sim_hw_sockser="dv-sockser.o" - sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER" - ;; - esac -else - as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5 -fi -if test "$enable_sim_hardware" = "yes"; then - SIM_ENABLE_HW_TRUE= - SIM_ENABLE_HW_FALSE='#' -else - SIM_ENABLE_HW_TRUE='#' - SIM_ENABLE_HW_FALSE= -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5 -$as_echo "${enable_sim_hardware}" >&6; } - - - - cgen_breaks="" if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then cgen_breaks="break cgen_rtx_error"; -- 2.34.1