sim: unify hardware settings

author Mike Frysinger <vapier@gentoo.org>

Sun, 20 Jun 2021 00:06:12 +0000 (20:06 -0400)

committer Mike Frysinger <vapier@gentoo.org>

Tue, 22 Jun 2021 02:20:18 +0000 (22:20 -0400)
author Mike Frysinger <vapier@gentoo.org>
Sun, 20 Jun 2021 00:06:12 +0000 (20:06 -0400)
committer Mike Frysinger <vapier@gentoo.org>
Tue, 22 Jun 2021 02:20:18 +0000 (22:20 -0400)
diff --git a/sim/ChangeLog b/sim/ChangeLog

index bdc0ad86b34e33fa8ed16588951b37a54f737920..04384e5bd56021613d29fcb451ff24fdd731f242 100644 (file)
--- 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 2737e102d2b62c3ab20f91438f47957ef566584a..62942d8836835ffa78921e5207866216e5f74f0f 100644 (file)
--- 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 139e3e55fefd6c13a704e34bab4668602305d415..80cf4a45f1903062cc9d6fda98b518522fcdc16b 100644 (file)
--- 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 1e96f107be6e6a3f1e3b9638ebce2fe5798696af..c9414d4680f1db90e5d5f6f1d4e8f0ee2eeb0f35 100644 (file)
--- 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 f3b1467d7568788604d75eba2ee4900a91c51345..cc3fa8b0d979f39dc458dcdeb3ac54a7717d4818 100755 (executable)
--- 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 400bc876b4c9b018475df50c2ac28eb0541e5c1d..84f2878baae0c905068e352bf8f5a3c58bd3e172 100644 (file)
--- 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 92b217d20be61e124208a8f8f3aea33eda6d23de..f145f1a3c6bdb636754385100d62e953c09b560e 100644 (file)
--- 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 9abf46133b2eeca7bc17719ebb30d728b913f142..ea1a81ad81884635799da3da45d24024f5e57575 100644 (file)
--- 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 1e96f107be6e6a3f1e3b9638ebce2fe5798696af..c9414d4680f1db90e5d5f6f1d4e8f0ee2eeb0f35 100644 (file)
--- 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 f3b1467d7568788604d75eba2ee4900a91c51345..cc3fa8b0d979f39dc458dcdeb3ac54a7717d4818 100755 (executable)
--- 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 9a7ed8516f7d4e898915edae6f32a4545a6436ef..80b6c9734637ab4683e468fce3b8d449cc0ec54c 100644 (file)
--- 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 1e96f107be6e6a3f1e3b9638ebce2fe5798696af..c9414d4680f1db90e5d5f6f1d4e8f0ee2eeb0f35 100644 (file)
--- 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 f3b1467d7568788604d75eba2ee4900a91c51345..cc3fa8b0d979f39dc458dcdeb3ac54a7717d4818 100755 (executable)
--- 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 7c34a4f50c2583e7f9566b04cfbf94e07c69a5ba..ea737353b0963ffd2df7fd2dca6e5464c7b559a5 100644 (file)
--- 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 abca26eeaa0c7c88f06a900645e2383d8b5d3d52..b61c9617f3c0f63a76e299ef21aa3abe76bdc76b 100644 (file)
--- 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 a8a383a868b1ffb5100cf7cd324ff62053c1193a..8f14a5aa2b57fa0d0ec5d87bb5d0bb9f709ea191 100755 (executable)
--- 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 d4b61cab2316f3f3032c18039d494c665832a038..611583270122a66d5230d94c83c4d3f159fd1924 100644 (file)
--- 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 c7a63712ed36100d7e7a240eb565a8a837173b74..d0f761fd802854f52067822d764a2a04cbcabe7f 100644 (file)
--- 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 d6cbb9d8aa1600ea877f0a34d585820bca4443e3..57e37559d5b098b8a957033ebd86475cf095338a 100755 (executable)
--- 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 02540a047db78345efeecf1ef4f07561a6e70cab..9e1d3008cf425dd58d394b61d8ad4cc2347cb2a7 100644 (file)
--- 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 6d7c9c47b64ab60217d9ce4de6216de5b6afb3ba..41becaa05f161596fe7d4c52bf3af821d655e539 100644 (file)
--- 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 246845328a8af4b763705df1c753f75c96ef1030..dac37c64c26e46f2e2b64e6d1dd765fccc72f90d 100755 (executable)
--- 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 9530268ddc5947471aed726a7eb903fe43a3d0b8..042bfbfd1cd3590a736486c31fb576d412d281c9 100644 (file)
--- 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 dd2215a802be3095909e347dc86c3dce7bf7c1de..5b7cc190a08635623346bff613e25dc6fc8b5392 100644 (file)
--- 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 1e96f107be6e6a3f1e3b9638ebce2fe5798696af..c9414d4680f1db90e5d5f6f1d4e8f0ee2eeb0f35 100644 (file)
--- 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 f3b1467d7568788604d75eba2ee4900a91c51345..cc3fa8b0d979f39dc458dcdeb3ac54a7717d4818 100755 (executable)
--- 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 d570ba9ea35e779ca3c237816546d182936f16c9..77670a262c92d1c0a0ca791713496be6ce573f67 100644 (file)
--- 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 08ac8b16a74506eb7ac2f9e1578c88f172cb6ddb..212a399016b4e71126f62f3c30b57edca311a1ff 100644 (file)
--- 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 89a7beec379c7b013f9b1ef4b6b6fb675e1ddac5..293463e42a17114c823e4f4e995d4b7f0fe7f0e0 100755 (executable)
--- 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 4aa76081ab232ac4e89772a5f693189996954573..8433b91551d5bc192fe814a02090e799b9824523 100644 (file)
--- 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 1e96f107be6e6a3f1e3b9638ebce2fe5798696af..c9414d4680f1db90e5d5f6f1d4e8f0ee2eeb0f35 100644 (file)
--- 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 f3b1467d7568788604d75eba2ee4900a91c51345..cc3fa8b0d979f39dc458dcdeb3ac54a7717d4818 100755 (executable)
--- 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 75446a9857052f26a93cdfc6314ff824e66912ec..0e9ee9ffafdfb6b0ab59e2bf81773517eebde3c6 100644 (file)
--- 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 1e96f107be6e6a3f1e3b9638ebce2fe5798696af..c9414d4680f1db90e5d5f6f1d4e8f0ee2eeb0f35 100644 (file)
--- 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 474a7826a120a53860c17a3988a06552bb06d6c2..60f947c7b497cc23abd76bf6943b972d13620937 100755 (executable)
--- 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 ed8ddc3b07405598540e942f9a1e84ac1733f923..de004680a9aa5f96e0723063970cd633001bd146 100644 (file)
--- 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 1e96f107be6e6a3f1e3b9638ebce2fe5798696af..c9414d4680f1db90e5d5f6f1d4e8f0ee2eeb0f35 100644 (file)
--- 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 f3b1467d7568788604d75eba2ee4900a91c51345..cc3fa8b0d979f39dc458dcdeb3ac54a7717d4818 100755 (executable)
--- 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 6bdcc60b034656dec110d400492678dcead846c1..c5f241bd0aaa2bd67ce59ce81c8c15932b131f7e 100644 (file)
--- 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 08ac8b16a74506eb7ac2f9e1578c88f172cb6ddb..212a399016b4e71126f62f3c30b57edca311a1ff 100644 (file)
--- 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 922b9371db2ecbe5a891fd244e92510e558b0b93..1d05bb0dd3de22400aeac3f7017316be71bc9d20 100755 (executable)
--- 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 c8a4629beca21b55593ef2ffcce0d2cd3e0e9170..450e8d1486b375bd39d8063075bd180eba6b0fe2 100644 (file)
--- 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 1e96f107be6e6a3f1e3b9638ebce2fe5798696af..c9414d4680f1db90e5d5f6f1d4e8f0ee2eeb0f35 100644 (file)
--- 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 f3b1467d7568788604d75eba2ee4900a91c51345..cc3fa8b0d979f39dc458dcdeb3ac54a7717d4818 100755 (executable)
--- 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 94b6f3b05512ab7259084c1e891f46f128169092..4fa308d7d7f331e3ed83613c3a3509d2ca959933 100644 (file)
--- 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 1e96f107be6e6a3f1e3b9638ebce2fe5798696af..c9414d4680f1db90e5d5f6f1d4e8f0ee2eeb0f35 100644 (file)
--- 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 f3b1467d7568788604d75eba2ee4900a91c51345..cc3fa8b0d979f39dc458dcdeb3ac54a7717d4818 100755 (executable)
--- 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 d54be42edd1da055f0a240fdefb32fa92d86cf68..e771530983e2d29cf8c45d0f2a2ea5da651d9b3f 100644 (file)
--- 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 08ac8b16a74506eb7ac2f9e1578c88f172cb6ddb..212a399016b4e71126f62f3c30b57edca311a1ff 100644 (file)
--- 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 72799cef8348857ba15ce55158e1332382a3ed06..511dbf395592efe6fc35374cfa6399d61bfac4a5 100755 (executable)
--- 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 00da0a93f66404805fc6a78ee4e6d9d4a58163d5..2508e40570ddc6c7e94bb1a34e9269eff868ae8d 100644 (file)
--- 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 08ac8b16a74506eb7ac2f9e1578c88f172cb6ddb..212a399016b4e71126f62f3c30b57edca311a1ff 100644 (file)
--- 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 7a2d07c3edf19af2f539e0a92c26c5578966fe16..85e28ca9addd82a9e15924002fdeb434dded6bae 100755 (executable)
--- 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 428c348d2499056a6eddd5d86254f41858b2f5f9..bfdc53d6f29420cc18743b3ad72f05e66b4b0aac 100644 (file)
--- 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 1e96f107be6e6a3f1e3b9638ebce2fe5798696af..c9414d4680f1db90e5d5f6f1d4e8f0ee2eeb0f35 100644 (file)
--- 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 f3b1467d7568788604d75eba2ee4900a91c51345..cc3fa8b0d979f39dc458dcdeb3ac54a7717d4818 100755 (executable)
--- 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 87d6a428353af2f53f1b6bc47c91a8c3c83aa5cc..7bbeadc63afa086414ec05ecbe782341ecd1cb1a 100644 (file)
--- 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 08ac8b16a74506eb7ac2f9e1578c88f172cb6ddb..212a399016b4e71126f62f3c30b57edca311a1ff 100644 (file)
--- 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 b115b957da8792de6b9036b8cf12f38bb0c77b36..c258ee50417ae785b6ebe95024af603b6103c9fa 100755 (executable)
--- 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 14101830e828517ea2e450f268527d5b30042242..ed53cd2f1206a2ce3fa5d574dc3f178d3fde775f 100644 (file)
--- 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 8d260421e0e9434847e4d9896371dc99aea1840a..aba45b0bc33e4bc0211bd071440aab632ca5d191 100644 (file)
--- 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 ea7373a0be1686a76406def3eb4e5821dfeb951f..986d37136034e7c928d3e730c54c952db70ac7db 100644 (file)
--- 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 1e96f107be6e6a3f1e3b9638ebce2fe5798696af..c9414d4680f1db90e5d5f6f1d4e8f0ee2eeb0f35 100644 (file)
--- 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 f3b1467d7568788604d75eba2ee4900a91c51345..cc3fa8b0d979f39dc458dcdeb3ac54a7717d4818 100755 (executable)
--- 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 f2a862efe0d07af464282be0e20c4d93780fa821..3fe68c67781ecc39e1a2fc4012a4210a9eaaf66c 100644 (file)
--- 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 1e96f107be6e6a3f1e3b9638ebce2fe5798696af..c9414d4680f1db90e5d5f6f1d4e8f0ee2eeb0f35 100644 (file)
--- 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 f3b1467d7568788604d75eba2ee4900a91c51345..cc3fa8b0d979f39dc458dcdeb3ac54a7717d4818 100755 (executable)
--- 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 d2abcb6a7736ec44cbaddf513e1703ad8139668f..da8e4df49e620a022eb2d6463bb8a7a3268725aa 100644 (file)
--- 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 1e96f107be6e6a3f1e3b9638ebce2fe5798696af..c9414d4680f1db90e5d5f6f1d4e8f0ee2eeb0f35 100644 (file)
--- 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 f3b1467d7568788604d75eba2ee4900a91c51345..cc3fa8b0d979f39dc458dcdeb3ac54a7717d4818 100755 (executable)
--- 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 168ea0a615d5bf9efeb70e96c4869fbb7a94e456..e71d6327d214d437dced50e995e634a7b3e51a62 100644 (file)
--- 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 95e62b9d9883edde2e4d135673eb812b9342ecfd..be0d398dfd34ff97e4d5512102c2a7cf30393955 100644 (file)
--- 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 98ad8d5023ceb790ab1da2e7caaf9a13ea16b75a..241879d00190fcf0b1dae6e1f33f3dff2e2176a1 100755 (executable)
--- 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 99d7a1c3962be17b6ce2cf6db4a62c4f09ec3f44..0cf33559a1917c5b87eaf25b506c539ca07a18ea 100644 (file)
--- 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 6032284af5c18488d0374140be78f8c6db17fa71..f4393afec658c1b1af654357eda559b9a6c34787 100644 (file)
--- 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 126b69a94292221d1b6b48ca9d7974d81071ea02..f379168fe4c2c0ca94b30c683329e2dd906dc693 100755 (executable)
--- 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 2b1dcca000b79ed96fb3a1bb7e7249a9f4063c67..aa8fa65cccebc8bc5f55aa3fe36ee8bbace61b33 100644 (file)
--- 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 1e96f107be6e6a3f1e3b9638ebce2fe5798696af..c9414d4680f1db90e5d5f6f1d4e8f0ee2eeb0f35 100644 (file)
--- 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 f3b1467d7568788604d75eba2ee4900a91c51345..cc3fa8b0d979f39dc458dcdeb3ac54a7717d4818 100755 (executable)
--- 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 d2d4cf4196a10d0ad165dc845794bf510ff94964..5674cb4fa2e94957278091c42a929470edfcace6 100644 (file)
--- 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 1e96f107be6e6a3f1e3b9638ebce2fe5798696af..c9414d4680f1db90e5d5f6f1d4e8f0ee2eeb0f35 100644 (file)
--- 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 f3b1467d7568788604d75eba2ee4900a91c51345..cc3fa8b0d979f39dc458dcdeb3ac54a7717d4818 100755 (executable)
--- 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 be72b42533e109e61580cd735deee052cee925bc..909fd6d83aac51c56fa28a1e1164fd0c5b4587a2 100644 (file)
--- 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 c7a63712ed36100d7e7a240eb565a8a837173b74..d0f761fd802854f52067822d764a2a04cbcabe7f 100644 (file)
--- 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 270eaaf11da8beb6161647f91c6c8b3dc45be70f..61d6d87f2784f665660a7138bf5df702d166903d 100755 (executable)
--- 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 38f482d3a2770c9e5c90e116d53218c5a7f0646a..33f404e0df06c5a1103bc9f71b8343e33e72d4a8 100644 (file)
--- 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 1e96f107be6e6a3f1e3b9638ebce2fe5798696af..c9414d4680f1db90e5d5f6f1d4e8f0ee2eeb0f35 100644 (file)
--- 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 f3b1467d7568788604d75eba2ee4900a91c51345..cc3fa8b0d979f39dc458dcdeb3ac54a7717d4818 100755 (executable)
--- 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 f7a44947528f3e13b971e5e97f72efbb60bdb20a..dc3f37256ec251c1cf39fe2adc1bbf1cc93bde12 100644 (file)
--- 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 14d9979ba2c77ea26c8c80aa0d61f619b79602b9..39198e597597fc980623bfa7fbfba2d045c3479b 100644 (file)
--- 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 c491d1e3b235b862d711dd794f6d7114c890520f..2020e25885f3ac8e50d527502bf282aa2e9ace58 100755 (executable)
--- 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 8f3a97d964382d81c384feef2c72f23b29a87741..55f4fc5793c2e9844e3dae020e095b3bb215921b 100644 (file)
--- 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 1e96f107be6e6a3f1e3b9638ebce2fe5798696af..c9414d4680f1db90e5d5f6f1d4e8f0ee2eeb0f35 100644 (file)
--- 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 f3b1467d7568788604d75eba2ee4900a91c51345..cc3fa8b0d979f39dc458dcdeb3ac54a7717d4818 100755 (executable)
--- a/sim/rl78/configure
+++ b/sim/rl78/configure
@@ -590,10 +590,6 @@ sim_scache
  sim_float
  sim_bitsize
  cgen_breaks
