From 64dd13dfc267b1d13f42519f220e89a4386591fd Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 23 Mar 2015 22:45:13 -0400 Subject: [PATCH] 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/bfin/ChangeLog | 4 ++++ sim/bfin/configure | 15 +++++---------- sim/common/acinclude.m4 | 17 ++++++----------- sim/cris/ChangeLog | 4 ++++ sim/cris/configure | 15 +++++---------- sim/frv/ChangeLog | 4 ++++ sim/frv/configure | 15 +++++---------- sim/iq2000/ChangeLog | 4 ++++ sim/iq2000/configure | 15 +++++---------- sim/lm32/ChangeLog | 4 ++++ sim/lm32/configure | 15 +++++---------- sim/m32r/ChangeLog | 4 ++++ sim/m32r/configure | 15 +++++---------- sim/m68hc11/ChangeLog | 4 ++++ sim/m68hc11/configure | 15 +++++---------- sim/mips/ChangeLog | 4 ++++ sim/mips/configure | 15 +++++---------- sim/mn10300/ChangeLog | 4 ++++ sim/mn10300/configure | 15 +++++---------- sim/sh64/ChangeLog | 4 ++++ sim/sh64/configure | 15 +++++---------- 21 files changed, 96 insertions(+), 111 deletions(-) diff --git a/sim/bfin/ChangeLog b/sim/bfin/ChangeLog index 1619cfc7823..4d2619c200c 100644 --- a/sim/bfin/ChangeLog +++ b/sim/bfin/ChangeLog @@ -1,3 +1,7 @@ +2015-03-23 Mike Frysinger + + * configure: Regenerate. + 2015-03-23 Mike Frysinger * configure: Regenerate. diff --git a/sim/bfin/configure b/sim/bfin/configure index ecd911a5da4..f3e2a7a8533 100755 --- a/sim/bfin/configure +++ b/sim/bfin/configure @@ -13566,18 +13566,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 "yes" = "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= diff --git a/sim/common/acinclude.m4 b/sim/common/acinclude.m4 index e4d206fe3b8..3e9fb2fe40a 100644 --- a/sim/common/acinclude.m4 +++ b/sim/common/acinclude.m4 @@ -585,7 +585,7 @@ AC_SUBST(sim_default_model) dnl --enable-sim-hardware is for users of the simulator -dnl arg[1] Enable sim-hw by default? ("yes", "no", or "always") +dnl arg[1] Enable sim-hw by default? ("yes" or "no") dnl arg[2] is a space separated list of devices that override the defaults dnl arg[3] is a space separated list of extra target specific devices. AC_DEFUN([SIM_AC_OPTION_HARDWARE], @@ -611,18 +611,13 @@ AC_ARG_ENABLE(sim-hardware, [AS_HELP_STRING([--enable-sim-hardware=LIST], [Specify the hardware to be included in the build.])]) 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 "[$1]" = "always"; then - AC_MSG_ERROR([Sorry, but this simulator requires that hardware support -be enabled. Please configure without --disable-hw-support.]) - fi +if test "$enable_sim_hardware" = no; then sim_hw_objs= sim_hw_cflags="-DWITH_HW=0" sim_hw= diff --git a/sim/cris/ChangeLog b/sim/cris/ChangeLog index 8d2905f7a5a..d5871222f0b 100644 --- a/sim/cris/ChangeLog +++ b/sim/cris/ChangeLog @@ -7,6 +7,10 @@ * configure: Regenerate. +2015-03-23 Mike Frysinger + + * configure: Regenerate. + 2015-03-16 Mike Frysinger * aclocal.m4, config.in, configure: Regenerate. diff --git a/sim/cris/configure b/sim/cris/configure index a36a3eb8893..08bc6810d4f 100755 --- a/sim/cris/configure +++ b/sim/cris/configure @@ -13434,18 +13434,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 "no" = "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= diff --git a/sim/frv/ChangeLog b/sim/frv/ChangeLog index 1ae319ca978..d7f23f19be0 100644 --- a/sim/frv/ChangeLog +++ b/sim/frv/ChangeLog @@ -1,3 +1,7 @@ +2015-03-23 Mike Frysinger + + * configure: Regenerate. + 2015-03-23 Mike Frysinger * devices.c: Delete dv-sockser.h include. diff --git a/sim/frv/configure b/sim/frv/configure index 847c4bbe116..06f015feb51 100755 --- a/sim/frv/configure +++ b/sim/frv/configure @@ -13436,18 +13436,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 "no" = "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= diff --git a/sim/iq2000/ChangeLog b/sim/iq2000/ChangeLog index 85aedade908..d5acc6c6e3f 100644 --- a/sim/iq2000/ChangeLog +++ b/sim/iq2000/ChangeLog @@ -7,6 +7,10 @@ * configure: Regenerate. +2015-03-23 Mike Frysinger + + * configure: Regenerate. + 2015-03-16 Mike Frysinger * aclocal.m4, config.in, configure: Regenerate. diff --git a/sim/iq2000/configure b/sim/iq2000/configure index 97aeed15c71..cbf66747185 100755 --- a/sim/iq2000/configure +++ b/sim/iq2000/configure @@ -13461,18 +13461,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 "no" = "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= diff --git a/sim/lm32/ChangeLog b/sim/lm32/ChangeLog index 3ea4b853a87..653c10d34b3 100644 --- a/sim/lm32/ChangeLog +++ b/sim/lm32/ChangeLog @@ -1,3 +1,7 @@ +2015-03-23 Mike Frysinger + + * configure: Regenerate. + 2015-03-23 Mike Frysinger * configure: Regenerate. diff --git a/sim/lm32/configure b/sim/lm32/configure index fd4185fec44..6a520566e08 100755 --- a/sim/lm32/configure +++ b/sim/lm32/configure @@ -13414,18 +13414,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 "yes" = "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= diff --git a/sim/m32r/ChangeLog b/sim/m32r/ChangeLog index b2261b2cd1c..e5d013ed26d 100644 --- a/sim/m32r/ChangeLog +++ b/sim/m32r/ChangeLog @@ -2,6 +2,10 @@ * configure: Regenerate. +2015-03-23 Mike Frysinger + + * configure: Regenerate. + 2015-03-16 Mike Frysinger * aclocal.m4, config.in, configure: Regenerate. diff --git a/sim/m32r/configure b/sim/m32r/configure index 7dbcdf04cd0..dc22e7fcdb3 100755 --- a/sim/m32r/configure +++ b/sim/m32r/configure @@ -13476,18 +13476,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 "no" = "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= diff --git a/sim/m68hc11/ChangeLog b/sim/m68hc11/ChangeLog index 35f1e1831dc..67815b158f2 100644 --- a/sim/m68hc11/ChangeLog +++ b/sim/m68hc11/ChangeLog @@ -1,3 +1,7 @@ +2015-03-23 Mike Frysinger + + * configure: Regenerate. + 2015-03-23 Mike Frysinger * configure: Regenerate. diff --git a/sim/m68hc11/configure b/sim/m68hc11/configure index 7d559e62286..e056512979a 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= diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog index 60275b06377..6f3c938720f 100644 --- a/sim/mips/ChangeLog +++ b/sim/mips/ChangeLog @@ -1,3 +1,7 @@ +2015-03-23 Mike Frysinger + + * configure: Regenerate. + 2015-03-23 Mike Frysinger * configure: Regenerate. diff --git a/sim/mips/configure b/sim/mips/configure index 792d77ca99f..60c1cf811ed 100755 --- a/sim/mips/configure +++ b/sim/mips/configure @@ -14030,18 +14030,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= diff --git a/sim/mn10300/ChangeLog b/sim/mn10300/ChangeLog index 3750b8a330f..d188ddaa583 100644 --- a/sim/mn10300/ChangeLog +++ b/sim/mn10300/ChangeLog @@ -10,6 +10,10 @@ * configure: Regenerate. +2015-03-23 Mike Frysinger + + * configure: Regenerate. + 2015-03-23 Mike Frysinger * configure: Regenerate. diff --git a/sim/mn10300/configure b/sim/mn10300/configure index c9185d12735..5c0327a611c 100755 --- a/sim/mn10300/configure +++ b/sim/mn10300/configure @@ -13558,18 +13558,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 "yes" = "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= diff --git a/sim/sh64/ChangeLog b/sim/sh64/ChangeLog index 5ce0cfe9cbf..b96e54280ed 100644 --- a/sim/sh64/ChangeLog +++ b/sim/sh64/ChangeLog @@ -2,6 +2,10 @@ * configure: Regenerate. +2015-03-23 Mike Frysinger + + * configure: Regenerate. + 2015-03-23 Mike Frysinger * Makefile.in (CONFIG_DEVICES): Delete. diff --git a/sim/sh64/configure b/sim/sh64/configure index 1099306a39f..efd5484fd6a 100755 --- a/sim/sh64/configure +++ b/sim/sh64/configure @@ -13461,18 +13461,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 "no" = "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= -- 2.39.2