diff options
| -rw-r--r-- | sim/testsuite/ChangeLog | 3 | ||||
| -rwxr-xr-x | sim/testsuite/configure | 30 | ||||
| -rw-r--r-- | sim/testsuite/configure.in | 26 |
3 files changed, 28 insertions, 31 deletions
diff --git a/sim/testsuite/ChangeLog b/sim/testsuite/ChangeLog index 22c07e3..1b4b673 100644 --- a/sim/testsuite/ChangeLog +++ b/sim/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2005-01-07 Andrew Cagney <cagney@gnu.org> + * configure.in: Pass literal subdirectories to AC_CONFIG_SUBDIRS. + * configure: Re-generate. + * fr30-elf, d30v-elf: Delete directory. 2004-11-16 Hans-Peter Nilsson <hp@axis.com> diff --git a/sim/testsuite/configure b/sim/testsuite/configure index 1b95177..1949bca 100755 --- a/sim/testsuite/configure +++ b/sim/testsuite/configure @@ -644,18 +644,20 @@ test "$host_alias" != "$target_alias" && program_prefix=${target_alias}- -# Directories to use in all configurations. -configdirs="" +# Configure sub-directory for appropriate targets +case ${target} in + frv-*-elf ) + subdirs="frv-elf" -# add test sub-directory for appropriate targets -testdir=`echo ${target} | sed -e 's/-.*-/-/'` -if test -r ${srcdir}/${testdir}/configure ; then - configdirs="${configdirs} $testdir" -fi + ;; + m32r-*-elf ) + subdirs="frv-elf m32r-elf" -# add any extra subdirectories -case $target in - *) ;; + ;; + mips64el-*-elf ) + subdirs="frv-elf m32r-elf mips64el-elf" + + ;; esac # Compute the target architecture. @@ -666,10 +668,6 @@ case $target in esac -# configure the subdirectories too -subdirs="$configdirs" - - trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure @@ -830,8 +828,8 @@ s%@build_alias@%$build_alias%g s%@build_cpu@%$build_cpu%g s%@build_vendor@%$build_vendor%g s%@build_os@%$build_os%g -s%@arch@%$arch%g s%@subdirs@%$subdirs%g +s%@arch@%$arch%g CEOF EOF @@ -964,7 +962,7 @@ if test "$no_recursion" != yes; then esac done - for ac_config_dir in $configdirs; do + for ac_config_dir in frv-elf m32r-elf mips64el-elf; do # Do not complain, so a configure script can configure whichever # parts of a large source tree are present. diff --git a/sim/testsuite/configure.in b/sim/testsuite/configure.in index 0bebb7a..064f61e 100644 --- a/sim/testsuite/configure.in +++ b/sim/testsuite/configure.in @@ -12,18 +12,17 @@ AC_SUBST(CC) AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/../..) AC_CANONICAL_SYSTEM -# Directories to use in all configurations. -configdirs="" - -# add test sub-directory for appropriate targets -testdir=`echo ${target} | sed -e 's/-.*-/-/'` -if test -r ${srcdir}/${testdir}/configure ; then - configdirs="${configdirs} $testdir" -fi - -# add any extra subdirectories -case $target in - *) ;; +# Configure sub-directory for appropriate targets +case ${target} in + frv-*-elf ) + AC_CONFIG_SUBDIRS(frv-elf) + ;; + m32r-*-elf ) + AC_CONFIG_SUBDIRS(m32r-elf) + ;; + mips64el-*-elf ) + AC_CONFIG_SUBDIRS(mips64el-elf) + ;; esac # Compute the target architecture. @@ -34,7 +33,4 @@ case $target in esac AC_SUBST(arch) -# configure the subdirectories too -AC_CONFIG_SUBDIRS($configdirs) - AC_OUTPUT(Makefile) |