-sim_hw_sockser
-sim_hw_cflags
-SIM_ENABLE_HW_FALSE
-SIM_ENABLE_HW_TRUE
  target_alias
  host_alias
  build_alias
@@ -635,7 +631,6 @@ SHELL'
  ac_subst_files=''
  ac_user_opts='
  enable_option_checking
-enable_sim_hardware
  '
        ac_precious_vars='build_alias
  host_alias
@@ -1243,12 +1238,6 @@ if test -n "$ac_init_help"; then
  
    cat <<\_ACEOF
  
-Optional Features:
-  --disable-option-checking  ignore unrecognized --enable/--with options
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-sim-hardware   Whether to enable hardware/device simulation
-
  Report bugs to the package provider.
  _ACEOF
  ac_status=$?
@@ -1679,48 +1668,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
  
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5
-$as_echo_n "checking for sim hardware settings... " >&6; }
-# Check whether --enable-sim-hardware was given.
-if test "${enable_sim_hardware+set}" = set; then :
-  enableval=$enable_sim_hardware;
-else
-  enable_sim_hardware="yes"
-fi
-
-sim_hw_sockser=
-if test "$enable_sim_hardware" = no; then
-  sim_hw_cflags="-DWITH_HW=0"
-elif test "$enable_sim_hardware" = yes; then
-  sim_hw_cflags="-DWITH_HW=1"
-  # mingw does not support sockser
-  case ${host} in
-    *mingw*) ;;
-    *) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device
-       # that you instatiate.  Instead, other code will call into it directly.
-       # At some point, we should convert it over.
-       sim_hw_sockser="dv-sockser.o"
-       sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
-       ;;
-  esac
-else
-  as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5
-fi
-if test "$enable_sim_hardware" = "yes"; then
-  SIM_ENABLE_HW_TRUE=
-  SIM_ENABLE_HW_FALSE='#'
-else
-  SIM_ENABLE_HW_TRUE='#'
-  SIM_ENABLE_HW_FALSE=
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5
-$as_echo "${enable_sim_hardware}" >&6; }
-
-
-
-
  cgen_breaks=""
  if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then
  cgen_breaks="break cgen_rtx_error";
