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/mips | |
| parent | 7722e5b8022b5177a1788a48c6c1c6d7b11315ef (diff) | |
| download | fsf-binutils-gdb-64dd13dfc267b1d13f42519f220e89a4386591fd.zip fsf-binutils-gdb-64dd13dfc267b1d13f42519f220e89a4386591fd.tar.gz fsf-binutils-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/mips')
| -rw-r--r-- | sim/mips/ChangeLog | 4 | ||||
| -rwxr-xr-x | sim/mips/configure | 15 |
2 files changed, 9 insertions, 10 deletions
diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog index 60275b0..6f3c938 100644 --- a/sim/mips/ChangeLog +++ b/sim/mips/ChangeLog @@ -1,6 +1,10 @@ 2015-03-23 Mike Frysinger <vapier@gentoo.org> * configure: Regenerate. + +2015-03-23 Mike Frysinger <vapier@gentoo.org> + + * configure: Regenerate. * configure.ac (mips_extra_objs): Delete. * Makefile.in (MIPS_EXTRA_OBJS): Delete. (SIM_OBJS): Delete MIPS_EXTRA_OBJS. diff --git a/sim/mips/configure b/sim/mips/configure index 792d77c..60c1cf8 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= |