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.

diff --git a/sim/testsuite/ChangeLog b/sim/testsuite/ChangeLog
index 14055f82cdc7d758bc4befd46f1121f0429667cf..e8dedaf533f3e2d52589b1965593be2f7b7b89f4 100644 (file)
--- a/sim/testsuite/ChangeLog
+++ b/sim/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2020-10-06  Andrew Burgess  <andrew.burgess@embecosm.com>
+
+       * configure: Regnerate.
+       * configure.ac (AC_CONFIG_AUX_DIR): Update.
+
 2020-09-08  David Faust  <david.faust@oracle.com>
 
        * sim/bpf/alu.s: Correct div and mod tests.

diff --git a/sim/testsuite/configure b/sim/testsuite/configure
index c3674c2fa076593f2b1c24e0d5953c0b62c9102c..6f0464dc14a60c4d2b6fcbb82b2b9c188da7733b 100755 (executable)
--- 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 5d753879ad077c6d2c2c957503e4a2a4099e33f9..faaf38dc88798ee93688608981b0ed98c9029bb4 100644 (file)
--- 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 839b20aa3907ac1015a87ed88633a9ddf737a45c..fec87674b14bb0a4e6d3ad0c5a65426da9aa279d 100644 (file)
--- a/sim/testsuite/d10v-elf/ChangeLog
+++ b/sim/testsuite/d10v-elf/ChangeLog
@@ -1,3 +1,8 @@
+2020-10-06  Andrew Burgess  <andrew.burgess@embecosm.com>
+
+       * configure: Regnerate.
+       * configure.ac (AC_CONFIG_AUX_DIR): Update.
+
 2015-03-30  Mike Frysinger  <vapier@gentoo.org>
 
        * Makefile.in (RUNFLAGS_FOR_TARGET): Set to --environment operating.

diff --git a/sim/testsuite/d10v-elf/configure b/sim/testsuite/d10v-elf/configure
index 27f3cf4cffe7912641e81e805c086425242f68f7..5686b7e4eb2c35d3ac8ebe6d4edb0fa3fde5df6e 100755 (executable)
--- 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 40e1c124e85649a895db693041eec9df1c676fb6..278d84d0e82510d5e99d289f6dc719af4f9e7208 100644 (file)
--- 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 c7fdbc8cb741f6c282dad34ced2c6890199a4d32..904de02b9983225dc8ec1622989f24ee03f5ff62 100644 (file)
--- a/sim/testsuite/frv-elf/ChangeLog
+++ b/sim/testsuite/frv-elf/ChangeLog
@@ -1,3 +1,8 @@
+2020-10-06  Andrew Burgess  <andrew.burgess@embecosm.com>
+
+       * configure: Regnerate.
+       * configure.ac (AC_CONFIG_AUX_DIR): Update.
+
 2009-08-22  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * configure: Regenerate.

diff --git a/sim/testsuite/frv-elf/configure b/sim/testsuite/frv-elf/configure
index 27f3cf4cffe7912641e81e805c086425242f68f7..5686b7e4eb2c35d3ac8ebe6d4edb0fa3fde5df6e 100755 (executable)
--- 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 40e1c124e85649a895db693041eec9df1c676fb6..278d84d0e82510d5e99d289f6dc719af4f9e7208 100644 (file)
--- 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 14516f8139774c5cb742a6a7dfe1992b599100bb..78512ec30f543593f973910220ad65a6e8e1dcd2 100644 (file)
--- a/sim/testsuite/m32r-elf/ChangeLog
+++ b/sim/testsuite/m32r-elf/ChangeLog
@@ -1,3 +1,8 @@
+2020-10-06  Andrew Burgess  <andrew.burgess@embecosm.com>
+
+       * configure: Regnerate.
+       * configure.ac (AC_CONFIG_AUX_DIR): Update.
+
 2009-08-22  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * configure: Regenerate.

diff --git a/sim/testsuite/m32r-elf/configure b/sim/testsuite/m32r-elf/configure
index 27f3cf4cffe7912641e81e805c086425242f68f7..5686b7e4eb2c35d3ac8ebe6d4edb0fa3fde5df6e 100755 (executable)
--- 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 40e1c124e85649a895db693041eec9df1c676fb6..278d84d0e82510d5e99d289f6dc719af4f9e7208 100644 (file)
--- 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 b1f3da492a8e2e84e14c4a9212d0685ac518f5a5..7717ca12b8c2e1c6bb462f54dad3394826ded929 100644 (file)
--- a/sim/testsuite/mips64el-elf/ChangeLog
+++ b/sim/testsuite/mips64el-elf/ChangeLog
@@ -1,3 +1,8 @@
+2020-10-06  Andrew Burgess  <andrew.burgess@embecosm.com>
+
+       * configure: Regnerate.
+       * configure.ac (AC_CONFIG_AUX_DIR): Update.
+
 2009-08-22  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * configure: Regenerate.

diff --git a/sim/testsuite/mips64el-elf/configure b/sim/testsuite/mips64el-elf/configure
index 27f3cf4cffe7912641e81e805c086425242f68f7..5686b7e4eb2c35d3ac8ebe6d4edb0fa3fde5df6e 100755 (executable)
--- 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 40e1c124e85649a895db693041eec9df1c676fb6..278d84d0e82510d5e99d289f6dc719af4f9e7208 100644 (file)
--- 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)