diff --git a/sim/rx/ChangeLog b/sim/rx/ChangeLog

index f6f20263b544eb6052302198ae9e0e5bee7195e6..083c06181b8d6beebcb5085bd61db68006efe4f8 100644 (file)
--- a/sim/rx/ChangeLog
+++ b/sim/rx/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/rx/aclocal.m4 b/sim/rx/aclocal.m4

index 1e96f107be6e6a3f1e3b9638ebce2fe5798696af..c9414d4680f1db90e5d5f6f1d4e8f0ee2eeb0f35 100644 (file)
--- a/sim/rx/aclocal.m4
+++ b/sim/rx/aclocal.m4
@@ -12,5 +12,4 @@
  # PARTICULAR PURPOSE.
  
  m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
-m4_include([../m4/sim_ac_option_hardware.m4])
  m4_include([../m4/sim_ac_output.m4])
diff --git a/sim/rx/configure b/sim/rx/configure

index 5b342b2d9925b4886797f3f3dab0dfbd48d069b7..578fc94a05f0e30f75f01f330b7daf0107049905 100755 (executable)
--- a/sim/rx/configure
+++ b/sim/rx/configure
@@ -590,10 +590,6 @@ sim_scache
  sim_float
  sim_bitsize
  cgen_breaks
-sim_hw_sockser
-sim_hw_cflags
-SIM_ENABLE_HW_FALSE
-SIM_ENABLE_HW_TRUE
  sim_rx_cycle_accurate_flags
  target_alias
  host_alias
