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

sim: fix sim-hardware configure option 

The current default handling for the --enable-sim-hardware option ends up
forcing the value to whatever is set as the first argument when calling
the macro (by virtue of how autoconf works).  Relocate the setup code to
the 4th parameter of the AC_ARG_ENABLE macro to fix it.

This was caused by the simplification work in 1517bd2742.

Reported-by: Hans-Peter Nilsson <hans-peter.nilsson@axis.com>
This commit is contained in:
Mike Frysinger 2015-03-23 22:19:41 -04:00
parent 64dd13dfc2
commit 30452bbe7e
22 changed files with 67 additions and 67 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-24 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.
2015-03-23 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.

8
sim/bfin/configure vendored
View File

@ -13511,12 +13511,6 @@ $as_echo "${WARN_CFLAGS} ${WERROR_CFLAGS}" >&6; }
fi
if test x"yes" != x"no"; then
enable_sim_hardware=yes
else
enable_sim_hardware=no
fi
if test ""; then
hardware=""
else
@ -13563,6 +13557,8 @@ sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\
# Check whether --enable-sim-hardware was given.
if test "${enable_sim_hardware+set}" = set; then :
enableval=$enable_sim_hardware;
else
enable_sim_hardware="yes"
fi
case ${enable_sim_hardware} in

5
sim/common/ChangeLog
View File

@ -1,3 +1,8 @@
2015-03-24 Mike Frysinger <vapier@gentoo.org>
* acinclude.m4 (SIM_AC_OPTION_HARDWARE): Move default option setting
of enable_sim_hardware to AC_ARG_ENABLE.
2015-03-23 Mike Frysinger <vapier@gentoo.org>
* acinclude.m4 (SIM_AC_OPTION_HARDWARE): Delete SIM_DV_SOCKSER_O.

9
sim/common/acinclude.m4
View File

@ -590,12 +590,6 @@ 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],
[
if test x"[$1]" != x"no"; then
enable_sim_hardware=yes
else
enable_sim_hardware=no
fi
if test "[$2]"; then
hardware="[$2]"
else
@ -609,7 +603,8 @@ sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([[^ ]][[^ ]]*\)/
AC_ARG_ENABLE(sim-hardware,
[AS_HELP_STRING([--enable-sim-hardware=LIST],
[Specify the hardware to be included in the build.])])
[Specify the hardware to be included in the build.])],
,[enable_sim_hardware="[$1]"])
case ${enable_sim_hardware} in
yes|no) ;;
,*) hardware="${hardware} `echo ${enableval} | sed -e 's/,/ /'`";;

4
sim/cris/ChangeLog
View File

@ -1,3 +1,7 @@
2015-03-24 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.
2015-03-23 Mike Frysinger <vapier@gentoo.org>
* Makefile.in (CONFIG_DEVICES): Delete.

8
sim/cris/configure vendored
View File

@ -13411,12 +13411,6 @@ $as_echo "${WARN_CFLAGS} ${WERROR_CFLAGS}" >&6; }
fi
if test x"no" != x"no"; then
enable_sim_hardware=yes
else
enable_sim_hardware=no
fi
if test ""; then
hardware=""
else
@ -13431,6 +13425,8 @@ sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\
# Check whether --enable-sim-hardware was given.
if test "${enable_sim_hardware+set}" = set; then :
enableval=$enable_sim_hardware;
else
enable_sim_hardware="no"
fi
case ${enable_sim_hardware} in

4
sim/frv/ChangeLog
View File

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

8
sim/frv/configure vendored
View File

@ -13413,12 +13413,6 @@ fi
if test x"no" != x"no"; then
enable_sim_hardware=yes
else
enable_sim_hardware=no
fi
if test """"; then
hardware=""""
else
@ -13433,6 +13427,8 @@ sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\
# Check whether --enable-sim-hardware was given.
if test "${enable_sim_hardware+set}" = set; then :
enableval=$enable_sim_hardware;
else
enable_sim_hardware="no"
fi
case ${enable_sim_hardware} in

4
sim/iq2000/ChangeLog
View File

@ -1,3 +1,7 @@
2015-03-24 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.
2015-03-23 Mike Frysinger <vapier@gentoo.org>
* Makefile.in (CONFIG_DEVICES): Delete.

8
sim/iq2000/configure vendored
View File

