FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sim: m68hc11: stop making hardware conditional

Browse source 
This port doesn't build if these hardware modules are omitted, and
there's no reason we need to make it conditional at build time, so
always enable it.  The hardware devices only get turned on if the
user requests it at runtime via hardware settings.
This commit is contained in:
Mike Frysinger 2021-01-16 01:46:11 -05:00
parent f4dd74915b
commit 88f68ee277
3 changed files with 22 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sim/m68hc11/ChangeLog
View file

@ -1,3 +1,8 @@
2021-01-30 Mike Frysinger <vapier@gentoo.org>
* configure.ac (SIM_AC_OPTION_HARDWARE): Inline variables.
* configure: Regenerate.
2021-01-11 Mike Frysinger <vapier@gentoo.org>
* config.in, configure: Regenerate.

34
sim/m68hc11/configure vendored
View file

@ -6908,7 +6908,15 @@ fi
test -z "$AR" && AR=ar
if test -n "$plugin_option"; then
if $AR --help 2>&1 | grep -q "\--plugin"; then
AR="$AR $plugin_option"
touch conftest.c
$AR $plugin_option rc conftest.a conftest.c
if test "$?" != 0; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
$as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;}
else
AR="$AR $plugin_option"
fi
rm -f conftest.*
fi
fi
test -z "$AR_FLAGS" && AR_FLAGS=cru
@ -12932,7 +12940,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 12935 "configure"
#line 12943 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -13038,7 +13046,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 13041 "configure"
#line 13049 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -13778,24 +13786,12 @@ $as_echo "${WARN_CFLAGS} ${WERROR_CFLAGS}" >&6; }
fi
#
# Add simulated hardware devices
#
hw_enabled=no
case "${target}" in
m68hc11-*-*|m6811-*-*)
hw_enabled=yes
hw_extra_devices="m68hc11 m68hc11sio m68hc11eepr m68hc11tim m68hc11spi nvram"
SIM_SUBTARGET="$SIM_SUBTARGET -DTARGET_M68HC11=1"
;;
esac
if test "$hw_devices"; then
hardware="$hw_devices"
if test ""; then
hardware=""
else
hardware="cfi core pal glue"
fi
hardware="$hardware $hw_extra_devices"
hardware="$hardware m68hc11 m68hc11sio m68hc11eepr m68hc11tim m68hc11spi nvram"
sim_hw_cflags="-DWITH_HW=1"
sim_hw="$hardware"
@ -13805,7 +13801,7 @@ sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\
if test "${enable_sim_hardware+set}" = set; then :
enableval=$enable_sim_hardware;
else
enable_sim_hardware="$hw_enabled"
enable_sim_hardware="yes"
fi
case ${enable_sim_hardware} in

15
sim/m68hc11/configure.ac
View file

@ -8,18 +8,7 @@ dnl Options available in this module
SIM_AC_OPTION_ENDIAN(BIG)
SIM_AC_OPTION_ALIGNMENT(NONSTRICT_ALIGNMENT)
SIM_AC_OPTION_WARNINGS(no)
#
# Add simulated hardware devices
#
hw_enabled=no
case "${target}" in
m68hc11-*-*|m6811-*-*)
hw_enabled=yes
hw_extra_devices="m68hc11 m68hc11sio m68hc11eepr m68hc11tim m68hc11spi nvram"
SIM_SUBTARGET="$SIM_SUBTARGET -DTARGET_M68HC11=1"
;;
esac
SIM_AC_OPTION_HARDWARE($hw_enabled,$hw_devices,$hw_extra_devices)
SIM_AC_OPTION_HARDWARE(yes,,
m68hc11 m68hc11sio m68hc11eepr m68hc11tim m68hc11spi nvram)
SIM_AC_OUTPUT