@@ -637,7 +633,6 @@ ac_subst_files=''
  ac_user_opts='
  enable_option_checking
  enable_sim_rx_cycle_accurate
-enable_sim_hardware
  '
        ac_precious_vars='build_alias
  host_alias
@@ -1251,7 +1246,6 @@ Optional Features:
    --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
    --disable-sim-rx-cycle-accurate
                            Disable cycle accurate simulation (faster runtime)
-  --enable-sim-hardware   Whether to enable hardware/device simulation
  
  Report bugs to the package provider.
  _ACEOF
@@ -1703,48 +1697,6 @@ $as_echo "no" >&6; }
  fi
  
  
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5
-$as_echo_n "checking for sim hardware settings... " >&6; }
-# Check whether --enable-sim-hardware was given.
-if test "${enable_sim_hardware+set}" = set; then :
-  enableval=$enable_sim_hardware;
-else
-  enable_sim_hardware="yes"
-fi
-
-sim_hw_sockser=
-if test "$enable_sim_hardware" = no; then
-  sim_hw_cflags="-DWITH_HW=0"
-elif test "$enable_sim_hardware" = yes; then
-  sim_hw_cflags="-DWITH_HW=1"
-  # mingw does not support sockser
-  case ${host} in
-    *mingw*) ;;
-    *) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device
-       # that you instatiate.  Instead, other code will call into it directly.
-       # At some point, we should convert it over.
-       sim_hw_sockser="dv-sockser.o"
-       sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
-       ;;
-  esac
-else
-  as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5
-fi
-if test "$enable_sim_hardware" = "yes"; then
-  SIM_ENABLE_HW_TRUE=
-  SIM_ENABLE_HW_FALSE='#'
-else
-  SIM_ENABLE_HW_TRUE='#'
-  SIM_ENABLE_HW_FALSE=
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5
-$as_echo "${enable_sim_hardware}" >&6; }
-
-
-
-
  cgen_breaks=""
  if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then
  cgen_breaks="break cgen_rtx_error";
