sim: unify hardware settings

Move these options up to the common dir so we only test & export
them once across all ports.

3 files changed, 5 insertions, 49 deletions

diff --git a/sim/m32r/ChangeLog b/sim/m32r/ChangeLog
index 87d6a42..7bbeadc 100644
--- a/sim/m32r/ChangeLog
+++ b/sim/m32r/ChangeLog
@@ -1,5 +1,10 @@
 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.
 	* configure.ac (SIM_AC_OPTION_HARDWARE): Delete call.
 	* configure: Regenerate.
diff --git a/sim/m32r/aclocal.m4 b/sim/m32r/aclocal.m4
index 08ac8b1..212a399 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 b115b95..c258ee5 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";