@ -588,6 +588,10 @@ 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
@ -627,16 +631,13 @@ PACKAGE_NAME
PATH_SEPARATOR
SHELL
sim_scache
sim_hw
sim_hw_objs
sim_hw_cflags
sim_default_model'
ac_subst_files=''
ac_user_opts='
enable_option_checking
enable_sim_scache
enable_sim_hardware
enable_sim_default_model
enable_sim_hardware
'
ac_precious_vars='build_alias
host_alias
@ -1250,10 +1251,9 @@ Optional Features:
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--enable-sim-scache=size
Specify simulator execution cache size
--enable-sim-hardware=LIST
Specify the hardware to be included in the build.
--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
@ -1705,11 +1705,26 @@ fi
hardware="cfi core pal glue rv cris cris_900000xx"
sim_hw_cflags="-DWITH_HW=1"
sim_hw="$hardware"
sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\1.o/g'`"
# The default model shouldn't matter as long as there's a BFD.
default_sim_default_model="crisv32"
# Check whether --enable-sim-default-model was given.
if test "${enable_sim_default_model+set}" = set; then :
enableval=$enable_sim_default_model; case "${enableval}" in
yes|no) as_fn_error $? "\"Missing argument to --enable-sim-default-model\"" "$LINENO" 5;;
*) sim_default_model="-DWITH_DEFAULT_MODEL='\"${enableval}\"'";;
esac
if test x"$silent" != x"yes" && test x"$sim_default_model" != x""; then
echo "Setting default model = $sim_default_model" 6>&1
fi
else
sim_default_model="-DWITH_DEFAULT_MODEL='\"${default_sim_default_model}\"'"
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;
@ -1717,61 +1732,37 @@ else
enable_sim_hardware="yes"
fi
case ${enable_sim_hardware} in
yes|no) ;;
,*) hardware="${hardware} `echo ${enableval} | sed -e 's/,/ /'`";;
*,) hardware="`echo ${enableval} | sed -e 's/,/ /'` ${hardware}";;
*) hardware="`echo ${enableval} | sed -e 's/,/ /'`"'';;
esac
sim_hw_sockser=
if test "$enable_sim_hardware" = no; then
sim_hw_objs=
sim_hw_cflags="-DWITH_HW=0"
sim_hw=
else
elif test "$enable_sim_hardware" = yes; then
sim_hw_cflags="-DWITH_HW=1"
# remove duplicates
sim_hw=""
sim_hw_objs="\$(SIM_COMMON_HW_OBJS)"
for i in $hardware ; do
case " $sim_hw " in
*" $i "*) ;;
*) sim_hw="$sim_hw $i" ; sim_hw_objs="$sim_hw_objs dv-$i.o";;
esac
done
# 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_objs="$sim_hw_objs dv-sockser.o"
sim_hw_sockser="dv-sockser.o"
sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
;;
esac
if test x"$silent" != x"yes"; then
echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
fi
fi
# The default model shouldn't matter as long as there's a BFD.
default_sim_default_model="crisv32"
# Check whether --enable-sim-default-model was given.
if test "${enable_sim_default_model+set}" = set; then :
enableval=$enable_sim_default_model; case "${enableval}" in
yes|no) as_fn_error $? "\"Missing argument to --enable-sim-default-model\"" "$LINENO" 5;;
*) sim_default_model="-DWITH_DEFAULT_MODEL='\"${enableval}\"'";;
esac
if test x"$silent" != x"yes" && test x"$sim_default_model" != x""; then
echo "Setting default model = $sim_default_model" 6>&1
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_default_model="-DWITH_DEFAULT_MODEL='\"${default_sim_default_model}\"'"
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=""
@ -1796,9 +1787,6 @@ ac_config_commands="$ac_config_commands stamp-h"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
Mike Frysinger
5 years ago