diff --git a/sim/sh/ChangeLog b/sim/sh/ChangeLog

index a2b7ff1ccd12cc9205ebd671dae386d32b45f8e5..58fe15d3f59e0f8e99a6ec43c590231afcebff0a 100644 (file)
--- a/sim/sh/ChangeLog
+++ b/sim/sh/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/sh/aclocal.m4 b/sim/sh/aclocal.m4

index 1e96f107be6e6a3f1e3b9638ebce2fe5798696af..c9414d4680f1db90e5d5f6f1d4e8f0ee2eeb0f35 100644 (file)
--- a/sim/sh/aclocal.m4
+++ b/sim/sh/aclocal.m4
@@ -12,5 +12,4 @@
  # PARTICULAR PURPOSE.
  
  m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
-m4_include([../m4/sim_ac_option_hardware.m4])
  m4_include([../m4/sim_ac_output.m4])
diff --git a/sim/sh/configure b/sim/sh/configure

index f3b1467d7568788604d75eba2ee4900a91c51345..cc3fa8b0d979f39dc458dcdeb3ac54a7717d4818 100755 (executable)
--- a/sim/sh/configure
+++ b/sim/sh/configure
@@ -590,10 +590,6 @@ sim_scache
  sim_float
  sim_bitsize
  cgen_breaks
