Use ACX_NONCANONICAL_TARGET in gdb/configure

Message ID 20210604202515.3429329-1-tromey@adacore.com
State New
Headers show
Series
  • Use ACX_NONCANONICAL_TARGET in gdb/configure
Related show

Commit Message

Tom Tromey June 4, 2021, 8:25 p.m.
Shahab Vahedipointed 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-04  Tom Tromey  <tromey@adacore.com>

	* configure: Rebuild.
	* configure.ac: Add ACX_NONCANONICAL_TARGET.
---
 gdb/ChangeLog    |  5 +++++
 gdb/configure    | 19 +++++++++++++++++++
 gdb/configure.ac |  2 ++
 3 files changed, 26 insertions(+)

-- 
2.26.3

Comments

Mike Frysinger via Gdb-patches June 5, 2021, 9:31 a.m. | #1
Works like a charm.  There is a minor typo in the commit message though.

On Fri, Jun 04, 2021 at 02:25:15PM -0600, Tom Tromey wrote:
> Shahab Vahedipointed out that the patch to remove


Shahab Vahedi pointed out that ...


Cheers,
Shahab
Andrew Burgess June 5, 2021, 12:06 p.m. | #2
* Tom Tromey <tromey@adacore.com> [2021-06-04 14:25:15 -0600]:

> Shahab Vahedipointed 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.


LGTM :)

Thanks,
Andrew

> 

> This patch adds ACX_NONCANONICAL_TARGET to gdb's configure, and fixes

> the bug.

> 

> gdb/ChangeLog

> 2021-06-04  Tom Tromey  <tromey@adacore.com>

> 

> 	* configure: Rebuild.

> 	* configure.ac: Add ACX_NONCANONICAL_TARGET.

> ---

>  gdb/ChangeLog    |  5 +++++

>  gdb/configure    | 19 +++++++++++++++++++

>  gdb/configure.ac |  2 ++

>  3 files changed, 26 insertions(+)

> 

> diff --git a/gdb/configure b/gdb/configure

> index fb43377015c..3d3977b26a8 100755

> --- 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 e6e1c6b7b90..df340ffa826 100644

> --- 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

> -- 

> 2.26.3

>
Tom Tromey June 5, 2021, 2:15 p.m. | #3
Shahab> Works like a charm.  There is a minor typo in the commit message though.

Oops, sorry about that.
I'll fix it up before pushing.

Tom

Patch

diff --git a/gdb/configure b/gdb/configure
index fb43377015c..3d3977b26a8 100755
--- 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 e6e1c6b7b90..df340ffa826 100644
--- 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