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 1517bd274290e06af498ef7e49.

Reported-by: Hans-Peter Nilsson <hans-peter.nilsson@axis.com>

diff --git a/sim/bfin/ChangeLog b/sim/bfin/ChangeLog
index 4d2619c200c2514d587ec45a2bc536fbaa7c3762..d0615a879cafcb486705a304e59f8c995309eb6d 100644 (file)
--- a/sim/bfin/ChangeLog
+++ b/sim/bfin/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-24  Mike Frysinger  <vapier@gentoo.org>
+
+       * configure: Regenerate.
+
 2015-03-23  Mike Frysinger  <vapier@gentoo.org>
 
        * configure: Regenerate.

diff --git a/sim/bfin/configure b/sim/bfin/configure
index f3e2a7a8533152d1f10a4e23f7e1a4f62ae9b99d..2aa95633bf436d59d1aef09e6ae15cf093bf564f 100755 (executable)
--- a/sim/bfin/configure
+++ b/sim/bfin/configure
@@ -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

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 1cfb4d32611ad6a9e58ccda7b77afb88e7242148..655d98ac22ddb3ee71f746a4d8021cbb4d12396c 100644 (file)
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -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.

diff --git a/sim/common/acinclude.m4 b/sim/common/acinclude.m4
index 3e9fb2fe40a2f35723763311fd9d14f2f822a94d..6522fea12190b207bbe7ff7043ba16d798530f62 100644 (file)
--- a/sim/common/acinclude.m4
+++ b/sim/common/acinclude.m4
@@ -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/,/ /'`";;

diff --git a/sim/cris/ChangeLog b/sim/cris/ChangeLog
index d5871222f0b01c8c989646673cd17dc1a7084dd1..4a8d1811eba12bde7d4e84d02ab77e4a95840c30 100644 (file)
--- a/sim/cris/ChangeLog
+++ b/sim/cris/ChangeLog
@@ -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.

diff --git a/sim/cris/configure b/sim/cris/configure
index 08bc6810d4f18e95ad63a6b8de9ba9c2643d7d1a..7b3795cdcd725857c85702bcd64a474d59874be0 100755 (executable)
--- a/sim/cris/configure
+++ b/sim/cris/configure
@@ -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

diff --git a/sim/frv/ChangeLog b/sim/frv/ChangeLog
index d7f23f19be026078cb597d0e2ca15285aacfb7de..2e4f8b69feafe9a74338c785a418ded33482dbf9 100644 (file)
--- a/sim/frv/ChangeLog
+++ b/sim/frv/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-24  Mike Frysinger  <vapier@gentoo.org>
+
+       * configure: Regenerate.
+
 2015-03-23  Mike Frysinger  <vapier@gentoo.org>
 
        * configure: Regenerate.

diff --git a/sim/frv/configure b/sim/frv/configure
index 06f015feb51d7d5c519398100ce6a9db0083ecd3..39a1567b5d5609cc150166e69a024279c28d4d9d 100755 (executable)
--- a/sim/frv/configure
+++ b/sim/frv/configure
@@ -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

diff --git a/sim/iq2000/ChangeLog b/sim/iq2000/ChangeLog
index d5acc6c6e3fe76237c57e02ff53f083b0b01ccb3..1f95a08d0452634ff36847b2b0d61a6e0a4f2a7b 100644 (file)
--- a/sim/iq2000/ChangeLog
+++ b/sim/iq2000/ChangeLog
@@ -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.

diff --git a/sim/iq2000/configure b/sim/iq2000/configure
index cbf6674718597471fe1df15c9ebc0155920542a1..49c0f3a75cab0e6163b49144d26cff26652f77fd 100755 (executable)
--- a/sim/iq2000/configure
+++ b/sim/iq2000/configure
@@ -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

diff --git a/sim/lm32/ChangeLog b/sim/lm32/ChangeLog
index 653c10d34b34f2d861b02909402f7b3b4b63149b..8d917b4dff9db1b7e1ab4da9a9d258bf45d55ebe 100644 (file)
--- a/sim/lm32/ChangeLog
+++ b/sim/lm32/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-24  Mike Frysinger  <vapier@gentoo.org>
+
+       * configure: Regenerate.
+
 2015-03-23  Mike Frysinger  <vapier@gentoo.org>
 
        * configure: Regenerate.