-sim_hw_sockser
-sim_hw_cflags
-SIM_ENABLE_HW_FALSE
-SIM_ENABLE_HW_TRUE
  target_alias
  host_alias
  build_alias
@@ -635,7 +631,6 @@ SHELL'
  ac_subst_files=''
  ac_user_opts='
  enable_option_checking
-enable_sim_hardware
  '
        ac_precious_vars='build_alias
  host_alias
@@ -1243,12 +1238,6 @@ if test -n "$ac_init_help"; then
  
    cat <<\_ACEOF
  
-Optional Features:
-  --disable-option-checking  ignore unrecognized --enable/--with options
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-sim-hardware   Whether to enable hardware/device simulation
-
  Report bugs to the package provider.
  _ACEOF
  ac_status=$?
@@ -1679,48 +1668,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
  
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5
-$as_echo_n "checking for sim hardware settings... " >&6; }
-# Check whether --enable-sim-hardware was given.
-if test "${enable_sim_hardware+set}" = set; then :
-  enableval=$enable_sim_hardware;
-else
-  enable_sim_hardware="yes"
-fi
-
-sim_hw_sockser=
-if test "$enable_sim_hardware" = no; then
-  sim_hw_cflags="-DWITH_HW=0"
-elif test "$enable_sim_hardware" = yes; then
-  sim_hw_cflags="-DWITH_HW=1"
-  # mingw does not support sockser
-  case ${host} in
-    *mingw*) ;;
-    *) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device
-       # that you instatiate.  Instead, other code will call into it directly.
-       # At some point, we should convert it over.
-       sim_hw_sockser="dv-sockser.o"
-       sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
-       ;;
-  esac
-else
-  as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5
-fi
-if test "$enable_sim_hardware" = "yes"; then
-  SIM_ENABLE_HW_TRUE=
-  SIM_ENABLE_HW_FALSE='#'
-else
-  SIM_ENABLE_HW_TRUE='#'
-  SIM_ENABLE_HW_FALSE=
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5
-$as_echo "${enable_sim_hardware}" >&6; }
-
-
-
-
  cgen_breaks=""
  if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then
  cgen_breaks="break cgen_rtx_error";
diff --git a/sim/v850/ChangeLog b/sim/v850/ChangeLog

index 41badac47f7892b261b1b963e08d6f3fd5a82705..08e101ab869cf981a793b08e2ff2df4948b195a3 100644 (file)
--- a/sim/v850/ChangeLog
+++ b/sim/v850/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/v850/aclocal.m4 b/sim/v850/aclocal.m4

index 6032284af5c18488d0374140be78f8c6db17fa71..f4393afec658c1b1af654357eda559b9a6c34787 100644 (file)
--- a/sim/v850/aclocal.m4
+++ b/sim/v850/aclocal.m4
@@ -13,6 +13,5 @@
  
  m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
  m4_include([../m4/sim_ac_option_bitsize.m4])