@ -13438,12 +13438,6 @@ fi
if test x"no" != x"no"; then
enable_sim_hardware=yes
else
enable_sim_hardware=no
fi
if test """"; then
hardware=""""
else
@ -13458,6 +13452,8 @@ sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\
# Check whether --enable-sim-hardware was given.
if test "${enable_sim_hardware+set}" = set; then :
enableval=$enable_sim_hardware;
else
enable_sim_hardware="no"
fi
case ${enable_sim_hardware} in

4
sim/lm32/ChangeLog
View File

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

8
sim/lm32/configure vendored
View File

@ -13391,12 +13391,6 @@ fi
if test x"yes" != x"no"; then
enable_sim_hardware=yes
else
enable_sim_hardware=no
fi
if test ""; then
hardware=""
else
@ -13411,6 +13405,8 @@ sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\
# Check whether --enable-sim-hardware was given.
if test "${enable_sim_hardware+set}" = set; then :
enableval=$enable_sim_hardware;
else
enable_sim_hardware="yes"
fi
case ${enable_sim_hardware} in

4
sim/m32r/ChangeLog
View File

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

8
sim/m32r/configure vendored
View File

@ -13453,12 +13453,6 @@ fi
if test x"no" != x"no"; then
enable_sim_hardware=yes
else
enable_sim_hardware=no
fi
if test """"; then
hardware=""""
else
@ -13473,6 +13467,8 @@ sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\
# Check whether --enable-sim-hardware was given.
if test "${enable_sim_hardware+set}" = set; then :
enableval=$enable_sim_hardware;
else
enable_sim_hardware="no"
fi
case ${enable_sim_hardware} in

4
sim/m68hc11/ChangeLog
View File

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

8
sim/m68hc11/configure vendored
View File

@ -13421,12 +13421,6 @@ case "${target}" in
;;
esac
if test x"$hw_enabled" != x"no"; then
enable_sim_hardware=yes
else
enable_sim_hardware=no
fi
if test "$hw_devices"; then
hardware="$hw_devices"
else
@ -13441,6 +13435,8 @@ sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\
# Check whether --enable-sim-hardware was given.
if test "${enable_sim_hardware+set}" = set; then :
enableval=$enable_sim_hardware;
else
enable_sim_hardware="$hw_enabled"
fi
case ${enable_sim_hardware} in

4
sim/mips/ChangeLog
View File

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

8
sim/mips/configure vendored
View File

@ -14007,12 +14007,6 @@ case "${target}" in
;;
esac
if test x"$hw_enabled" != x"no"; then
enable_sim_hardware=yes
else
enable_sim_hardware=no
fi
if test "$hw_devices"; then
hardware="$hw_devices"
else
@ -14027,6 +14021,8 @@ sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\
# Check whether --enable-sim-hardware was given.
if test "${enable_sim_hardware+set}" = set; then :
enableval=$enable_sim_hardware;
else
enable_sim_hardware="$hw_enabled"
fi
case ${enable_sim_hardware} in

4
sim/mn10300/ChangeLog
View File

@ -1,3 +1,7 @@
2015-03-24 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.
2015-03-23 Mike Frysinger <vapier@gentoo.org>
* Makefile.in (MN10300_OBJS): Delete dv-sockser.o.

8
sim/mn10300/configure vendored
View File

@ -13535,12 +13535,6 @@ fi
fi
if test x"yes" != x"no"; then
enable_sim_hardware=yes
else
enable_sim_hardware=no
fi
if test ""; then
hardware=""
else
@ -13555,6 +13549,8 @@ sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\
# Check whether --enable-sim-hardware was given.
if test "${enable_sim_hardware+set}" = set; then :
enableval=$enable_sim_hardware;
else
enable_sim_hardware="yes"
fi
case ${enable_sim_hardware} in

4
sim/sh64/ChangeLog
View File

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

8
sim/sh64/configure vendored
View File

@ -13438,12 +13438,6 @@ fi
if test x"no" != x"no"; then
enable_sim_hardware=yes
else
enable_sim_hardware=no
fi
if test """"; then
hardware=""""
else
@ -13458,6 +13452,8 @@ sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\
# Check whether --enable-sim-hardware was given.
if test "${enable_sim_hardware+set}" = set; then :
enableval=$enable_sim_hardware;
else
enable_sim_hardware="no"
fi
case ${enable_sim_hardware} in