From 6dae8a88bf814b8729ad883c92c7b75fdccc7be1 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 29 Mar 2015 11:48:46 -0400 Subject: [PATCH] sim: testsuite: make subdir unconditional Since the testsuite subdir has to handle dynamic arch values already, there's no real value in requiring arches to opt in to it. Most have a testsuite now anyways, and we're requiring it in the future. --- sim/ChangeLog | 6 ++++++ sim/configure | 26 +------------------------- sim/configure.ac | 4 +--- sim/configure.tgt | 22 ---------------------- sim/testsuite/ChangeLog | 4 ++++ sim/testsuite/configure | 22 ---------------------- 6 files changed, 12 insertions(+), 72 deletions(-) diff --git a/sim/ChangeLog b/sim/ChangeLog index e3b0e66..0c54ccd 100644 --- a/sim/ChangeLog +++ b/sim/ChangeLog @@ -1,3 +1,9 @@ +2015-03-29 Mike Frysinger + + * configure: Regenerate. + * configure.ac: Delete sim_testsuite check and config in testsuite. + * configure.tgt (sim_testsuite): Delete everywhere. + 2015-03-28 Mike Frysinger * configure: Regenerate. diff --git a/sim/configure b/sim/configure index a40c7fd..bf0a094 100755 --- a/sim/configure +++ b/sim/configure @@ -3621,7 +3621,6 @@ if test "${enable_sim}" != no; then -sim_testsuite=no sim_common=yes sim_igen=no sim_arch= @@ -3634,7 +3633,6 @@ case "${target}" in subdirs="$subdirs arm" - sim_testsuite=yes ;; avr*-*-*) @@ -3642,7 +3640,6 @@ subdirs="$subdirs arm" subdirs="$subdirs avr" - sim_testsuite=yes ;; bfin-*-*) @@ -3650,7 +3647,6 @@ subdirs="$subdirs arm" subdirs="$subdirs bfin" - sim_testsuite=yes ;; cr16*-*-*) @@ -3658,7 +3654,6 @@ subdirs="$subdirs arm" subdirs="$subdirs cr16" - sim_testsuite=yes ;; cris-*-* | crisv32-*-*) @@ -3666,7 +3661,6 @@ subdirs="$subdirs arm" subdirs="$subdirs cris" - sim_testsuite=yes ;; d10v-*-*) @@ -3681,7 +3675,6 @@ subdirs="$subdirs arm" subdirs="$subdirs frv" - sim_testsuite=yes ;; h8300*-*-*) @@ -3689,7 +3682,6 @@ subdirs="$subdirs arm" subdirs="$subdirs h8300" - sim_testsuite=yes ;; iq2000-*-*) @@ -3697,7 +3689,6 @@ subdirs="$subdirs arm" subdirs="$subdirs iq2000" - sim_testsuite=yes ;; lm32-*-*) @@ -3705,7 +3696,6 @@ subdirs="$subdirs arm" subdirs="$subdirs lm32" - sim_testsuite=yes ;; m32c-*-*) @@ -3720,7 +3710,6 @@ subdirs="$subdirs arm" subdirs="$subdirs m32r" - sim_testsuite=yes ;; m68hc11-*-*|m6811-*-*) @@ -3728,7 +3717,6 @@ subdirs="$subdirs arm" subdirs="$subdirs m68hc11" - sim_testsuite=yes ;; mcore-*-*) @@ -3736,7 +3724,6 @@ subdirs="$subdirs arm" subdirs="$subdirs mcore" - sim_testsuite=yes ;; microblaze-*-*) @@ -3744,7 +3731,6 @@ subdirs="$subdirs arm" subdirs="$subdirs microblaze" - sim_testsuite=yes ;; mips*-*-*) @@ -3752,7 +3738,6 @@ subdirs="$subdirs arm" subdirs="$subdirs mips" - sim_testsuite=yes sim_igen=yes ;; mn10300*-*-*) @@ -3769,7 +3754,6 @@ subdirs="$subdirs arm" subdirs="$subdirs moxie" - sim_testsuite=yes ;; msp430*-*-*) @@ -3777,7 +3761,6 @@ subdirs="$subdirs arm" subdirs="$subdirs msp430" - sim_testsuite=yes ;; rl78-*-*) @@ -3799,7 +3782,6 @@ subdirs="$subdirs arm" subdirs="$subdirs sh64" - sim_testsuite=yes ;; sh*-*-*) @@ -3807,7 +3789,6 @@ subdirs="$subdirs arm" subdirs="$subdirs sh" - sim_testsuite=yes ;; sparc-*-rtems*|sparc-*-elf*) @@ -3815,7 +3796,6 @@ subdirs="$subdirs arm" subdirs="$subdirs erc32" - sim_testsuite=yes ;; powerpc*-*-*) @@ -3830,7 +3810,6 @@ subdirs="$subdirs arm" subdirs="$subdirs ft32" - sim_testsuite=yes ;; v850*-*-*) @@ -3839,7 +3818,6 @@ subdirs="$subdirs arm" sim_igen=yes - sim_testsuite=yes ;; *) # No simulator subdir, so the subdir "common" isn't needed. @@ -3848,10 +3826,8 @@ subdirs="$subdirs arm" esac - if test "$sim_testsuite" = yes; then - subdirs="$subdirs testsuite" + subdirs="$subdirs testsuite" - fi if test "$sim_common" = yes; then subdirs="$subdirs common" diff --git a/sim/configure.ac b/sim/configure.ac index 8c1d914..f1734e3 100644 --- a/sim/configure.ac +++ b/sim/configure.ac @@ -42,9 +42,7 @@ m4_define([SIM_ARCH], [ ]) if test "${enable_sim}" != no; then sinclude(configure.tgt) - if test "$sim_testsuite" = yes; then - AC_CONFIG_SUBDIRS(testsuite) - fi + AC_CONFIG_SUBDIRS(testsuite) if test "$sim_common" = yes; then AC_CONFIG_SUBDIRS(common) fi diff --git a/sim/configure.tgt b/sim/configure.tgt index ce46d3f..5f3bb03 100644 --- a/sim/configure.tgt +++ b/sim/configure.tgt @@ -11,72 +11,57 @@ dnl the shell level, so use sinclude(...) to pull it in. dnl glue to avoid code duplication at top level m4_ifndef([SIM_ARCH], [AC_DEFUN([SIM_ARCH],[sim_arch=$1])]) -sim_testsuite=no sim_common=yes sim_igen=no sim_arch= case "${target}" in arm*-*-*) SIM_ARCH(arm) - sim_testsuite=yes ;; avr*-*-*) SIM_ARCH(avr) - sim_testsuite=yes ;; bfin-*-*) SIM_ARCH(bfin) - sim_testsuite=yes ;; cr16*-*-*) SIM_ARCH(cr16) - sim_testsuite=yes ;; cris-*-* | crisv32-*-*) SIM_ARCH(cris) - sim_testsuite=yes ;; d10v-*-*) SIM_ARCH(d10v) ;; frv-*-*) SIM_ARCH(frv) - sim_testsuite=yes ;; h8300*-*-*) SIM_ARCH(h8300) - sim_testsuite=yes ;; iq2000-*-*) SIM_ARCH(iq2000) - sim_testsuite=yes ;; lm32-*-*) SIM_ARCH(lm32) - sim_testsuite=yes ;; m32c-*-*) SIM_ARCH(m32c) ;; m32r-*-*) SIM_ARCH(m32r) - sim_testsuite=yes ;; m68hc11-*-*|m6811-*-*) SIM_ARCH(m68hc11) - sim_testsuite=yes ;; mcore-*-*) SIM_ARCH(mcore) - sim_testsuite=yes ;; microblaze-*-*) SIM_ARCH(microblaze) - sim_testsuite=yes ;; mips*-*-*) SIM_ARCH(mips) - sim_testsuite=yes sim_igen=yes ;; mn10300*-*-*) @@ -85,11 +70,9 @@ case "${target}" in ;; moxie-*-*) SIM_ARCH(moxie) - sim_testsuite=yes ;; msp430*-*-*) SIM_ARCH(msp430) - sim_testsuite=yes ;; rl78-*-*) SIM_ARCH(rl78) @@ -99,27 +82,22 @@ case "${target}" in ;; sh64*-*-*) SIM_ARCH(sh64) - sim_testsuite=yes ;; sh*-*-*) SIM_ARCH(sh) - sim_testsuite=yes ;; sparc-*-rtems*|sparc-*-elf*) SIM_ARCH(erc32) - sim_testsuite=yes ;; powerpc*-*-*) SIM_ARCH(ppc) ;; ft32-*-*) SIM_ARCH(ft32) - sim_testsuite=yes ;; v850*-*-*) SIM_ARCH(v850) sim_igen=yes - sim_testsuite=yes ;; *) # No simulator subdir, so the subdir "common" isn't needed. diff --git a/sim/testsuite/ChangeLog b/sim/testsuite/ChangeLog index 6b04339..6de8bdc 100644 --- a/sim/testsuite/ChangeLog +++ b/sim/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2015-03-29 Mike Frysinger + + * configure: Regenerate. + 2015-03-28 Mike Frysinger * configure: Regenerate. diff --git a/sim/testsuite/configure b/sim/testsuite/configure index 7b91f41..fdba43d 100755 --- a/sim/testsuite/configure +++ b/sim/testsuite/configure @@ -1818,72 +1818,57 @@ esac -sim_testsuite=no sim_common=yes sim_igen=no sim_arch= case "${target}" in arm*-*-*) sim_arch=arm - sim_testsuite=yes ;; avr*-*-*) sim_arch=avr - sim_testsuite=yes ;; bfin-*-*) sim_arch=bfin - sim_testsuite=yes ;; cr16*-*-*) sim_arch=cr16 - sim_testsuite=yes ;; cris-*-* | crisv32-*-*) sim_arch=cris - sim_testsuite=yes ;; d10v-*-*) sim_arch=d10v ;; frv-*-*) sim_arch=frv - sim_testsuite=yes ;; h8300*-*-*) sim_arch=h8300 - sim_testsuite=yes ;; iq2000-*-*) sim_arch=iq2000 - sim_testsuite=yes ;; lm32-*-*) sim_arch=lm32 - sim_testsuite=yes ;; m32c-*-*) sim_arch=m32c ;; m32r-*-*) sim_arch=m32r - sim_testsuite=yes ;; m68hc11-*-*|m6811-*-*) sim_arch=m68hc11 - sim_testsuite=yes ;; mcore-*-*) sim_arch=mcore - sim_testsuite=yes ;; microblaze-*-*) sim_arch=microblaze - sim_testsuite=yes ;; mips*-*-*) sim_arch=mips - sim_testsuite=yes sim_igen=yes ;; mn10300*-*-*) @@ -1892,11 +1877,9 @@ case "${target}" in ;; moxie-*-*) sim_arch=moxie - sim_testsuite=yes ;; msp430*-*-*) sim_arch=msp430 - sim_testsuite=yes ;; rl78-*-*) sim_arch=rl78 @@ -1906,27 +1889,22 @@ case "${target}" in ;; sh64*-*-*) sim_arch=sh64 - sim_testsuite=yes ;; sh*-*-*) sim_arch=sh - sim_testsuite=yes ;; sparc-*-rtems*|sparc-*-elf*) sim_arch=erc32 - sim_testsuite=yes ;; powerpc*-*-*) sim_arch=ppc ;; ft32-*-*) sim_arch=ft32 - sim_testsuite=yes ;; v850*-*-*) sim_arch=v850 sim_igen=yes - sim_testsuite=yes ;; *) # No simulator subdir, so the subdir "common" isn't needed. -- 2.7.4