-m4_include([../m4/sim_ac_option_hardware.m4])
  m4_include([../m4/sim_ac_option_reserved_bits.m4])
  m4_include([../m4/sim_ac_output.m4])
diff --git a/sim/v850/configure b/sim/v850/configure

index 126b69a94292221d1b6b48ca9d7974d81071ea02..f379168fe4c2c0ca94b30c683329e2dd906dc693 100755 (executable)
--- a/sim/v850/configure
+++ b/sim/v850/configure
@@ -588,10 +588,6 @@ sim_default_model
  sim_scache
  sim_float
  cgen_breaks
-sim_hw_sockser
-sim_hw_cflags
-SIM_ENABLE_HW_FALSE
-SIM_ENABLE_HW_TRUE
  target_alias
  host_alias
  build_alias
@@ -637,7 +633,6 @@ ac_user_opts='
  enable_option_checking
  enable_sim_reserved_bits
  enable_sim_bitsize
-enable_sim_hardware
  '
        ac_precious_vars='build_alias
  host_alias
@@ -1253,7 +1248,6 @@ Optional Features:
                            Specify whether to check reserved bits in
                            instruction
    --enable-sim-bitsize=N  Specify target bitsize (32 or 64)
-  --enable-sim-hardware   Whether to enable hardware/device simulation
  
  Report bugs to the package provider.
  _ACEOF
@@ -1761,48 +1755,6 @@ fi
  fi
  
  
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5
-$as_echo_n "checking for sim hardware settings... " >&6; }
-# Check whether --enable-sim-hardware was given.
-if test "${enable_sim_hardware+set}" = set; then :
-  enableval=$enable_sim_hardware;
-else
-  enable_sim_hardware="yes"
-fi
-
-sim_hw_sockser=
-if test "$enable_sim_hardware" = no; then
-  sim_hw_cflags="-DWITH_HW=0"
-elif test "$enable_sim_hardware" = yes; then
-  sim_hw_cflags="-DWITH_HW=1"
-  # mingw does not support sockser
-  case ${host} in
-    *mingw*) ;;
-    *) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device
-       # that you instatiate.  Instead, other code will call into it directly.
-       # At some point, we should convert it over.
-       sim_hw_sockser="dv-sockser.o"
-       sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
-       ;;
-  esac
-else
-  as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5
-fi
-if test "$enable_sim_hardware" = "yes"; then
-  SIM_ENABLE_HW_TRUE=
-  SIM_ENABLE_HW_FALSE='#'
-else
-  SIM_ENABLE_HW_TRUE='#'
-  SIM_ENABLE_HW_FALSE=
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5
-$as_echo "${enable_sim_hardware}" >&6; }
-
-
-
-
  cgen_breaks=""
  if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then
  cgen_breaks="break cgen_rtx_error";
author	Mike Frysinger <vapier@gentoo.org>
	Sun, 20 Jun 2021 00:06:12 +0000 (20:06 -0400)
committer	Mike Frysinger <vapier@gentoo.org>
	Tue, 22 Jun 2021 02:20:18 +0000 (22:20 -0400)
