https://gcc.gnu.org/g:a44acda568b6740ca2396205ec1db3514bc0325c
commit r17-6082-ga44acda568b6740ca2396205ec1db3514bc0325c Author: Pietro Monteiro <[email protected]> Date: Mon Nov 9 21:47:56 2026 -0500 configury: Stop using AC_CANONICAL_SYSTEM [PR103459] libstdc++ configure.ac has a reference to a mailinglist post[0] explaining why AC_CANONICAL_SYSTEM and target_alias=${target_alias-$host_alias} are used. The main reason to use AC_CANONICAL_SYSTEM is an automake bug that has been fixed in the version currently used (1.15.1). In the version of autoconf we use (2.69) AC_CANONICAL_SYSTEM is aliased to AC_CANONICAL_TARGET, so the only change caused by using AC_CANONICAL_TARGET is the removal of an empty line and the re-adjustment of #line comments on autoconf tests because of that. The libstc++ message and two lines have been copied to other libraries. But the copy paste has mutated, sometimes separating the two lines, sometimes adding a redundant AC_SUBST(target_alias), and in one case adding AC_CANONICAL_HOST. Update all libs AC_CANONICAL_SYSTEM to AC_CANONICAL_TARGET. Remove redundant AC_CANONICAL_HOST (AC_REQUIRE'd by AC_CANONICAL_TARGET). And remove redundant AC_SUBST(target_alias), which is done by AC_CANONICAL_TARGET. To avoid confusion remove all the mentions to the libstdc++ message, but leave other comments untouched if they exist. [0] http://gcc.gnu.org/ml/libstdc++/2003-07/msg00451.html PR bootstrap/103459 gotools/ChangeLog: * configure.ac: Update comment to reference AC_CANONICAL_TARGET instead of AC_CANONICAL_SYSTEM. libatomic/ChangeLog: * configure: Regenerate. * configure.ac: Use AC_CANONICAL_TARGET instead of AC_CANONICAL_SYSTEM. libga68/ChangeLog: * configure: Regenerate. * configure.ac: Use AC_CANONICAL_TARGET instead of AC_CANONICAL_SYSTEM. Remove unneeded AC_CANONICAL_HOST. Remove unneeded AC_SUBST(target_alias). libgcobol/ChangeLog: * configure: Regenerate. * configure.ac: Use AC_CANONICAL_TARGET instead of AC_CANONICAL_SYSTEM. Remove unneeded AC_SUBST(target_alias). libgfortran/ChangeLog: * configure: Regenerate. * configure.ac: Use AC_CANONICAL_TARGET instead of AC_CANONICAL_SYSTEM. Remove unneeded AC_SUBST(target_alias). libgm2/ChangeLog: * configure: Regenerate. * configure.ac: Use AC_CANONICAL_TARGET instead of AC_CANONICAL_SYSTEM. Remove unneeded AC_SUBST(target_alias). libgomp/ChangeLog: * configure: Regenerate. * configure.ac: Use AC_CANONICAL_TARGET instead of AC_CANONICAL_SYSTEM. libgrust/ChangeLog: * configure: Regenerate. * configure.ac: Use AC_CANONICAL_TARGET instead of AC_CANONICAL_SYSTEM. Remove unneeded AC_SUBST(target_alias). libitm/ChangeLog: * configure: Regenerate. * configure.ac: Use AC_CANONICAL_TARGET instead of AC_CANONICAL_SYSTEM. libphobos/ChangeLog: * configure: Regenerate. * configure.ac: Remove unneeded AC_SUBST(target_alias). libquadmath/ChangeLog: * configure: Regenerate. * configure.ac: Use AC_CANONICAL_TARGET instead of AC_CANONICAL_SYSTEM. Remove unneeded AC_SUBST(target_alias). libsanitizer/ChangeLog: * configure: Regenerate. * configure.ac: Use AC_CANONICAL_TARGET instead of AC_CANONICAL_SYSTEM. Remove unneeded AC_SUBST(target_alias). libssp/ChangeLog: * configure: Regenerate. * configure.ac: Use AC_CANONICAL_TARGET instead of AC_CANONICAL_SYSTEM. Remove unneeded AC_SUBST(target_alias). libstdc++-v3/ChangeLog: * configure: Regenerate. * configure.ac: Use AC_CANONICAL_TARGET instead of AC_CANONICAL_SYSTEM. libvtv/ChangeLog: * configure: Regenerate. * configure.ac: Use AC_CANONICAL_TARGET instead of AC_CANONICAL_SYSTEM. Remove unneeded AC_SUBST(target_alias). Signed-off-by: Pietro Monteiro <[email protected]> Diff: --- gotools/configure.ac | 2 +- libatomic/configure | 10 +++------- libatomic/configure.ac | 7 ++----- libga68/configure | 14 +++----------- libga68/configure.ac | 11 ++--------- libgcobol/configure | 8 ++------ libgcobol/configure.ac | 5 +---- libgfortran/configure | 11 +++-------- libgfortran/configure.ac | 8 ++------ libgm2/configure | 8 ++------ libgm2/configure.ac | 5 +---- libgomp/configure | 10 +++------- libgomp/configure.ac | 7 ++----- libgrust/configure | 8 ++------ libgrust/configure.ac | 5 +---- libitm/configure | 10 +++------- libitm/configure.ac | 7 ++----- libphobos/configure | 5 ++--- libphobos/configure.ac | 1 - libquadmath/configure | 9 ++------- libquadmath/configure.ac | 6 +----- libsanitizer/configure | 8 ++------ libsanitizer/configure.ac | 5 +---- libssp/configure | 6 ++---- libssp/configure.ac | 3 +-- libstdc++-v3/configure | 18 +++++++----------- libstdc++-v3/configure.ac | 7 ++----- libvtv/configure | 8 ++------ libvtv/configure.ac | 5 +---- 29 files changed, 58 insertions(+), 159 deletions(-) diff --git a/gotools/configure.ac b/gotools/configure.ac index da5347541e52..4a0a717c3bf4 100644 --- a/gotools/configure.ac +++ b/gotools/configure.ac @@ -25,7 +25,7 @@ ACX_NONCANONICAL_TARGET dnl Autoconf 2.5x and later will set a default program prefix if dnl --target was used, even if it was the same as --host. Disable -dnl that behavior. This must be done before AC_CANONICAL_SYSTEM +dnl that behavior. This must be done before AC_CANONICAL_TARGET dnl to take effect. test "$host_noncanonical" = "$target_noncanonical" && test "$program_prefix$program_suffix$program_transform_name" = \ diff --git a/libatomic/configure b/libatomic/configure index ef8f57f41fab..c54bf101cf5b 100755 --- a/libatomic/configure +++ b/libatomic/configure @@ -2589,9 +2589,6 @@ fi # # Also, if this library is being configured as part of a cross compiler, the # top-level configure script will pass the "real" host as $with_cross_host. -# -# Do not delete or change the following two lines. For why, see -# http://gcc.gnu.org/ml/libstdc++/2003-07/msg00451.html ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do if test -f "$ac_dir/install-sh"; then @@ -2731,10 +2728,9 @@ test -n "$target_alias" && test "$program_prefix$program_suffix$program_transform_name" = \ NONENONEs,x,x, && program_prefix=${target_alias}- - target_alias=${target_alias-$host_alias} -# Sets up automake. Must come after AC_CANONICAL_SYSTEM. Each of the +# Sets up automake. Must come after AC_CANONICAL_TARGET. Each of the # following is magically included in AUTOMAKE_OPTIONS in each Makefile.am. # 1.9.0: minimum required version # no-define: PACKAGE and VERSION will not be #define'd in config.h (a bunch @@ -11866,7 +11862,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11869 "configure" +#line 11865 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11972,7 +11968,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11975 "configure" +#line 11971 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/libatomic/configure.ac b/libatomic/configure.ac index e8ee03a025ae..d2f003fe6805 100644 --- a/libatomic/configure.ac +++ b/libatomic/configure.ac @@ -63,13 +63,10 @@ AM_CONDITIONAL(GENINSRC, test "$enable_generated_files_in_srcdir" = yes) # # Also, if this library is being configured as part of a cross compiler, the # top-level configure script will pass the "real" host as $with_cross_host. -# -# Do not delete or change the following two lines. For why, see -# http://gcc.gnu.org/ml/libstdc++/2003-07/msg00451.html -AC_CANONICAL_SYSTEM +AC_CANONICAL_TARGET target_alias=${target_alias-$host_alias} -# Sets up automake. Must come after AC_CANONICAL_SYSTEM. Each of the +# Sets up automake. Must come after AC_CANONICAL_TARGET. Each of the # following is magically included in AUTOMAKE_OPTIONS in each Makefile.am. # 1.9.0: minimum required version # no-define: PACKAGE and VERSION will not be #define'd in config.h (a bunch diff --git a/libga68/configure b/libga68/configure index 386da87d67c4..2c570be9fb18 100755 --- a/libga68/configure +++ b/libga68/configure @@ -3715,13 +3715,8 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; } -# Determine the system type and set output variabls to the names of +# Determine the system type and set output variables to the names of # the canonical system types. -# -# Do not delete or change the following two lines. For why, and for -# why we are using the obsolete AC_CANONICAL_SYSTEM as ell as the -# recommended AC_CANONICAL_HOST, see -# http://gcc.gnu.org/ml/libstdc++/2003-07/msg00451.html # 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 @@ -3832,11 +3827,8 @@ test -n "$target_alias" && test "$program_prefix$program_suffix$program_transform_name" = \ NONENONEs,x,x, && program_prefix=${target_alias}- - target_alias=${target_alias-$host_alias} - - # These macro are for supporting canadian crosses, in which build /= # host /= target. case ${build_alias} in @@ -12836,7 +12828,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12839 "configure" +#line 12831 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12942,7 +12934,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12945 "configure" +#line 12937 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/libga68/configure.ac b/libga68/configure.ac index 87a29629d7b2..2346721e7ba6 100644 --- a/libga68/configure.ac +++ b/libga68/configure.ac @@ -39,17 +39,10 @@ GCC_NO_EXECUTABLES # compiler. AC_USE_SYSTEM_EXTENSIONS -# Determine the system type and set output variabls to the names of +# Determine the system type and set output variables to the names of # the canonical system types. -# -# Do not delete or change the following two lines. For why, and for -# why we are using the obsolete AC_CANONICAL_SYSTEM as ell as the -# recommended AC_CANONICAL_HOST, see -# http://gcc.gnu.org/ml/libstdc++/2003-07/msg00451.html -AC_CANONICAL_SYSTEM +AC_CANONICAL_TARGET target_alias=${target_alias-$host_alias} -AC_SUBST(target_alias) -AC_CANONICAL_HOST # These macro are for supporting canadian crosses, in which build /= # host /= target. diff --git a/libgcobol/configure b/libgcobol/configure index 50ae7c9e5b5e..f4e759450697 100755 --- a/libgcobol/configure +++ b/libgcobol/configure @@ -2956,8 +2956,6 @@ ac_config_headers="$ac_config_headers config.h" -# Do not delete or change the following two lines. For why, see -# http://gcc.gnu.org/ml/libstdc++/2003-07/msg00451.html ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do if test -f "$ac_dir/install-sh"; then @@ -3097,7 +3095,6 @@ test -n "$target_alias" && test "$program_prefix$program_suffix$program_transform_name" = \ NONENONEs,x,x, && program_prefix=${target_alias}- - case ${build_alias} in "") build_noncanonical=${build} ;; *) build_noncanonical=${build_alias} ;; @@ -3157,7 +3154,6 @@ ac_config_commands="$ac_config_commands multilib" target_alias=${target_alias-$host_alias} - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -12224,7 +12220,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12227 "configure" +#line 12223 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12330,7 +12326,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12333 "configure" +#line 12329 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/libgcobol/configure.ac b/libgcobol/configure.ac index 7ca4bd95914d..b7b77a686de5 100644 --- a/libgcobol/configure.ac +++ b/libgcobol/configure.ac @@ -28,15 +28,12 @@ AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIRS([m4]) -# Do not delete or change the following two lines. For why, see -# http://gcc.gnu.org/ml/libstdc++/2003-07/msg00451.html -AC_CANONICAL_SYSTEM +AC_CANONICAL_TARGET ACX_NONCANONICAL_TARGET AM_ENABLE_MULTILIB(, ..) target_alias=${target_alias-$host_alias} -AC_SUBST(target_alias) AM_MAINTAINER_MODE diff --git a/libgfortran/configure b/libgfortran/configure index 2953f0e8e364..ed2c497c7298 100755 --- a/libgfortran/configure +++ b/libgfortran/configure @@ -2904,9 +2904,6 @@ $as_echo "$version_specific_libs" >&6; } # # Also, if this library is being configured as part of a cross compiler, the # top-level configure script will pass the "real" host as $with_cross_host. -# -# Do not delete or change the following two lines. For why, see -# http://gcc.gnu.org/ml/libstdc++/2003-07/msg00451.html { $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 : @@ -2982,11 +2979,9 @@ test -n "$target_alias" && - target_alias=${target_alias-$host_alias} - -# Sets up automake. Must come after AC_CANONICAL_SYSTEM. Each of the +# Sets up automake. Must come after AC_CANONICAL_TARGET. Each of the # following is magically included in AUTOMAKE_OPTIONS in each Makefile.am. # 1.9.6: minimum required version # no-define: PACKAGE and VERSION will not be #define'd in config.h (a bunch @@ -13242,7 +13237,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 13245 "configure" +#line 13240 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13348,7 +13343,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 13351 "configure" +#line 13346 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/libgfortran/configure.ac b/libgfortran/configure.ac index 1b46fa0d012a..b45b980bbf52 100644 --- a/libgfortran/configure.ac +++ b/libgfortran/configure.ac @@ -33,16 +33,12 @@ AC_MSG_RESULT($version_specific_libs) # # Also, if this library is being configured as part of a cross compiler, the # top-level configure script will pass the "real" host as $with_cross_host. -# -# Do not delete or change the following two lines. For why, see -# http://gcc.gnu.org/ml/libstdc++/2003-07/msg00451.html -AC_CANONICAL_SYSTEM +AC_CANONICAL_TARGET ACX_NONCANONICAL_TARGET target_alias=${target_alias-$host_alias} -AC_SUBST(target_alias) -# Sets up automake. Must come after AC_CANONICAL_SYSTEM. Each of the +# Sets up automake. Must come after AC_CANONICAL_TARGET. Each of the # following is magically included in AUTOMAKE_OPTIONS in each Makefile.am. # 1.9.6: minimum required version # no-define: PACKAGE and VERSION will not be #define'd in config.h (a bunch diff --git a/libgm2/configure b/libgm2/configure index 078c5b68ab12..aa4303fa5909 100755 --- a/libgm2/configure +++ b/libgm2/configure @@ -4153,8 +4153,6 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; } -# Do not delete or change the following two lines. For why, see -# http://gcc.gnu.org/ml/libstdc++/2003-07/msg00451.html # 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 @@ -4265,10 +4263,8 @@ test -n "$target_alias" && test "$program_prefix$program_suffix$program_transform_name" = \ NONENONEs,x,x, && program_prefix=${target_alias}- - target_alias=${target_alias-$host_alias} - if test "$build" != "$host"; then # We are being configured with some form of cross compiler. GLIBGM2_IS_NATIVE=false @@ -15124,7 +15120,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 15127 "configure" +#line 15123 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -15230,7 +15226,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 15233 "configure" +#line 15229 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/libgm2/configure.ac b/libgm2/configure.ac index c367c14e3e9f..bba48aae1d70 100644 --- a/libgm2/configure.ac +++ b/libgm2/configure.ac @@ -36,11 +36,8 @@ GCC_NO_EXECUTABLES AC_USE_SYSTEM_EXTENSIONS -# Do not delete or change the following two lines. For why, see -# http://gcc.gnu.org/ml/libstdc++/2003-07/msg00451.html -AC_CANONICAL_SYSTEM +AC_CANONICAL_TARGET target_alias=${target_alias-$host_alias} -AC_SUBST(target_alias) if test "$build" != "$host"; then # We are being configured with some form of cross compiler. diff --git a/libgomp/configure b/libgomp/configure index af1a4dcaa5ee..2feff7199b28 100755 --- a/libgomp/configure +++ b/libgomp/configure @@ -2705,9 +2705,6 @@ fi # # Also, if this library is being configured as part of a cross compiler, the # top-level configure script will pass the "real" host as $with_cross_host. -# -# Do not delete or change the following two lines. For why, see -# http://gcc.gnu.org/ml/libstdc++/2003-07/msg00451.html ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do if test -f "$ac_dir/install-sh"; then @@ -2847,10 +2844,9 @@ test -n "$target_alias" && test "$program_prefix$program_suffix$program_transform_name" = \ NONENONEs,x,x, && program_prefix=${target_alias}- - target_alias=${target_alias-$host_alias} -# Sets up automake. Must come after AC_CANONICAL_SYSTEM. Each of the +# Sets up automake. Must come after AC_CANONICAL_TARGET. Each of the # following is magically included in AUTOMAKE_OPTIONS in each Makefile.am. # 1.9.0: minimum required version # no-define: PACKAGE and VERSION will not be #define'd in config.h (a bunch @@ -11862,7 +11858,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11865 "configure" +#line 11861 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11968,7 +11964,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11971 "configure" +#line 11967 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/libgomp/configure.ac b/libgomp/configure.ac index 35ebca4ae8ed..61e49ec077ed 100644 --- a/libgomp/configure.ac +++ b/libgomp/configure.ac @@ -43,13 +43,10 @@ AM_CONDITIONAL(GENINSRC, test "$enable_generated_files_in_srcdir" = yes) # # Also, if this library is being configured as part of a cross compiler, the # top-level configure script will pass the "real" host as $with_cross_host. -# -# Do not delete or change the following two lines. For why, see -# http://gcc.gnu.org/ml/libstdc++/2003-07/msg00451.html -AC_CANONICAL_SYSTEM +AC_CANONICAL_TARGET target_alias=${target_alias-$host_alias} -# Sets up automake. Must come after AC_CANONICAL_SYSTEM. Each of the +# Sets up automake. Must come after AC_CANONICAL_TARGET. Each of the # following is magically included in AUTOMAKE_OPTIONS in each Makefile.am. # 1.9.0: minimum required version # no-define: PACKAGE and VERSION will not be #define'd in config.h (a bunch diff --git a/libgrust/configure b/libgrust/configure index 93c6c5b7445d..a2225160db21 100755 --- a/libgrust/configure +++ b/libgrust/configure @@ -2430,8 +2430,6 @@ ac_config_commands="$ac_config_commands multilib" fi -# Do not delete or change the following two lines. For why, see -# http://gcc.gnu.org/ml/libstdc++/2003-07/msg00451.html ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do if test -f "$ac_dir/install-sh"; then @@ -2571,10 +2569,8 @@ test -n "$target_alias" && test "$program_prefix$program_suffix$program_transform_name" = \ NONENONEs,x,x, && program_prefix=${target_alias}- - target_alias=${target_alias-$host_alias} - # Automake should never attempt to rebuild configure { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 @@ -12876,7 +12872,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12879 "configure" +#line 12875 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12982,7 +12978,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12985 "configure" +#line 12981 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/libgrust/configure.ac b/libgrust/configure.ac index a01493724e6e..d2e83374cdca 100644 --- a/libgrust/configure.ac +++ b/libgrust/configure.ac @@ -6,11 +6,8 @@ if test -n "${with_target_subdir}"; then AM_ENABLE_MULTILIB(, ..) fi -# Do not delete or change the following two lines. For why, see -# http://gcc.gnu.org/ml/libstdc++/2003-07/msg00451.html -AC_CANONICAL_SYSTEM +AC_CANONICAL_TARGET target_alias=${target_alias-$host_alias} -AC_SUBST(target_alias) # Automake should never attempt to rebuild configure AM_MAINTAINER_MODE diff --git a/libitm/configure b/libitm/configure index b951ac6f598d..e7df08ba71a6 100755 --- a/libitm/configure +++ b/libitm/configure @@ -2765,9 +2765,6 @@ fi # # Also, if this library is being configured as part of a cross compiler, the # top-level configure script will pass the "real" host as $with_cross_host. -# -# Do not delete or change the following two lines. For why, see -# http://gcc.gnu.org/ml/libstdc++/2003-07/msg00451.html ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do if test -f "$ac_dir/install-sh"; then @@ -2907,10 +2904,9 @@ test -n "$target_alias" && test "$program_prefix$program_suffix$program_transform_name" = \ NONENONEs,x,x, && program_prefix=${target_alias}- - target_alias=${target_alias-$host_alias} -# Sets up automake. Must come after AC_CANONICAL_SYSTEM. Each of the +# Sets up automake. Must come after AC_CANONICAL_TARGET. Each of the # following is magically included in AUTOMAKE_OPTIONS in each Makefile.am. # 1.9.0: minimum required version # no-define: PACKAGE and VERSION will not be #define'd in config.h (a bunch @@ -12520,7 +12516,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12523 "configure" +#line 12519 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12626,7 +12622,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12629 "configure" +#line 12625 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/libitm/configure.ac b/libitm/configure.ac index 8bac49ad6cf8..2af163b9face 100644 --- a/libitm/configure.ac +++ b/libitm/configure.ac @@ -57,13 +57,10 @@ AM_CONDITIONAL(GENINSRC, test "$enable_generated_files_in_srcdir" = yes) # # Also, if this library is being configured as part of a cross compiler, the # top-level configure script will pass the "real" host as $with_cross_host. -# -# Do not delete or change the following two lines. For why, see -# http://gcc.gnu.org/ml/libstdc++/2003-07/msg00451.html -AC_CANONICAL_SYSTEM +AC_CANONICAL_TARGET target_alias=${target_alias-$host_alias} -# Sets up automake. Must come after AC_CANONICAL_SYSTEM. Each of the +# Sets up automake. Must come after AC_CANONICAL_TARGET. Each of the # following is magically included in AUTOMAKE_OPTIONS in each Makefile.am. # 1.9.0: minimum required version # no-define: PACKAGE and VERSION will not be #define'd in config.h (a bunch diff --git a/libphobos/configure b/libphobos/configure index 07da7231cff1..300a2310f99e 100755 --- a/libphobos/configure +++ b/libphobos/configure @@ -3960,7 +3960,6 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; } target_alias=${target_alias-$target} - # 1.11.1: Require that version of automake. # foreign: Don't require README, INSTALL, NEWS, etc. # no-define: Don't define PACKAGE and VERSION. @@ -12252,7 +12251,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12255 "configure" +#line 12254 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12358,7 +12357,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12361 "configure" +#line 12360 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/libphobos/configure.ac b/libphobos/configure.ac index a6b2f13cb98a..19e143d6d330 100644 --- a/libphobos/configure.ac +++ b/libphobos/configure.ac @@ -35,7 +35,6 @@ AC_CANONICAL_TARGET AC_USE_SYSTEM_EXTENSIONS target_alias=${target_alias-$target} -AC_SUBST(target_alias) # 1.11.1: Require that version of automake. # foreign: Don't require README, INSTALL, NEWS, etc. diff --git a/libquadmath/configure b/libquadmath/configure index 19b30e22f079..e194d441124b 100755 --- a/libquadmath/configure +++ b/libquadmath/configure @@ -2276,9 +2276,6 @@ ac_config_headers="$ac_config_headers config.h" # # Also, if this library is being configured as part of a cross compiler, the # top-level configure script will pass the "real" host as $with_cross_host. -# -# Do not delete or change the following two lines. For why, see -# http://gcc.gnu.org/ml/libstdc++/2003-07/msg00451.html ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do if test -f "$ac_dir/install-sh"; then @@ -2418,7 +2415,6 @@ test -n "$target_alias" && test "$program_prefix$program_suffix$program_transform_name" = \ NONENONEs,x,x, && program_prefix=${target_alias}- - case ${build_alias} in "") build_noncanonical=${build} ;; *) build_noncanonical=${build_alias} ;; @@ -2477,7 +2473,6 @@ ac_config_commands="$ac_config_commands multilib" target_alias=${target_alias-$host_alias} - am__api_version='1.15' # Find a good install program. We prefer a C program (faster), @@ -11311,7 +11306,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11314 "configure" +#line 11309 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11417,7 +11412,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11420 "configure" +#line 11415 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/libquadmath/configure.ac b/libquadmath/configure.ac index c77facc764eb..6ff63ffdba9e 100644 --- a/libquadmath/configure.ac +++ b/libquadmath/configure.ac @@ -16,16 +16,12 @@ AC_CONFIG_HEADERS([config.h]) # # Also, if this library is being configured as part of a cross compiler, the # top-level configure script will pass the "real" host as $with_cross_host. -# -# Do not delete or change the following two lines. For why, see -# http://gcc.gnu.org/ml/libstdc++/2003-07/msg00451.html -AC_CANONICAL_SYSTEM +AC_CANONICAL_TARGET ACX_NONCANONICAL_TARGET AM_ENABLE_MULTILIB(, ..) target_alias=${target_alias-$host_alias} -AC_SUBST(target_alias) AM_INIT_AUTOMAKE([1.9.0 foreign subdir-objects no-dist -Wall -Wno-override -Werror]) diff --git a/libsanitizer/configure b/libsanitizer/configure index 4bb9f9e862c9..0092716a639f 100755 --- a/libsanitizer/configure +++ b/libsanitizer/configure @@ -4095,8 +4095,6 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; } -# Do not delete or change the following two lines. For why, see -# http://gcc.gnu.org/ml/libstdc++/2003-07/msg00451.html # 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 @@ -4207,9 +4205,7 @@ test -n "$target_alias" && test "$program_prefix$program_suffix$program_transform_name" = \ NONENONEs,x,x, && program_prefix=${target_alias}- - target_alias=${target_alias-$host_alias} - case ${build_alias} in "") build_noncanonical=${build} ;; *) build_noncanonical=${build_alias} ;; @@ -12861,7 +12857,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12864 "configure" +#line 12860 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12967,7 +12963,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12970 "configure" +#line 12966 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/libsanitizer/configure.ac b/libsanitizer/configure.ac index 9699507038e8..6a3e09d29ab0 100644 --- a/libsanitizer/configure.ac +++ b/libsanitizer/configure.ac @@ -19,11 +19,8 @@ AC_MSG_RESULT($version_specific_libs) AC_USE_SYSTEM_EXTENSIONS -# Do not delete or change the following two lines. For why, see -# http://gcc.gnu.org/ml/libstdc++/2003-07/msg00451.html -AC_CANONICAL_SYSTEM +AC_CANONICAL_TARGET target_alias=${target_alias-$host_alias} -AC_SUBST(target_alias) GCC_LIBSTDCXX_RAW_CXX_FLAGS AM_INIT_AUTOMAKE(foreign no-dist) diff --git a/libssp/configure b/libssp/configure index 7728401ef71f..c3aea46d07ee 100755 --- a/libssp/configure +++ b/libssp/configure @@ -2427,7 +2427,6 @@ test -n "$target_alias" && test "$program_prefix$program_suffix$program_transform_name" = \ NONENONEs,x,x, && program_prefix=${target_alias}- - case ${build_alias} in "") build_noncanonical=${build} ;; *) build_noncanonical=${build_alias} ;; @@ -3108,7 +3107,6 @@ ac_config_commands="$ac_config_commands multilib" target_alias=${target_alias-$host_alias} - ac_config_headers="$ac_config_headers config.h" @@ -11543,7 +11541,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11546 "configure" +#line 11544 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11649,7 +11647,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11652 "configure" +#line 11650 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/libssp/configure.ac b/libssp/configure.ac index 81f6b0d0d416..d99a06e790c7 100644 --- a/libssp/configure.ac +++ b/libssp/configure.ac @@ -4,7 +4,7 @@ AC_INIT(libssp, 1.0) AC_CONFIG_SRCDIR(ssp.c) -AC_CANONICAL_SYSTEM +AC_CANONICAL_TARGET ACX_NONCANONICAL_TARGET AM_INIT_AUTOMAKE([no-dist]) @@ -27,7 +27,6 @@ GCC_NO_EXECUTABLES AM_ENABLE_MULTILIB(, ..) target_alias=${target_alias-$host_alias} -AC_SUBST(target_alias) AC_CONFIG_HEADERS(config.h) diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index f98e54607ab3..6d662798c271 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -3149,9 +3149,6 @@ ac_config_commands="$ac_config_commands multilib" # # Also, if v3 is being configured as part of a cross compiler, the top-level # configure script will pass the "real" host as $with_cross_host. -# -# Do not delete or change the following two lines. For why, see -# http://gcc.gnu.org/ml/libstdc++/2003-07/msg00451.html ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do if test -f "$ac_dir/install-sh"; then @@ -3291,7 +3288,6 @@ test -n "$target_alias" && test "$program_prefix$program_suffix$program_transform_name" = \ NONENONEs,x,x, && program_prefix=${target_alias}- - target_alias=${target_alias-$host_alias} # Handy for debugging: @@ -3331,7 +3327,7 @@ if test "x$with_headers" = "xno"; then fi -# Sets up automake. Must come after AC_CANONICAL_SYSTEM. Each of the +# Sets up automake. Must come after AC_CANONICAL_TARGET. Each of the # following is magically included in AUTOMAKE_OPTIONS in each Makefile.am. # 1.x: minimum required version # no-define: PACKAGE and VERSION will not be #define'd in config.h (a bunch @@ -12679,7 +12675,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12682 "configure" +#line 12678 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12785,7 +12781,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12788 "configure" +#line 12784 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -16475,7 +16471,7 @@ $as_echo "$glibcxx_cv_atomic_word" >&6; } # Fake what AC_COMPILE_IFELSE does. cat > conftest.$ac_ext << EOF -#line 16478 "configure" +#line 16474 "configure" #include "atomic_word.h" int main() { @@ -16622,7 +16618,7 @@ $as_echo "mutex" >&6; } # unnecessary for this test. cat > conftest.$ac_ext << EOF -#line 16625 "configure" +#line 16621 "configure" int main() { _Decimal32 d1; @@ -16663,7 +16659,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu # unnecessary for this test. cat > conftest.$ac_ext << EOF -#line 16666 "configure" +#line 16662 "configure" template<typename T1, typename T2> struct same { typedef T2 type; }; @@ -53630,7 +53626,7 @@ $as_echo "$glibcxx_cv_libbacktrace_atomics" >&6; } CXXFLAGS='-O0 -S' cat > conftest.$ac_ext << EOF -#line 53633 "configure" +#line 53629 "configure" #include <stddef.h> int main() { diff --git a/libstdc++-v3/configure.ac b/libstdc++-v3/configure.ac index a1f596a188d6..5436a00bc5c0 100644 --- a/libstdc++-v3/configure.ac +++ b/libstdc++-v3/configure.ac @@ -24,10 +24,7 @@ AM_ENABLE_MULTILIB(, ..) # # Also, if v3 is being configured as part of a cross compiler, the top-level # configure script will pass the "real" host as $with_cross_host. -# -# Do not delete or change the following two lines. For why, see -# http://gcc.gnu.org/ml/libstdc++/2003-07/msg00451.html -AC_CANONICAL_SYSTEM +AC_CANONICAL_TARGET target_alias=${target_alias-$host_alias} # Handy for debugging: @@ -67,7 +64,7 @@ if test "x$with_headers" = "xno"; then fi ]) -# Sets up automake. Must come after AC_CANONICAL_SYSTEM. Each of the +# Sets up automake. Must come after AC_CANONICAL_TARGET. Each of the # following is magically included in AUTOMAKE_OPTIONS in each Makefile.am. # 1.x: minimum required version # no-define: PACKAGE and VERSION will not be #define'd in config.h (a bunch diff --git a/libvtv/configure b/libvtv/configure index cde32057df54..9392c5020248 100755 --- a/libvtv/configure +++ b/libvtv/configure @@ -2445,8 +2445,6 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $version_specific_libs" >&5 $as_echo "$version_specific_libs" >&6; } -# Do not delete or change the following two lines. For why, see -# http://gcc.gnu.org/ml/libstdc++/2003-07/msg00451.html ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do if test -f "$ac_dir/install-sh"; then @@ -2586,9 +2584,7 @@ test -n "$target_alias" && test "$program_prefix$program_suffix$program_transform_name" = \ NONENONEs,x,x, && program_prefix=${target_alias}- - target_alias=${target_alias-$host_alias} - case ${build_alias} in "") build_noncanonical=${build} ;; *) build_noncanonical=${build_alias} ;; @@ -12755,7 +12751,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12758 "configure" +#line 12754 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12861,7 +12857,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12864 "configure" +#line 12860 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/libvtv/configure.ac b/libvtv/configure.ac index beacded64b8a..73fe531f2e5c 100644 --- a/libvtv/configure.ac +++ b/libvtv/configure.ac @@ -21,11 +21,8 @@ AC_ARG_ENABLE(version-specific-runtime-libs, [version_specific_libs=no]) AC_MSG_RESULT($version_specific_libs) -# Do not delete or change the following two lines. For why, see -# http://gcc.gnu.org/ml/libstdc++/2003-07/msg00451.html -AC_CANONICAL_SYSTEM +AC_CANONICAL_TARGET target_alias=${target_alias-$host_alias} -AC_SUBST(target_alias) GCC_LIBSTDCXX_RAW_CXX_FLAGS AC_USE_SYSTEM_EXTENSIONS
