OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sim: drop support for requiring hw support

Browse Source 
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.
This commit is contained in:
Mike Frysinger 2015-03-23 22:45:13 -04:00
parent 7722e5b802
commit 64dd13dfc2
21 changed files with 96 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sim/bfin/ChangeLog
View File

@ -1,3 +1,7 @@
2015-03-23 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.
2015-03-23 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.

15
sim/bfin/configure vendored
View File

@ -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=

17
sim/common/acinclude.m4
View File

@ -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=

4
sim/cris/ChangeLog
View File

@ -7,6 +7,10 @@
* configure: Regenerate.
2015-03-23 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.
2015-03-16 Mike Frysinger <vapier@gentoo.org>
* aclocal.m4, config.in, configure: Regenerate.

15
sim/cris/configure vendored
View File

@ -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=

4
sim/frv/ChangeLog
View File

@ -1,3 +1,7 @@
2015-03-23 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.
2015-03-23 Mike Frysinger <vapier@gentoo.org>
* devices.c: Delete dv-sockser.h include.

15
sim/frv/configure vendored
View File

@ -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=

4
sim/iq2000/ChangeLog
View File

@ -7,6 +7,10 @@
* configure: Regenerate.
2015-03-23 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.
2015-03-16 Mike Frysinger <vapier@gentoo.org>
* aclocal.m4, config.in, configure: Regenerate.

15
sim/iq2000/configure vendored
View File

@ -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=

4
sim/lm32/ChangeLog
View File

@ -1,3 +1,7 @@
2015-03-23 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.
2015-03-23 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.

15
sim/lm32/configure vendored
View File

@ -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=

4
sim/m32r/ChangeLog
View File

@ -2,6 +2,10 @@
* configure: Regenerate.
2015-03-23 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.
2015-03-16 Mike Frysinger <vapier@gentoo.org>
* aclocal.m4, config.in, configure: Regenerate.

15
sim/m32r/configure vendored
View File

@ -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=

4
sim/m68hc11/ChangeLog
View File

@ -1,3 +1,7 @@
2015-03-23 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.
2015-03-23 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.

15
sim/m68hc11/configure vendored
View File

@ -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=

4
sim/mips/ChangeLog
View File

@ -1,3 +1,7 @@
2015-03-23 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.
2015-03-23 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.

15
sim/mips/configure vendored
View File

@ -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=

4
sim/mn10300/ChangeLog
View File

@ -10,6 +10,10 @@
* configure: Regenerate.
2015-03-23 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.
2015-03-23 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.

15
sim/mn10300/configure vendored
View File

@ -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=

4
sim/sh64/ChangeLog
View File

@ -2,6 +2,10 @@
* configure: Regenerate.
2015-03-23 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.
2015-03-23 Mike Frysinger <vapier@gentoo.org>
* Makefile.in (CONFIG_DEVICES): Delete.

15
sim/sh64/configure vendored
View File

@ -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=