diff options
Diffstat (limited to 'sim/m68hc11')
| -rw-r--r-- | sim/m68hc11/ChangeLog | 5 | ||||
| -rwxr-xr-x | sim/m68hc11/configure | 34 | ||||
| -rw-r--r-- | sim/m68hc11/configure.ac | 15 |
3 files changed, 22 insertions, 32 deletions
diff --git a/sim/m68hc11/ChangeLog b/sim/m68hc11/ChangeLog index d8d031d..eb1dea3 100644 --- a/sim/m68hc11/ChangeLog +++ b/sim/m68hc11/ChangeLog @@ -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. diff --git a/sim/m68hc11/configure b/sim/m68hc11/configure index 909a4e3..8b6ba08 100755 --- a/sim/m68hc11/configure +++ b/sim/m68hc11/configure @@ -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 diff --git a/sim/m68hc11/configure.ac b/sim/m68hc11/configure.ac index 800da69..e1c758a 100644 --- a/sim/m68hc11/configure.ac +++ b/sim/m68hc11/configure.ac @@ -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 |