From 97f478c5a490b391f02df4e81b6bc7f99676c74c Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 14 Mar 2015 16:09:12 -0400 Subject: [PATCH] sim: Revert "Fix frv/iq2000/m32r/sh64 sim, default hardware to off." This partially reverts commits: 105dd264de9a2fa7eee45eff897aa1d6171c1c4b 3df3af7c3f9095f9dc951fe680ce76f6e497914b c4892a6b37647a0b33a2113b59762f678aabe4b2 9e3042ec073e05a0a5aa56398fd2662c5dcd5002 Now that dv-sockser is handled entirely by the common build logic, the failure these targets were hitting isn't really possible anymore. Lets reset their hardware status back to defaulting to on. Some of these were set to "always" previously, but we don't support that anymore. --- sim/frv/ChangeLog | 4 ++++ sim/frv/configure | 2 +- sim/frv/configure.ac | 2 +- sim/iq2000/ChangeLog | 4 ++++ sim/iq2000/configure | 2 +- sim/iq2000/configure.ac | 2 +- sim/m32r/ChangeLog | 4 ++++ sim/m32r/configure | 2 +- sim/m32r/configure.ac | 2 +- sim/sh64/ChangeLog | 4 ++++ sim/sh64/configure | 3 +-- sim/sh64/configure.ac | 3 +-- 12 files changed, 24 insertions(+), 10 deletions(-) diff --git a/sim/frv/ChangeLog b/sim/frv/ChangeLog index 2e4f8b69fe..3a745e3b31 100644 --- a/sim/frv/ChangeLog +++ b/sim/frv/ChangeLog @@ -2,6 +2,10 @@ * configure: Regenerate. +2015-03-24 Mike Frysinger + + * configure: Regenerate. + 2015-03-23 Mike Frysinger * configure: Regenerate. diff --git a/sim/frv/configure b/sim/frv/configure index 39a1567b5d..35e307d011 100755 --- a/sim/frv/configure +++ b/sim/frv/configure @@ -13428,7 +13428,7 @@ sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\ if test "${enable_sim_hardware+set}" = set; then : enableval=$enable_sim_hardware; else - enable_sim_hardware="no" + enable_sim_hardware="yes" fi case ${enable_sim_hardware} in diff --git a/sim/frv/configure.ac b/sim/frv/configure.ac index 05faf03763..c56fbe7e23 100644 --- a/sim/frv/configure.ac +++ b/sim/frv/configure.ac @@ -28,6 +28,6 @@ if test x"$silent" != x"yes" && test x"$sim_trapdump" != x""; then fi],[sim_trapdump=""])dnl AC_SUBST(sim_trapdump) -SIM_AC_OPTION_HARDWARE(no,"","") +SIM_AC_OPTION_HARDWARE(yes,"","") SIM_AC_OUTPUT diff --git a/sim/iq2000/ChangeLog b/sim/iq2000/ChangeLog index 1f95a08d04..b2b91ff0ea 100644 --- a/sim/iq2000/ChangeLog +++ b/sim/iq2000/ChangeLog @@ -2,6 +2,10 @@ * configure: Regenerate. +2015-03-24 Mike Frysinger + + * configure: Regenerate. + 2015-03-23 Mike Frysinger * Makefile.in (CONFIG_DEVICES): Delete. diff --git a/sim/iq2000/configure b/sim/iq2000/configure index 49c0f3a75c..37b6bac1cb 100755 --- a/sim/iq2000/configure +++ b/sim/iq2000/configure @@ -13453,7 +13453,7 @@ sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\ if test "${enable_sim_hardware+set}" = set; then : enableval=$enable_sim_hardware; else - enable_sim_hardware="no" + enable_sim_hardware="yes" fi case ${enable_sim_hardware} in diff --git a/sim/iq2000/configure.ac b/sim/iq2000/configure.ac index dd26a1804a..78dcbb6c7e 100644 --- a/sim/iq2000/configure.ac +++ b/sim/iq2000/configure.ac @@ -14,6 +14,6 @@ SIM_AC_OPTION_ENVIRONMENT SIM_AC_OPTION_INLINE() SIM_AC_OPTION_CGEN_MAINT -SIM_AC_OPTION_HARDWARE(no,"","") +SIM_AC_OPTION_HARDWARE(yes,"","") SIM_AC_OUTPUT diff --git a/sim/m32r/ChangeLog b/sim/m32r/ChangeLog index 48f2e475aa..530e768945 100644 --- a/sim/m32r/ChangeLog +++ b/sim/m32r/ChangeLog @@ -2,6 +2,10 @@ * configure: Regenerate. +2015-03-24 Mike Frysinger + + * configure: Regenerate. + 2015-03-23 Mike Frysinger * configure: Regenerate. diff --git a/sim/m32r/configure b/sim/m32r/configure index bd17e874f1..cfce044f99 100755 --- a/sim/m32r/configure +++ b/sim/m32r/configure @@ -13468,7 +13468,7 @@ sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\ if test "${enable_sim_hardware+set}" = set; then : enableval=$enable_sim_hardware; else - enable_sim_hardware="no" + enable_sim_hardware="yes" fi case ${enable_sim_hardware} in diff --git a/sim/m32r/configure.ac b/sim/m32r/configure.ac index d5c728ec06..56a7caa2c8 100644 --- a/sim/m32r/configure.ac +++ b/sim/m32r/configure.ac @@ -27,6 +27,6 @@ SIM_AC_OPTION_CGEN_MAINT AC_SUBST(traps_obj) AC_SUBST(sim_extra_cflags) -SIM_AC_OPTION_HARDWARE(no,"","") +SIM_AC_OPTION_HARDWARE(yes,"","") SIM_AC_OUTPUT diff --git a/sim/sh64/ChangeLog b/sim/sh64/ChangeLog index 8c3c872d18..8692f0fd5f 100644 --- a/sim/sh64/ChangeLog +++ b/sim/sh64/ChangeLog @@ -2,6 +2,10 @@ * configure: Regenerate. +2015-03-24 Mike Frysinger + + * configure: Regenerate. + 2015-03-23 Mike Frysinger * configure: Regenerate. diff --git a/sim/sh64/configure b/sim/sh64/configure index 68517552d6..87e270e293 100755 --- a/sim/sh64/configure +++ b/sim/sh64/configure @@ -13453,7 +13453,7 @@ sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\ if test "${enable_sim_hardware+set}" = set; then : enableval=$enable_sim_hardware; else - enable_sim_hardware="no" + enable_sim_hardware="yes" fi case ${enable_sim_hardware} in @@ -15810,4 +15810,3 @@ $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi - diff --git a/sim/sh64/configure.ac b/sim/sh64/configure.ac index b0a875de13..c979458acf 100644 --- a/sim/sh64/configure.ac +++ b/sim/sh64/configure.ac @@ -14,7 +14,6 @@ SIM_AC_OPTION_ENVIRONMENT SIM_AC_OPTION_INLINE() SIM_AC_OPTION_CGEN_MAINT -SIM_AC_OPTION_HARDWARE(no,"","") +SIM_AC_OPTION_HARDWARE(yes,"","") SIM_AC_OUTPUT - -- 2.34.1