sim: unify hardware settings

Move these options up to the common dir so we only test & export
them once across all ports.
This commit is contained in:
Mike Frysinger 2021-06-19 20:06:12 -04:00
parent be0387eed0
commit 456ef1c1d4
103 changed files with 230 additions and 1627 deletions

View File

@ -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

View File

@ -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@

View File

@ -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.

View File

@ -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])

53
sim/aarch64/configure vendored
View File

@ -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";

1
sim/aclocal.m4 vendored
View File

@ -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])

View File

@ -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 =

View File

@ -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.

1
sim/arm/aclocal.m4 vendored
View File

@ -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])

53
sim/arm/configure vendored
View File

@ -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";

View File

@ -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.

1
sim/avr/aclocal.m4 vendored
View File

@ -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])

53
sim/avr/configure vendored
View File

@ -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";

View File

@ -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.

1
sim/bfin/aclocal.m4 vendored
View File

@ -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])

48
sim/bfin/configure vendored
View File

@ -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";

View File

@ -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.

1
sim/bpf/aclocal.m4 vendored
View File

@ -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])

48
sim/bpf/configure vendored
View File

@ -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";

View File

@ -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.

View File

@ -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

54
sim/configure vendored
View File

@ -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

View File

@ -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

View File

@ -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.

1
sim/cr16/aclocal.m4 vendored
View File

@ -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])

53
sim/cr16/configure vendored
View File

@ -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";

View File

@ -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.

1
sim/cris/aclocal.m4 vendored
View File

@ -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])

48
sim/cris/configure vendored
View File

@ -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";

View File

@ -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.

1
sim/d10v/aclocal.m4 vendored
View File

@ -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])

53
sim/d10v/configure vendored
View File

@ -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";

View File

@ -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.

View File

@ -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])

53
sim/erc32/configure vendored
View File

@ -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";

View File

@ -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.

View File

@ -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])

View File

@ -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";

View File

@ -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.

1
sim/frv/aclocal.m4 vendored
View File

@ -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])

48
sim/frv/configure vendored
View File

@ -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";

View File

@ -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.

1
sim/ft32/aclocal.m4 vendored
View File

@ -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])

53
sim/ft32/configure vendored
View File

@ -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";

View File

@ -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.

View File

@ -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])

53
sim/h8300/configure vendored
View File

@ -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";

View File

@ -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.

View File

@ -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])

48
sim/iq2000/configure vendored
View File

@ -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";

View File

@ -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.

1
sim/lm32/aclocal.m4 vendored
View File

@ -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])

48
sim/lm32/configure vendored
View File

@ -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";

View File

@ -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.

1
sim/m32c/aclocal.m4 vendored
View File

@ -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])

53
sim/m32c/configure vendored
View File

@ -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";

View File

@ -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.

1
sim/m32r/aclocal.m4 vendored
View File

@ -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])

48
sim/m32r/configure vendored
View File

@ -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";

View File

@ -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)

View File

@ -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

View File

@ -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.

View File

@ -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])

53
sim/m68hc11/configure vendored
View File

@ -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";

View File

@ -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.

View File

@ -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])

53
sim/mcore/configure vendored
View File

@ -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";

View File

@ -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.

View File

@ -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])

View File

@ -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";

View File

@ -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.

1
sim/mips/aclocal.m4 vendored
View File

@ -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])

48
sim/mips/configure vendored
View File

@ -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";

View File

@ -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.

View File

@ -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])

48
sim/mn10300/configure vendored
View File

@ -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";

View File

@ -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.

View File

@ -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])

53
sim/moxie/configure vendored
View File

@ -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";

View File

@ -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.

View File

@ -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])

53
sim/msp430/configure vendored
View File

@ -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";

View File

@ -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.

1
sim/or1k/aclocal.m4 vendored
View File

@ -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])

48
sim/or1k/configure vendored
View File

@ -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";

View File

@ -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.

1
sim/pru/aclocal.m4 vendored
View File

@ -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])

53
sim/pru/configure vendored
View File

@ -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";

View File

@ -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.

View File

@ -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])

48
sim/riscv/configure vendored
View File

@ -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";

View File

@ -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.

1
sim/rl78/aclocal.m4 vendored
View File

@ -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])

53
sim/rl78/configure vendored
View File

@ -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";

View File

@ -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.

1
sim/rx/aclocal.m4 vendored
View File

@ -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])

48
sim/rx/configure vendored
View File

@ -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";

View File

@ -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.

1
sim/sh/aclocal.m4 vendored
View File

@ -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])

53
sim/sh/configure vendored
View File

@ -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";

Some files were not shown because too many files have changed in this diff Show More