From 64dd13dfc267b1d13f42519f220e89a4386591fd Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 23 Mar 2015 22:45:13 -0400 Subject: sim: drop support for requiring hw support Since no sim is using the "always" option to SIM_AC_OPTION_HARDWARE, and we don't want to require hw support to always be enabled, drop the option. This leads to a slight simplification in the macro too as we can collapse the sim_hw_p variable. --- sim/m68hc11/ChangeLog | 4 ++++ sim/m68hc11/configure | 15 +++++---------- 2 files changed, 9 insertions(+), 10 deletions(-) (limited to 'sim/m68hc11') diff --git a/sim/m68hc11/ChangeLog b/sim/m68hc11/ChangeLog index 35f1e18..67815b1 100644 --- a/sim/m68hc11/ChangeLog +++ b/sim/m68hc11/ChangeLog @@ -1,6 +1,10 @@ 2015-03-23 Mike Frysinger * configure: Regenerate. + +2015-03-23 Mike Frysinger + + * configure: Regenerate. * configure.ac (m68hc11_extra_objs): Delete. * Makefile.in (SIM_OBJS): Delete SIM_EXTRA_OBJS. (SIM_EXTRA_OBJS): Delete. diff --git a/sim/m68hc11/configure b/sim/m68hc11/configure index 7d559e6..e056512 100755 --- a/sim/m68hc11/configure +++ b/sim/m68hc11/configure @@ -13444,18 +13444,13 @@ if test "${enable_sim_hardware+set}" = set; then : fi case ${enable_sim_hardware} in - yes) sim_hw_p=yes;; - no) sim_hw_p=no;; - ,*) sim_hw_p=yes; hardware="${hardware} `echo ${enableval} | sed -e 's/,/ /'`";; - *,) sim_hw_p=yes; hardware="`echo ${enableval} | sed -e 's/,/ /'` ${hardware}";; - *) sim_hw_p=yes; hardware="`echo ${enableval} | sed -e 's/,/ /'`"'';; + yes|no) ;; + ,*) hardware="${hardware} `echo ${enableval} | sed -e 's/,/ /'`";; + *,) hardware="`echo ${enableval} | sed -e 's/,/ /'` ${hardware}";; + *) hardware="`echo ${enableval} | sed -e 's/,/ /'`"'';; esac -if test "$sim_hw_p" != yes; then - if test "$hw_enabled" = "always"; then - as_fn_error "Sorry, but this simulator requires that hardware support -be enabled. Please configure without --disable-hw-support." "$LINENO" 5 - fi +if test "$enable_sim_hardware" = no; then sim_hw_objs= sim_hw_cflags="-DWITH_HW=0" sim_hw= -- cgit v1.1