Use ACX_NONCANONICAL_TARGET in gdb/configure

Shahab Vahedi pointed out that the patch to remove
gdb/testsuite/configure regressed the site.exp creation a bit -- it
left an unresolved configure substitution.  Andrew Burgess pointed out
that the patch removed the call to ACX_NONCANONICAL_TARGET, which
caused this problem.

This patch adds ACX_NONCANONICAL_TARGET to gdb's configure, and fixes
the bug.

gdb/ChangeLog
2021-06-05  Tom Tromey  <tromey@adacore.com>

	* configure: Rebuild.
	* configure.ac: Add ACX_NONCANONICAL_TARGET.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9fc2310d144e4c4d4b907231f2eca03e068f88ee..1a8e72559514e8777a09f66badd69ff7758ee70c 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-05  Tom Tromey  <tromey@adacore.com>
+
+       * configure: Rebuild.
+       * configure.ac: Add ACX_NONCANONICAL_TARGET.
+
 2021-06-05  Shahab Vahedi  <shahab@synopsys.com>
 
        * NEWS: Document 'set disassembler-options' support for the ARC

diff --git a/gdb/configure b/gdb/configure
index fb43377015c80608ac7d36166081a7e7b8cfb452..3d3977b26a874068cf909470b2096c8e681198e3 100755 (executable)
--- a/gdb/configure
+++ b/gdb/configure
@@ -800,6 +800,7 @@ DEPDIR
 am__leading_dot
 CXX_DIALECT
 HAVE_CXX11
+target_noncanonical
 INSTALL_STRIP_PROGRAM
 STRIP
 install_sh
@@ -5186,6 +5187,24 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 # Set target, target_cpu, target_vendor, and target_os.
 
 
+ case ${build_alias} in
+  "") build_noncanonical=${build} ;;
+  *) build_noncanonical=${build_alias} ;;
+esac
+
+ case ${host_alias} in
+  "") host_noncanonical=${build_noncanonical} ;;
+  *) host_noncanonical=${host_alias} ;;
+esac
+
+ case ${target_alias} in
+  "") target_noncanonical=${host_noncanonical} ;;
+  *) target_noncanonical=${target_alias} ;;
+esac
+
+
+
+
 test "$program_prefix" != NONE &&
   program_transform_name="s&^&$program_prefix&;$program_transform_name"
 # Use a double $ so make ignores it.

diff --git a/gdb/configure.ac b/gdb/configure.ac
index e6e1c6b7b90de2a6cbbd40dc5971578f44278de5..df340ffa8264395056c40fd14007c0d8ae12ceac 100644 (file)
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -43,6 +43,8 @@ AC_CANONICAL_HOST
 # Set target, target_cpu, target_vendor, and target_os.
 AC_CANONICAL_TARGET
 
+ACX_NONCANONICAL_TARGET
+
 AC_ARG_PROGRAM
 
 # We require a C++11 compiler.  Check if one is available, and if