diff --git a/sim/lm32/configure b/sim/lm32/configure
index 6a520566e08db7976a914d177fe587ef5ff792d2..d1110fab1f503cb4fe9853571e0cfa8095ff8dd0 100755 (executable)
--- a/sim/lm32/configure
+++ b/sim/lm32/configure
@@ -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

diff --git a/sim/m32r/ChangeLog b/sim/m32r/ChangeLog
index e5d013ed26d18e12512f5aec7c4913590664114c..48f2e475aab3a418a42679d394fdd3ee23671db4 100644 (file)
--- a/sim/m32r/ChangeLog
+++ b/sim/m32r/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-24  Mike Frysinger  <vapier@gentoo.org>
+
+       * configure: Regenerate.
+
 2015-03-23  Mike Frysinger  <vapier@gentoo.org>
 
        * configure: Regenerate.

diff --git a/sim/m32r/configure b/sim/m32r/configure
index dc22e7fcdb3227250be061fd2df94f47095a9948..bd17e874f13d6b56267e79e56e8b9991a58d0433 100755 (executable)
--- a/sim/m32r/configure
+++ b/sim/m32r/configure
@@ -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

diff --git a/sim/m68hc11/ChangeLog b/sim/m68hc11/ChangeLog
index 67815b158f226ee89b39075a515ef368545840ff..fc18f38e452753c36acd3ccfe7b3f11e5750051a 100644 (file)
--- a/sim/m68hc11/ChangeLog
+++ b/sim/m68hc11/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-24  Mike Frysinger  <vapier@gentoo.org>
+
+       * configure: Regenerate.
+
 2015-03-23  Mike Frysinger  <vapier@gentoo.org>
 
        * configure: Regenerate.

diff --git a/sim/m68hc11/configure b/sim/m68hc11/configure
index e056512979a8e182194c34b4c0ab286008fd845a..1fccfb5d2e8bb13340b5c7d1bd3ae97bcae9b1ef 100755 (executable)
--- a/sim/m68hc11/configure
+++ b/sim/m68hc11/configure
@@ -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

diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog
index 6f3c938720fd75a5e2446603682f16cecbef0cb5..d5f8ec086e6dd8573753c4035f9b1c7270d4e1f9 100644 (file)
--- a/sim/mips/ChangeLog
+++ b/sim/mips/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-24  Mike Frysinger  <vapier@gentoo.org>
+
+       * configure: Regenerate.
+
 2015-03-23  Mike Frysinger  <vapier@gentoo.org>
 
        * configure: Regenerate.

diff --git a/sim/mips/configure b/sim/mips/configure
index 60c1cf811ed483c5fa4bac3d4bc5892c7a559d3f..03f34f272abc4693deedb05db5c3371062803582 100755 (executable)
--- a/sim/mips/configure
+++ b/sim/mips/configure
@@ -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

diff --git a/sim/mn10300/ChangeLog b/sim/mn10300/ChangeLog
index d188ddaa583f1ede9a0f09d6d639b13a152b9206..cf8a025f1dde215eb26f6cd3bf5974fa99ede01e 100644 (file)
--- a/sim/mn10300/ChangeLog
+++ b/sim/mn10300/ChangeLog
@@ -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.

diff --git a/sim/mn10300/configure b/sim/mn10300/configure
index 5c0327a611ca487ec8e52f8fe837af4a2594bf06..d539b06fdf70f86168f4546e94d234cb7ebfe519 100755 (executable)
--- a/sim/mn10300/configure
+++ b/sim/mn10300/configure
@@ -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

diff --git a/sim/sh64/ChangeLog b/sim/sh64/ChangeLog
index b96e54280ed3fb8b3d886f55f68dfbbdf4068d6c..8c3c872d1823f730b032769421a9130083a4c1df 100644 (file)
--- a/sim/sh64/ChangeLog
+++ b/sim/sh64/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-24  Mike Frysinger  <vapier@gentoo.org>
+
+       * configure: Regenerate.
+
 2015-03-23  Mike Frysinger  <vapier@gentoo.org>
 
        * configure: Regenerate.

diff --git a/sim/sh64/configure b/sim/sh64/configure
index efd5484fd6af607e3abb1d85b6c8323efc42acb0..68517552d6a6ea1897c7fbe946a228367ee29c88 100755 (executable)
--- a/sim/sh64/configure
+++ b/sim/sh64/configure
@@ -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