From 043f5c63f06e9a376f189df54507666f3d30ed77 Mon Sep 17 00:00:00 2001 From: Andrew Burgess Date: Mon, 5 Oct 2020 09:53:50 +0100 Subject: [PATCH] sim: Fix autoreconf errors in sim/ directory Run autoreconf in sim/ directory and you'll see some errors. The problem is that autoreconf (a perl script) does not evaluate the value passed as an argument to AC_CONFIG_AUX_DIR, so something like: AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/../..) does not do the right thing inside autoreconf, my understanding is that changing to something like this is fine: AC_CONFIG_AUX_DIR(../..) the generated configure seems to check the value passed, and the value passed relative to the source directory, so I think we get basically the same behaviour as before. sim/testsuite/ChangeLog: * configure: Regnerate. * configure.ac (AC_CONFIG_AUX_DIR): Update. sim/testsuite/d10v-elf/ChangeLog: * configure: Regnerate. * configure.ac (AC_CONFIG_AUX_DIR): Update. sim/testsuite/frv-elf/ChangeLog: * configure: Regnerate. * configure.ac (AC_CONFIG_AUX_DIR): Update. sim/testsuite/m32r-elf/ChangeLog: * configure: Regnerate. * configure.ac (AC_CONFIG_AUX_DIR): Update. sim/testsuite/mips64el-elf/ChangeLog: * configure: Regnerate. * configure.ac (AC_CONFIG_AUX_DIR): Update. --- sim/testsuite/ChangeLog | 5 +++++ sim/testsuite/configure | 4 ++-- sim/testsuite/configure.ac | 2 +- sim/testsuite/d10v-elf/ChangeLog | 5 +++++ sim/testsuite/d10v-elf/configure | 4 ++-- sim/testsuite/d10v-elf/configure.ac | 2 +- sim/testsuite/frv-elf/ChangeLog | 5 +++++ sim/testsuite/frv-elf/configure | 4 ++-- sim/testsuite/frv-elf/configure.ac | 2 +- sim/testsuite/m32r-elf/ChangeLog | 5 +++++ sim/testsuite/m32r-elf/configure | 4 ++-- sim/testsuite/m32r-elf/configure.ac | 2 +- sim/testsuite/mips64el-elf/ChangeLog | 5 +++++ sim/testsuite/mips64el-elf/configure | 4 ++-- sim/testsuite/mips64el-elf/configure.ac | 2 +- 15 files changed, 40 insertions(+), 15 deletions(-) diff --git a/sim/testsuite/ChangeLog b/sim/testsuite/ChangeLog index 14055f82cdc..e8dedaf533f 100644 --- a/sim/testsuite/ChangeLog +++ b/sim/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2020-10-06 Andrew Burgess + + * configure: Regnerate. + * configure.ac (AC_CONFIG_AUX_DIR): Update. + 2020-09-08 David Faust * sim/bpf/alu.s: Correct div and mod tests. diff --git a/sim/testsuite/configure b/sim/testsuite/configure index c3674c2fa07..6f0464dc14a 100755 --- a/sim/testsuite/configure +++ b/sim/testsuite/configure @@ -1688,7 +1688,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu CC=${CC-cc} ac_aux_dir= -for ac_dir in `cd $srcdir;pwd`/../.. "$srcdir"/`cd $srcdir;pwd`/../..; do +for ac_dir in ../.. "$srcdir"/../..; do if test -f "$ac_dir/install-sh"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install-sh -c" @@ -1704,7 +1704,7 @@ for ac_dir in `cd $srcdir;pwd`/../.. "$srcdir"/`cd $srcdir;pwd`/../..; do fi done if test -z "$ac_aux_dir"; then - as_fn_error $? "cannot find install-sh, install.sh, or shtool in \`cd $srcdir;pwd\`/../.. \"$srcdir\"/\`cd $srcdir;pwd\`/../.." "$LINENO" 5 + as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../.. \"$srcdir\"/../.." "$LINENO" 5 fi # These three variables are undocumented and unsupported, diff --git a/sim/testsuite/configure.ac b/sim/testsuite/configure.ac index 5d753879ad0..faaf38dc887 100644 --- a/sim/testsuite/configure.ac +++ b/sim/testsuite/configure.ac @@ -8,7 +8,7 @@ AC_INIT(common/bits-tst.c) CC=${CC-cc} AC_SUBST(CC) -AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/../..) +AC_CONFIG_AUX_DIR(../..) AC_CANONICAL_SYSTEM # Configure sub-directory for appropriate targets diff --git a/sim/testsuite/d10v-elf/ChangeLog b/sim/testsuite/d10v-elf/ChangeLog index 839b20aa390..fec87674b14 100644 --- a/sim/testsuite/d10v-elf/ChangeLog +++ b/sim/testsuite/d10v-elf/ChangeLog @@ -1,3 +1,8 @@ +2020-10-06 Andrew Burgess + + * configure: Regnerate. + * configure.ac (AC_CONFIG_AUX_DIR): Update. + 2015-03-30 Mike Frysinger * Makefile.in (RUNFLAGS_FOR_TARGET): Set to --environment operating. diff --git a/sim/testsuite/d10v-elf/configure b/sim/testsuite/d10v-elf/configure index 27f3cf4cffe..5686b7e4eb2 100755 --- a/sim/testsuite/d10v-elf/configure +++ b/sim/testsuite/d10v-elf/configure @@ -1682,7 +1682,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu CC=${CC-cc} ac_aux_dir= -for ac_dir in `cd $srcdir;pwd`/../../.. "$srcdir"/`cd $srcdir;pwd`/../../..; do +for ac_dir in ../../.. "$srcdir"/../../..; do if test -f "$ac_dir/install-sh"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install-sh -c" @@ -1698,7 +1698,7 @@ for ac_dir in `cd $srcdir;pwd`/../../.. "$srcdir"/`cd $srcdir;pwd`/../../..; do fi done if test -z "$ac_aux_dir"; then - as_fn_error $? "cannot find install-sh, install.sh, or shtool in \`cd $srcdir;pwd\`/../../.. \"$srcdir\"/\`cd $srcdir;pwd\`/../../.." "$LINENO" 5 + as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../../.. \"$srcdir\"/../../.." "$LINENO" 5 fi # These three variables are undocumented and unsupported, diff --git a/sim/testsuite/d10v-elf/configure.ac b/sim/testsuite/d10v-elf/configure.ac index 40e1c124e85..278d84d0e82 100644 --- a/sim/testsuite/d10v-elf/configure.ac +++ b/sim/testsuite/d10v-elf/configure.ac @@ -9,7 +9,7 @@ AC_INIT(Makefile.in) CC=${CC-cc} AC_SUBST(CC) -AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/../../..) +AC_CONFIG_AUX_DIR(../../..) AC_CANONICAL_SYSTEM AC_SUBST(target_cpu) diff --git a/sim/testsuite/frv-elf/ChangeLog b/sim/testsuite/frv-elf/ChangeLog index c7fdbc8cb74..904de02b998 100644 --- a/sim/testsuite/frv-elf/ChangeLog +++ b/sim/testsuite/frv-elf/ChangeLog @@ -1,3 +1,8 @@ +2020-10-06 Andrew Burgess + + * configure: Regnerate. + * configure.ac (AC_CONFIG_AUX_DIR): Update. + 2009-08-22 Ralf Wildenhues * configure: Regenerate. diff --git a/sim/testsuite/frv-elf/configure b/sim/testsuite/frv-elf/configure index 27f3cf4cffe..5686b7e4eb2 100755 --- a/sim/testsuite/frv-elf/configure +++ b/sim/testsuite/frv-elf/configure @@ -1682,7 +1682,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu CC=${CC-cc} ac_aux_dir= -for ac_dir in `cd $srcdir;pwd`/../../.. "$srcdir"/`cd $srcdir;pwd`/../../..; do +for ac_dir in ../../.. "$srcdir"/../../..; do if test -f "$ac_dir/install-sh"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install-sh -c" @@ -1698,7 +1698,7 @@ for ac_dir in `cd $srcdir;pwd`/../../.. "$srcdir"/`cd $srcdir;pwd`/../../..; do fi done if test -z "$ac_aux_dir"; then - as_fn_error $? "cannot find install-sh, install.sh, or shtool in \`cd $srcdir;pwd\`/../../.. \"$srcdir\"/\`cd $srcdir;pwd\`/../../.." "$LINENO" 5 + as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../../.. \"$srcdir\"/../../.." "$LINENO" 5 fi # These three variables are undocumented and unsupported, diff --git a/sim/testsuite/frv-elf/configure.ac b/sim/testsuite/frv-elf/configure.ac index 40e1c124e85..278d84d0e82 100644 --- a/sim/testsuite/frv-elf/configure.ac +++ b/sim/testsuite/frv-elf/configure.ac @@ -9,7 +9,7 @@ AC_INIT(Makefile.in) CC=${CC-cc} AC_SUBST(CC) -AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/../../..) +AC_CONFIG_AUX_DIR(../../..) AC_CANONICAL_SYSTEM AC_SUBST(target_cpu) diff --git a/sim/testsuite/m32r-elf/ChangeLog b/sim/testsuite/m32r-elf/ChangeLog index 14516f81397..78512ec30f5 100644 --- a/sim/testsuite/m32r-elf/ChangeLog +++ b/sim/testsuite/m32r-elf/ChangeLog @@ -1,3 +1,8 @@ +2020-10-06 Andrew Burgess + + * configure: Regnerate. + * configure.ac (AC_CONFIG_AUX_DIR): Update. + 2009-08-22 Ralf Wildenhues * configure: Regenerate. diff --git a/sim/testsuite/m32r-elf/configure b/sim/testsuite/m32r-elf/configure index 27f3cf4cffe..5686b7e4eb2 100755 --- a/sim/testsuite/m32r-elf/configure +++ b/sim/testsuite/m32r-elf/configure @@ -1682,7 +1682,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu CC=${CC-cc} ac_aux_dir= -for ac_dir in `cd $srcdir;pwd`/../../.. "$srcdir"/`cd $srcdir;pwd`/../../..; do +for ac_dir in ../../.. "$srcdir"/../../..; do if test -f "$ac_dir/install-sh"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install-sh -c" @@ -1698,7 +1698,7 @@ for ac_dir in `cd $srcdir;pwd`/../../.. "$srcdir"/`cd $srcdir;pwd`/../../..; do fi done if test -z "$ac_aux_dir"; then - as_fn_error $? "cannot find install-sh, install.sh, or shtool in \`cd $srcdir;pwd\`/../../.. \"$srcdir\"/\`cd $srcdir;pwd\`/../../.." "$LINENO" 5 + as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../../.. \"$srcdir\"/../../.." "$LINENO" 5 fi # These three variables are undocumented and unsupported, diff --git a/sim/testsuite/m32r-elf/configure.ac b/sim/testsuite/m32r-elf/configure.ac index 40e1c124e85..278d84d0e82 100644 --- a/sim/testsuite/m32r-elf/configure.ac +++ b/sim/testsuite/m32r-elf/configure.ac @@ -9,7 +9,7 @@ AC_INIT(Makefile.in) CC=${CC-cc} AC_SUBST(CC) -AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/../../..) +AC_CONFIG_AUX_DIR(../../..) AC_CANONICAL_SYSTEM AC_SUBST(target_cpu) diff --git a/sim/testsuite/mips64el-elf/ChangeLog b/sim/testsuite/mips64el-elf/ChangeLog index b1f3da492a8..7717ca12b8c 100644 --- a/sim/testsuite/mips64el-elf/ChangeLog +++ b/sim/testsuite/mips64el-elf/ChangeLog @@ -1,3 +1,8 @@ +2020-10-06 Andrew Burgess + + * configure: Regnerate. + * configure.ac (AC_CONFIG_AUX_DIR): Update. + 2009-08-22 Ralf Wildenhues * configure: Regenerate. diff --git a/sim/testsuite/mips64el-elf/configure b/sim/testsuite/mips64el-elf/configure index 27f3cf4cffe..5686b7e4eb2 100755 --- a/sim/testsuite/mips64el-elf/configure +++ b/sim/testsuite/mips64el-elf/configure @@ -1682,7 +1682,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu CC=${CC-cc} ac_aux_dir= -for ac_dir in `cd $srcdir;pwd`/../../.. "$srcdir"/`cd $srcdir;pwd`/../../..; do +for ac_dir in ../../.. "$srcdir"/../../..; do if test -f "$ac_dir/install-sh"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install-sh -c" @@ -1698,7 +1698,7 @@ for ac_dir in `cd $srcdir;pwd`/../../.. "$srcdir"/`cd $srcdir;pwd`/../../..; do fi done if test -z "$ac_aux_dir"; then - as_fn_error $? "cannot find install-sh, install.sh, or shtool in \`cd $srcdir;pwd\`/../../.. \"$srcdir\"/\`cd $srcdir;pwd\`/../../.." "$LINENO" 5 + as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../../.. \"$srcdir\"/../../.." "$LINENO" 5 fi # These three variables are undocumented and unsupported, diff --git a/sim/testsuite/mips64el-elf/configure.ac b/sim/testsuite/mips64el-elf/configure.ac index 40e1c124e85..278d84d0e82 100644 --- a/sim/testsuite/mips64el-elf/configure.ac +++ b/sim/testsuite/mips64el-elf/configure.ac @@ -9,7 +9,7 @@ AC_INIT(Makefile.in) CC=${CC-cc} AC_SUBST(CC) -AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/../../..) +AC_CONFIG_AUX_DIR(../../..) AC_CANONICAL_SYSTEM AC_SUBST(target_cpu) -- 2.30.2