diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2015-03-23 22:45:13 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-03-23 23:20:09 -0400 |
| commit | 64dd13dfc267b1d13f42519f220e89a4386591fd (patch) | |
| tree | bbc91496984398e99697c783c78af0ef18339da5 /sim/common/acinclude.m4 | |
| parent | 7722e5b8022b5177a1788a48c6c1c6d7b11315ef (diff) | |
| download | gdb-64dd13dfc267b1d13f42519f220e89a4386591fd.zip gdb-64dd13dfc267b1d13f42519f220e89a4386591fd.tar.gz gdb-64dd13dfc267b1d13f42519f220e89a4386591fd.tar.bz2 | |
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.
Diffstat (limited to 'sim/common/acinclude.m4')
| -rw-r--r-- | sim/common/acinclude.m4 | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/sim/common/acinclude.m4 b/sim/common/acinclude.m4 index e4d206fe..3e9fb2f 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= |