sim/ChangeLog		patch \| blob \| history
sim/Makefile.in		patch \| blob \| history
sim/aarch64/ChangeLog		patch \| blob \| history
sim/aarch64/aclocal.m4		patch \| blob \| history
sim/aarch64/configure		patch \| blob \| history
sim/aclocal.m4		patch \| blob \| history
sim/arch-subdir.mk.in		patch \| blob \| history
sim/arm/ChangeLog		patch \| blob \| history
sim/arm/aclocal.m4		patch \| blob \| history
sim/arm/configure		patch \| blob \| history
sim/avr/ChangeLog		patch \| blob \| history
sim/avr/aclocal.m4		patch \| blob \| history
sim/avr/configure		patch \| blob \| history
sim/bfin/ChangeLog		patch \| blob \| history
sim/bfin/aclocal.m4		patch \| blob \| history
sim/bfin/configure		patch \| blob \| history
sim/bpf/ChangeLog		patch \| blob \| history
sim/bpf/aclocal.m4		patch \| blob \| history
sim/bpf/configure		patch \| blob \| history
sim/common/ChangeLog		patch \| blob \| history
sim/common/Make-common.in		patch \| blob \| history
sim/configure		patch \| blob \| history
sim/configure.ac		patch \| blob \| history
sim/cr16/ChangeLog		patch \| blob \| history
sim/cr16/aclocal.m4		patch \| blob \| history
sim/cr16/configure		patch \| blob \| history
sim/cris/ChangeLog		patch \| blob \| history
sim/cris/aclocal.m4		patch \| blob \| history
sim/cris/configure		patch \| blob \| history
sim/d10v/ChangeLog		patch \| blob \| history
sim/d10v/aclocal.m4		patch \| blob \| history
sim/d10v/configure		patch \| blob \| history
sim/erc32/ChangeLog		patch \| blob \| history
sim/erc32/aclocal.m4		patch \| blob \| history
sim/erc32/configure		patch \| blob \| history
sim/example-synacor/ChangeLog		patch \| blob \| history
sim/example-synacor/aclocal.m4		patch \| blob \| history
sim/example-synacor/configure		patch \| blob \| history
sim/frv/ChangeLog		patch \| blob \| history
sim/frv/aclocal.m4		patch \| blob \| history
sim/frv/configure		patch \| blob \| history
sim/ft32/ChangeLog		patch \| blob \| history
sim/ft32/aclocal.m4		patch \| blob \| history
sim/ft32/configure		patch \| blob \| history
sim/h8300/ChangeLog		patch \| blob \| history
sim/h8300/aclocal.m4		patch \| blob \| history
sim/h8300/configure		patch \| blob \| history
sim/iq2000/ChangeLog		patch \| blob \| history
sim/iq2000/aclocal.m4		patch \| blob \| history
sim/iq2000/configure		patch \| blob \| history
sim/lm32/ChangeLog		patch \| blob \| history
sim/lm32/aclocal.m4		patch \| blob \| history
sim/lm32/configure		patch \| blob \| history
sim/m32c/ChangeLog		patch \| blob \| history
sim/m32c/aclocal.m4		patch \| blob \| history
sim/m32c/configure		patch \| blob \| history
sim/m32r/ChangeLog		patch \| blob \| history
sim/m32r/aclocal.m4		patch \| blob \| history
sim/m32r/configure		patch \| blob \| history
sim/m4/sim_ac_option_hardware.m4		patch \| blob \| history
sim/m4/sim_ac_output.m4		patch \| blob \| history
sim/m68hc11/ChangeLog		patch \| blob \| history
sim/m68hc11/aclocal.m4		patch \| blob \| history
sim/m68hc11/configure		patch \| blob \| history
sim/mcore/ChangeLog		patch \| blob \| history
sim/mcore/aclocal.m4		patch \| blob \| history
sim/mcore/configure		patch \| blob \| history
sim/microblaze/ChangeLog		patch \| blob \| history
sim/microblaze/aclocal.m4		patch \| blob \| history
sim/microblaze/configure		patch \| blob \| history
sim/mips/ChangeLog		patch \| blob \| history
sim/mips/aclocal.m4		patch \| blob \| history
sim/mips/configure		patch \| blob \| history
sim/mn10300/ChangeLog		patch \| blob \| history
sim/mn10300/aclocal.m4		patch \| blob \| history
sim/mn10300/configure		patch \| blob \| history
sim/moxie/ChangeLog		patch \| blob \| history
sim/moxie/aclocal.m4		patch \| blob \| history
sim/moxie/configure		patch \| blob \| history
sim/msp430/ChangeLog		patch \| blob \| history
sim/msp430/aclocal.m4		patch \| blob \| history
sim/msp430/configure		patch \| blob \| history
sim/or1k/ChangeLog		patch \| blob \| history
sim/or1k/aclocal.m4		patch \| blob \| history
sim/or1k/configure		patch \| blob \| history
sim/pru/ChangeLog		patch \| blob \| history
sim/pru/aclocal.m4		patch \| blob \| history
sim/pru/configure		patch \| blob \| history
sim/riscv/ChangeLog		patch \| blob \| history
sim/riscv/aclocal.m4		patch \| blob \| history
sim/riscv/configure		patch \| blob \| history
sim/rl78/ChangeLog		patch \| blob \| history
sim/rl78/aclocal.m4		patch \| blob \| history
sim/rl78/configure		patch \| blob \| history
sim/rx/ChangeLog		patch \| blob \| history
sim/rx/aclocal.m4		patch \| blob \| history
sim/rx/configure		patch \| blob \| history
sim/sh/ChangeLog		patch \| blob \| history
sim/sh/aclocal.m4		patch \| blob \| history
sim/sh/configure		patch \| blob \| history
sim/v850/ChangeLog		patch \| blob \| history
sim/v850/aclocal.m4		patch \| blob \| history
sim/v850/configure		patch \| blob \| history