[binutils-gdb] sim: unify hardware settings
Michael Frysinger
vapier@sourceware.org
Tue Jun 22 02:20:24 GMT 2021
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=456ef1c1d43c0407801fb2d59db355472be8a554
commit 456ef1c1d43c0407801fb2d59db355472be8a554
Author: Mike Frysinger <vapier@gentoo.org>
Date: Sat Jun 19 20:06:12 2021 -0400
sim: unify hardware settings
Move these options up to the common dir so we only test & export
them once across all ports.
Diff:
---
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 bdc0ad86b34..04384e5bd56 100644
--- a/sim/ChangeLog
+++ b/sim/ChangeLog
@@ -1,3 +1,11 @@
+2021-06-21 Mike Frysinger <vapier@gentoo.org>
+
+ * 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 <vapier@gentoo.org>
* README-HACKING: Change SIM_AC_OPTION_HARDWARE to
diff --git a/sim/Makefile.in b/sim/Makefile.in
index 2737e102d2b..62942d88368 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 139e3e55fef..80cf4a45f19 100644
--- a/sim/aarch64/ChangeLog
+++ b/sim/aarch64/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-21 Mike Frysinger <vapier@gentoo.org>
+
+ * aclocal.m4: Regenerate.
+ * configure: Regenerate.
+
2021-06-21 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.
diff --git a/sim/aarch64/aclocal.m4 b/sim/aarch64/aclocal.m4
index 1e96f107be6..c9414d4680f 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 f3b1467d756..cc3fa8b0d97 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 400bc876b4c..84f2878baae 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 92b217d20be..f145f1a3c6b 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 9abf46133b2..ea1a81ad818 100644
--- a/sim/arm/ChangeLog
+++ b/sim/arm/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-21 Mike Frysinger <vapier@gentoo.org>
+
+ * aclocal.m4: Regenerate.
+ * configure: Regenerate.
+
2021-06-21 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.
diff --git a/sim/arm/aclocal.m4 b/sim/arm/aclocal.m4
index 1e96f107be6..c9414d4680f 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 f3b1467d756..cc3fa8b0d97 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 9a7ed8516f7..80b6c973463 100644
--- a/sim/avr/ChangeLog
+++ b/sim/avr/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-21 Mike Frysinger <vapier@gentoo.org>
+
+ * aclocal.m4: Regenerate.
+ * configure: Regenerate.
+
2021-06-21 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.
diff --git a/sim/avr/aclocal.m4 b/sim/avr/aclocal.m4
index 1e96f107be6..c9414d4680f 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 f3b1467d756..cc3fa8b0d97 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 7c34a4f50c2..ea737353b09 100644
--- a/sim/bfin/ChangeLog
+++ b/sim/bfin/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-21 Mike Frysinger <vapier@gentoo.org>
+
+ * aclocal.m4: Regenerate.
+ * configure: Regenerate.
+
2021-06-21 Mike Frysinger <vapier@gentoo.org>
* Makefile.in (SIM_EXTRA_HW_DEVICES): Define.
diff --git a/sim/bfin/aclocal.m4 b/sim/bfin/aclocal.m4
index abca26eeaa0..b61c9617f3c 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 a8a383a868b..8f14a5aa2b5 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 d4b61cab231..61158327012 100644
--- a/sim/bpf/ChangeLog
+++ b/sim/bpf/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-21 Mike Frysinger <vapier@gentoo.org>
+
+ * aclocal.m4: Regenerate.
+ * configure: Regenerate.
+
2021-06-21 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.
diff --git a/sim/bpf/aclocal.m4 b/sim/bpf/aclocal.m4
index c7a63712ed3..d0f761fd802 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 d6cbb9d8aa1..57e37559d5b 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 02540a047db..9e1d3008cf4 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,7 @@
+2021-06-21 Mike Frysinger <vapier@gentoo.org>
+
+ * Make-common.in: Move sim-hw settings to ../arch-subdir.mk.in.
+
2021-06-21 Mike Frysinger <vapier@gentoo.org>
* Make-common.in (SIM_HW): Delete.
diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in
index 6d7c9c47b64..41becaa05f1 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 246845328a8..dac37c64c26 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 9530268ddc5..042bfbfd1cd 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 dd2215a802b..5b7cc190a08 100644
--- a/sim/cr16/ChangeLog
+++ b/sim/cr16/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-21 Mike Frysinger <vapier@gentoo.org>
+
+ * aclocal.m4: Regenerate.
+ * configure: Regenerate.
+
2021-06-21 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.
diff --git a/sim/cr16/aclocal.m4 b/sim/cr16/aclocal.m4
index 1e96f107be6..c9414d4680f 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 f3b1467d756..cc3fa8b0d97 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 d570ba9ea35..77670a262c9 100644
--- a/sim/cris/ChangeLog
+++ b/sim/cris/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-21 Mike Frysinger <vapier@gentoo.org>
+
+ * aclocal.m4: Regenerate.
+ * configure: Regenerate.
+
2021-06-21 Mike Frysinger <vapier@gentoo.org>
* Makefile.in (SIM_EXTRA_HW_DEVICES): Define.
diff --git a/sim/cris/aclocal.m4 b/sim/cris/aclocal.m4
index 08ac8b16a74..212a399016b 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 89a7beec379..293463e42a1 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 4aa76081ab2..8433b91551d 100644
--- a/sim/d10v/ChangeLog
+++ b/sim/d10v/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-21 Mike Frysinger <vapier@gentoo.org>
+
+ * aclocal.m4: Regenerate.
+ * configure: Regenerate.
+
2021-06-21 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.
diff --git a/sim/d10v/aclocal.m4 b/sim/d10v/aclocal.m4
index 1e96f107be6..c9414d4680f 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 f3b1467d756..cc3fa8b0d97 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 75446a98570..0e9ee9ffafd 100644
--- a/sim/erc32/ChangeLog
+++ b/sim/erc32/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-21 Mike Frysinger <vapier@gentoo.org>
+
+ * aclocal.m4: Regenerate.
+ * configure: Regenerate.
+
2021-06-21 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.
diff --git a/sim/erc32/aclocal.m4 b/sim/erc32/aclocal.m4
index 1e96f107be6..c9414d4680f 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 474a7826a12..60f947c7b49 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 ed8ddc3b074..de004680a9a 100644
--- a/sim/example-synacor/ChangeLog
+++ b/sim/example-synacor/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-21 Mike Frysinger <vapier@gentoo.org>
+
+ * aclocal.m4: Regenerate.
+ * configure: Regenerate.
+
2021-06-21 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.
diff --git a/sim/example-synacor/aclocal.m4 b/sim/example-synacor/aclocal.m4
index 1e96f107be6..c9414d4680f 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 f3b1467d756..cc3fa8b0d97 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 6bdcc60b034..c5f241bd0aa 100644
--- a/sim/frv/ChangeLog
+++ b/sim/frv/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-21 Mike Frysinger <vapier@gentoo.org>
+
+ * aclocal.m4: Regenerate.
+ * configure: Regenerate.
+
2021-06-21 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.
diff --git a/sim/frv/aclocal.m4 b/sim/frv/aclocal.m4
index 08ac8b16a74..212a399016b 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 922b9371db2..1d05bb0dd3d 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 c8a4629beca..450e8d1486b 100644
--- a/sim/ft32/ChangeLog
+++ b/sim/ft32/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-21 Mike Frysinger <vapier@gentoo.org>
+
+ * aclocal.m4: Regenerate.
+ * configure: Regenerate.
+
2021-06-21 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.
diff --git a/sim/ft32/aclocal.m4 b/sim/ft32/aclocal.m4
index 1e96f107be6..c9414d4680f 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 f3b1467d756..cc3fa8b0d97 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 94b6f3b0551..4fa308d7d7f 100644
--- a/sim/h8300/ChangeLog
+++ b/sim/h8300/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-21 Mike Frysinger <vapier@gentoo.org>
+
+ * aclocal.m4: Regenerate.
+ * configure: Regenerate.
+
2021-06-21 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.
diff --git a/sim/h8300/aclocal.m4 b/sim/h8300/aclocal.m4
index 1e96f107be6..c9414d4680f 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 f3b1467d756..cc3fa8b0d97 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 d54be42edd1..e771530983e 100644
--- a/sim/iq2000/ChangeLog
+++ b/sim/iq2000/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-21 Mike Frysinger <vapier@gentoo.org>
+
+ * aclocal.m4: Regenerate.
+ * configure: Regenerate.
+
2021-06-21 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.
diff --git a/sim/iq2000/aclocal.m4 b/sim/iq2000/aclocal.m4
index 08ac8b16a74..212a399016b 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 72799cef834..511dbf39559 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 00da0a93f66..2508e40570d 100644
--- a/sim/lm32/ChangeLog
+++ b/sim/lm32/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-21 Mike Frysinger <vapier@gentoo.org>
+
+ * aclocal.m4: Regenerate.
+ * configure: Regenerate.
+
2021-06-21 Mike Frysinger <vapier@gentoo.org>
* Makefile.in (SIM_EXTRA_HW_DEVICES): Define.
diff --git a/sim/lm32/aclocal.m4 b/sim/lm32/aclocal.m4
index 08ac8b16a74..212a399016b 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 7a2d07c3edf..85e28ca9add 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 428c348d249..bfdc53d6f29 100644
--- a/sim/m32c/ChangeLog
+++ b/sim/m32c/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-21 Mike Frysinger <vapier@gentoo.org>
+
+ * aclocal.m4: Regenerate.
+ * configure: Regenerate.
+
2021-06-21 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.
diff --git a/sim/m32c/aclocal.m4 b/sim/m32c/aclocal.m4
index 1e96f107be6..c9414d4680f 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 f3b1467d756..cc3fa8b0d97 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 87d6a428353..7bbeadc63af 100644
--- a/sim/m32r/ChangeLog
+++ b/sim/m32r/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-21 Mike Frysinger <vapier@gentoo.org>
+
+ * aclocal.m4: Regenerate.
+ * configure: Regenerate.
+
2021-06-21 Mike Frysinger <vapier@gentoo.org>
* Makefile.in (SIM_EXTRA_HW_DEVICES): Define.
diff --git a/sim/m32r/aclocal.m4 b/sim/m32r/aclocal.m4
index 08ac8b16a74..212a399016b 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 b115b957da8..c258ee50417 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 14101830e82..ed53cd2f120 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 8d260421e0e..aba45b0bc33 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 ea7373a0be1..986d3713603 100644
--- a/sim/m68hc11/ChangeLog
+++ b/sim/m68hc11/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-21 Mike Frysinger <vapier@gentoo.org>
+
+ * aclocal.m4: Regenerate.
+ * configure: Regenerate.
+
2021-06-21 Mike Frysinger <vapier@gentoo.org>
* Makefile.in (SIM_EXTRA_HW_DEVICES): Define.
diff --git a/sim/m68hc11/aclocal.m4 b/sim/m68hc11/aclocal.m4
index 1e96f107be6..c9414d4680f 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 f3b1467d756..cc3fa8b0d97 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 f2a862efe0d..3fe68c67781 100644
--- a/sim/mcore/ChangeLog
+++ b/sim/mcore/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-21 Mike Frysinger <vapier@gentoo.org>
+
+ * aclocal.m4: Regenerate.
+ * configure: Regenerate.
+
2021-06-21 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.
diff --git a/sim/mcore/aclocal.m4 b/sim/mcore/aclocal.m4
index 1e96f107be6..c9414d4680f 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 f3b1467d756..cc3fa8b0d97 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 d2abcb6a773..da8e4df49e6 100644
--- a/sim/microblaze/ChangeLog
+++ b/sim/microblaze/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-21 Mike Frysinger <vapier@gentoo.org>
+
+ * aclocal.m4: Regenerate.
+ * configure: Regenerate.
+
2021-06-21 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.
diff --git a/sim/microblaze/aclocal.m4 b/sim/microblaze/aclocal.m4
index 1e96f107be6..c9414d4680f 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 f3b1467d756..cc3fa8b0d97 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 168ea0a615d..e71d6327d21 100644
--- a/sim/mips/ChangeLog
+++ b/sim/mips/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-21 Mike Frysinger <vapier@gentoo.org>
+
+ * aclocal.m4: Regenerate.
+ * configure: Regenerate.
+
2021-06-21 Mike Frysinger <vapier@gentoo.org>
* Makefile.in (SIM_EXTRA_HW_DEVICES): Define.
diff --git a/sim/mips/aclocal.m4 b/sim/mips/aclocal.m4
index 95e62b9d988..be0d398dfd3 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 98ad8d5023c..241879d0019 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 99d7a1c3962..0cf33559a19 100644
--- a/sim/mn10300/ChangeLog
+++ b/sim/mn10300/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-21 Mike Frysinger <vapier@gentoo.org>
+
+ * aclocal.m4: Regenerate.
+ * configure: Regenerate.
+
2021-06-21 Mike Frysinger <vapier@gentoo.org>
* Makefile.in (SIM_EXTRA_HW_DEVICES): Define.
diff --git a/sim/mn10300/aclocal.m4 b/sim/mn10300/aclocal.m4
index 6032284af5c..f4393afec65 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 126b69a9429..f379168fe4c 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 2b1dcca000b..aa8fa65ccce 100644
--- a/sim/moxie/ChangeLog
+++ b/sim/moxie/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-21 Mike Frysinger <vapier@gentoo.org>
+
+ * aclocal.m4: Regenerate.
+ * configure: Regenerate.
+
2021-06-21 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.
diff --git a/sim/moxie/aclocal.m4 b/sim/moxie/aclocal.m4
index 1e96f107be6..c9414d4680f 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 f3b1467d756..cc3fa8b0d97 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 d2d4cf4196a..5674cb4fa2e 100644
--- a/sim/msp430/ChangeLog
+++ b/sim/msp430/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-21 Mike Frysinger <vapier@gentoo.org>
+
+ * aclocal.m4: Regenerate.
+ * configure: Regenerate.
+
2021-06-21 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.
diff --git a/sim/msp430/aclocal.m4 b/sim/msp430/aclocal.m4
index 1e96f107be6..c9414d4680f 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 f3b1467d756..cc3fa8b0d97 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 be72b42533e..909fd6d83aa 100644
--- a/sim/or1k/ChangeLog
+++ b/sim/or1k/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-21 Mike Frysinger <vapier@gentoo.org>
+
+ * aclocal.m4: Regenerate.
+ * configure: Regenerate.
+
2021-06-21 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.
diff --git a/sim/or1k/aclocal.m4 b/sim/or1k/aclocal.m4
index c7a63712ed3..d0f761fd802 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 270eaaf11da..61d6d87f278 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 38f482d3a27..33f404e0df0 100644
--- a/sim/pru/ChangeLog
+++ b/sim/pru/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-21 Mike Frysinger <vapier@gentoo.org>
+
+ * aclocal.m4: Regenerate.
+ * configure: Regenerate.
+
2021-06-21 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.
diff --git a/sim/pru/aclocal.m4 b/sim/pru/aclocal.m4
index 1e96f107be6..c9414d4680f 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 f3b1467d756..cc3fa8b0d97 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 f7a44947528..dc3f37256ec 100644
--- a/sim/riscv/ChangeLog
+++ b/sim/riscv/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-21 Mike Frysinger <vapier@gentoo.org>
+
+ * aclocal.m4: Regenerate.
+ * configure: Regenerate.
+
2021-06-21 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.
diff --git a/sim/riscv/aclocal.m4 b/sim/riscv/aclocal.m4
index 14d9979ba2c..39198e59759 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 c491d1e3b23..2020e25885f 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 8f3a97d9643..55f4fc5793c 100644
--- a/sim/rl78/ChangeLog
+++ b/sim/rl78/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-21 Mike Frysinger <vapier@gentoo.org>
+
+ * aclocal.m4: Regenerate.
+ * configure: Regenerate.
+
2021-06-21 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.
diff --git a/sim/rl78/aclocal.m4 b/sim/rl78/aclocal.m4
index 1e96f107be6..c9414d4680f 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 f3b1467d756..cc3fa8b0d97 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
[...]
[diff truncated at 100000 bytes]
More information about the Gdb-cvs
mailing list