From 91e1a0ed0961091d0312982da759d8bf378fca50 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Sat, 31 Oct 2020 08:30:57 -0400 Subject: [PATCH] gdb, gdbserver, gdbsupport: use AC_CANONICAL_{BUILD,HOST,TARGET} instead of AC_CANONICAL_SYSTEM `autoreconf -Wall` notes that AC_CANONICAL_SYSTEM is obsolete: configure.ac:36: warning: The macro `AC_CANONICAL_SYSTEM' is obsolete. Replace it by AC_CANONICAL_BUILD, AC_CANONICAL_HOST and AC_CANONICAL_TARGET in configure.ac files in gdb, gdbserver and gdbsupport. All three macros may not be needed everywhere, but it is hard to completely audit the configure files to see which are required, so I think it's better (and that there's no downside) to just call all three. gdb/ChangeLog: * configure.ac: Use AC_CANONICAL_{BUILD,HOST,TARGET} instead of AC_CANONICAL_SYSTEM. * configure: Re-generate. gdbserver/ChangeLog: * configure.ac: Use AC_CANONICAL_{BUILD,HOST,TARGET} instead of AC_CANONICAL_SYSTEM. * configure: Re-generate. gdbsupport/ChangeLog: * configure.ac: Use AC_CANONICAL_{BUILD,HOST,TARGET} instead of AC_CANONICAL_SYSTEM. * configure: Re-generate. Change-Id: Ifd0e21f1e478634e768b5de1b8ee06a7f690d863 --- gdb/ChangeLog | 6 ++++++ gdb/configure | 9 +++++++++ gdb/configure.ac | 11 ++++++++++- gdbserver/ChangeLog | 6 ++++++ gdbserver/configure | 6 +++++- gdbserver/configure.ac | 9 ++++++++- gdbsupport/ChangeLog | 6 ++++++ gdbsupport/configure | 6 ++++++ gdbsupport/configure.ac | 11 ++++++++++- 9 files changed, 66 insertions(+), 4 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index dce2e11818..03497060e5 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2020-10-31 Simon Marchi + + * configure.ac: Use AC_CANONICAL_{BUILD,HOST,TARGET} instead of + AC_CANONICAL_SYSTEM. + * configure: Re-generate. + 2020-10-30 Simon Marchi * infrun.h (displaced_debug_printf): New macro. Replace diff --git a/gdb/configure b/gdb/configure index a8942ecbd5..d943424ca5 100755 --- a/gdb/configure +++ b/gdb/configure @@ -5249,6 +5249,15 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. +# Set build, build_cpu, build_vendor and build_os. + + +# Set host, host_cpu, host_vendor, and host_os. + + +# Set target, target_cpu, target_vendor, and target_os. + + 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 6b4b0fa851..1d34d08ee4 100644 --- a/gdb/configure.ac +++ b/gdb/configure.ac @@ -33,7 +33,16 @@ AM_PROG_CC_STDC AM_PROG_INSTALL_STRIP AC_CONFIG_AUX_DIR(..) -AC_CANONICAL_SYSTEM + +# Set build, build_cpu, build_vendor and build_os. +AC_CANONICAL_BUILD + +# Set host, host_cpu, host_vendor, and host_os. +AC_CANONICAL_HOST + +# Set target, target_cpu, target_vendor, and target_os. +AC_CANONICAL_TARGET + AC_ARG_PROGRAM # We require a C++11 compiler. Check if one is available, and if diff --git a/gdbserver/ChangeLog b/gdbserver/ChangeLog index 0167163e4e..f9b2b5ee84 100644 --- a/gdbserver/ChangeLog +++ b/gdbserver/ChangeLog @@ -1,3 +1,9 @@ +2020-10-31 Simon Marchi + + * configure.ac: Use AC_CANONICAL_{BUILD,HOST,TARGET} instead of + AC_CANONICAL_SYSTEM. + * configure: Re-generate. + 2020-10-26 Pedro Alves * netbsd-low.cc (netbsd_waitpid, netbsd_process_target::kill) diff --git a/gdbserver/configure b/gdbserver/configure index 95086d0f0a..4b7ef288d0 100755 --- a/gdbserver/configure +++ b/gdbserver/configure @@ -4588,6 +4588,7 @@ fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" +# Set build, build_cpu, build_vendor and build_os. # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 @@ -4626,6 +4627,8 @@ IFS=$ac_save_IFS case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac + +# Set host, host_cpu, host_vendor, and host_os. { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 $as_echo_n "checking host system type... " >&6; } if ${ac_cv_host+:} false; then : @@ -4659,6 +4662,8 @@ IFS=$ac_save_IFS case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac + +# Set target, target_cpu, target_vendor, and target_os. { $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5 $as_echo_n "checking target system type... " >&6; } if ${ac_cv_target+:} false; then : @@ -4699,7 +4704,6 @@ test -n "$target_alias" && NONENONEs,x,x, && program_prefix=${target_alias}- - # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: diff --git a/gdbserver/configure.ac b/gdbserver/configure.ac index 4c7e392bbc..c4748703dc 100644 --- a/gdbserver/configure.ac +++ b/gdbserver/configure.ac @@ -29,7 +29,14 @@ AC_GNU_SOURCE AC_SYS_LARGEFILE AM_PROG_INSTALL_STRIP -AC_CANONICAL_SYSTEM +# Set build, build_cpu, build_vendor and build_os. +AC_CANONICAL_BUILD + +# Set host, host_cpu, host_vendor, and host_os. +AC_CANONICAL_HOST + +# Set target, target_cpu, target_vendor, and target_os. +AC_CANONICAL_TARGET AC_PROG_INSTALL AC_CHECK_TOOL(AR, ar) diff --git a/gdbsupport/ChangeLog b/gdbsupport/ChangeLog index 2b01a0ba84..8eae8bb2f5 100644 --- a/gdbsupport/ChangeLog +++ b/gdbsupport/ChangeLog @@ -1,3 +1,9 @@ +2020-10-31 Simon Marchi + + * configure.ac: Use AC_CANONICAL_{BUILD,HOST,TARGET} instead of + AC_CANONICAL_SYSTEM. + * configure: Re-generate. + 2020-10-26 Pedro Alves * eintr.h (handle_eintr): Replace Ret template parameter with diff --git a/gdbsupport/configure b/gdbsupport/configure index a37f3c232c..cce6f51701 100755 --- a/gdbsupport/configure +++ b/gdbsupport/configure @@ -2728,6 +2728,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_config_headers="$ac_config_headers config.h:config.in" + +# Set build, build_cpu, build_vendor and build_os. ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do if test -f "$ac_dir/install-sh"; then @@ -2795,6 +2797,8 @@ IFS=$ac_save_IFS case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac + +# Set host, host_cpu, host_vendor, and host_os. { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 $as_echo_n "checking host system type... " >&6; } if ${ac_cv_host+:} false; then : @@ -2828,6 +2832,8 @@ IFS=$ac_save_IFS case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac + +# Set target, target_cpu, target_vendor, and target_os. { $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5 $as_echo_n "checking target system type... " >&6; } if ${ac_cv_target+:} false; then : diff --git a/gdbsupport/configure.ac b/gdbsupport/configure.ac index 401e16f821..a62a130fe9 100644 --- a/gdbsupport/configure.ac +++ b/gdbsupport/configure.ac @@ -19,7 +19,16 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT([gdbsupport], 1.0) AC_CONFIG_SRCDIR(common-defs.h) AC_CONFIG_HEADER(config.h:config.in) -AC_CANONICAL_SYSTEM + +# Set build, build_cpu, build_vendor and build_os. +AC_CANONICAL_BUILD + +# Set host, host_cpu, host_vendor, and host_os. +AC_CANONICAL_HOST + +# Set target, target_cpu, target_vendor, and target_os. +AC_CANONICAL_TARGET + AM_MAINTAINER_MODE AC_CONFIG_AUX_DIR(..) AM_INIT_AUTOMAKE