On Thu, Oct 22, 2026 at 10:12 PM Sam James <[email protected]> wrote: > > Pietro Monteiro <[email protected]> writes: > > > Regtested on x86_64-linux-gnu with > > RUNTESTFLAGS="--target_board=unix\{-m32,-m64\}". > > OK for trunk? > > It looks good to me. Jeff, would you mind giving the stamp?
Ok. > > > > > -- >8 -- > > AC_PROG_LD was obsoleted on libtool commit > > 388b7626dcde775ab1f48ca69bd8fdd3d94d9b1a. > > > > Using the updated macro name everywhere also removes an extra > > execution of the code that checks for GNU ld. > > Before pushing, I'd say tag PR112422. > > > > > Update comments that reference AC_PROG_LD too. > > > > config/ChangeLog: > > > > * hwcaps.m4 (GCC_CHECK_LINKER_HWCAP): Update AC_PROG_LD to LT_PATH_LD. > > > > libatomic/ChangeLog: > > > > * acinclude.m4 (LIBAT_CHECK_LINKER_FEATURES): Update AC_PROG_LD to > > LT_PATH_LD. > > * configure: Regenerate. > > > > libgomp/ChangeLog: > > > > * acinclude.m4 (LIBGOMP_CHECK_LINKER_FEATURES): Update AC_PROG_LD to > > LT_PATH_LD. > > * configure: Regenerate. > > > > libitm/ChangeLog: > > > > * acinclude.m4 (LIBITM_CHECK_LINKER_FEATURES): Update AC_PROG_LD to > > LT_PATH_LD. > > * configure: Regenerate. > > > > libstdc++-v3/ChangeLog: > > > > * acinclude.m4 (GLIBCXX_CHECK_LINKER_FEATURES): Update AC_PROG_LD to > > LT_PATH_LD. > > * configure: Regenerate. > > > > Signed-off-by: Pietro Monteiro <[email protected]> > > --- > > config/hwcaps.m4 | 2 +- > > libatomic/acinclude.m4 | 4 +- > > libatomic/configure | 112 +------------------------------- > > libgomp/acinclude.m4 | 4 +- > > libgomp/configure | 112 +------------------------------- > > libitm/acinclude.m4 | 4 +- > > libitm/configure | 112 +------------------------------- > > libstdc++-v3/acinclude.m4 | 4 +- > > libstdc++-v3/configure | 130 +++----------------------------------- > > 9 files changed, 22 insertions(+), 462 deletions(-) > > > > diff --git a/config/hwcaps.m4 b/config/hwcaps.m4 > > index f3d03906447..aedbc4913fb 100644 > > --- a/config/hwcaps.m4 > > +++ b/config/hwcaps.m4 > > @@ -42,7 +42,7 @@ dnl LD (as a side effect of testing) > > dnl > > AC_DEFUN([GCC_CHECK_LINKER_HWCAP], [ > > test -z "$HWCAP_LDFLAGS" && HWCAP_LDFLAGS='' > > - AC_REQUIRE([AC_PROG_LD]) > > + AC_REQUIRE([LT_PATH_LD]) > > > > ac_save_LDFLAGS="$LDFLAGS" > > LDFLAGS="$LFLAGS -mclear-hwcap" > > diff --git a/libatomic/acinclude.m4 b/libatomic/acinclude.m4 > > index 04fc19e5fbb..5b34d17e0e3 100644 > > --- a/libatomic/acinclude.m4 > > +++ b/libatomic/acinclude.m4 > > @@ -300,7 +300,7 @@ AC_DEFUN([LIBAT_CHECK_LINKER_FEATURES], [ > > # by now (in libtool), but require it now just to be safe... > > test -z "$SECTION_LDFLAGS" && SECTION_LDFLAGS='' > > test -z "$OPT_LDFLAGS" && OPT_LDFLAGS='' > > - AC_REQUIRE([AC_PROG_LD]) > > + AC_REQUIRE([LT_PATH_LD]) > > AC_REQUIRE([AC_PROG_AWK]) > > > > # The name set by libtool depends on the version of libtool. Shame on us > > @@ -311,7 +311,7 @@ AC_DEFUN([LIBAT_CHECK_LINKER_FEATURES], [ > > # set (hence we're using an older libtool), then set it. > > if test x${with_gnu_ld+set} != xset; then > > if test x${ac_cv_prog_gnu_ld+set} != xset; then > > - # We got through "ac_require(ac_prog_ld)" and still not set? Huh? > > + # We got through "ac_require(lt_path_ld)" and still not set? Huh? > > with_gnu_ld=no > > else > > with_gnu_ld=$ac_cv_prog_gnu_ld > > diff --git a/libatomic/configure b/libatomic/configure > > index 00c29e71d79..ef8f57f41fa 100755 > > --- a/libatomic/configure > > +++ b/libatomic/configure > > @@ -15473,116 +15473,6 @@ fi > > > > # Check linker support. > > > > - > > -# Check whether --with-gnu-ld was given. > > -if test "${with_gnu_ld+set}" = set; then : > > - withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes > > -else > > - with_gnu_ld=no > > -fi > > - > > -ac_prog=ld > > -if test "$GCC" = yes; then > > - # Check if gcc -print-prog-name=ld gives a path. > > - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 > > -$as_echo_n "checking for ld used by $CC... " >&6; } > > - case $host in > > - *-*-mingw*) > > - # gcc leaves a trailing carriage return which upsets mingw > > - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; > > - *) > > - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; > > - esac > > - case $ac_prog in > > - # Accept absolute paths. > > - [\\/]* | ?:[\\/]*) > > - re_direlt='/[^/][^/]*/\.\./' > > - # Canonicalize the pathname of ld > > - ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` > > - while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do > > - ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` > > - done > > - test -z "$LD" && LD="$ac_prog" > > - ;; > > - "") > > - # If it fails, then pretend we aren't using GCC. > > - ac_prog=ld > > - ;; > > - *) > > - # If it is relative, then search for the first ld in PATH. > > - with_gnu_ld=unknown > > - ;; > > - esac > > -elif test "$with_gnu_ld" = yes; then > > - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 > > -$as_echo_n "checking for GNU ld... " >&6; } > > -else > > - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 > > -$as_echo_n "checking for non-GNU ld... " >&6; } > > -fi > > -if ${lt_cv_path_LD+:} false; then : > > - $as_echo_n "(cached) " >&6 > > -else > > - if test -z "$LD"; then > > - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR > > - for ac_dir in $PATH; do > > - IFS="$lt_save_ifs" > > - test -z "$ac_dir" && ac_dir=. > > - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; > > then > > - lt_cv_path_LD="$ac_dir/$ac_prog" > > - # Check to see if the program is GNU ld. I'd rather use --version, > > - # but apparently some variants of GNU ld only accept -v. > > - # Break only if it was the GNU/non-GNU ld that we prefer. > > - case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in > > - *GNU* | *'with BFD'*) > > - test "$with_gnu_ld" != no && break > > - ;; > > - *) > > - test "$with_gnu_ld" != yes && break > > - ;; > > - esac > > - fi > > - done > > - IFS="$lt_save_ifs" > > -else > > - lt_cv_path_LD="$LD" # Let the user override the test with a path. > > -fi > > -fi > > - > > -LD="$lt_cv_path_LD" > > -if test -n "$LD"; then > > - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 > > -$as_echo "$LD" >&6; } > > -else > > - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 > > -$as_echo "no" >&6; } > > -fi > > -test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" > > "$LINENO" 5 > > -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is > > GNU ld" >&5 > > -$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } > > -if ${lt_cv_prog_gnu_ld+:} false; then : > > - $as_echo_n "(cached) " >&6 > > -else > > - # I'd rather use --version here, but apparently some GNU lds only accept > > -v. > > -case `$LD -v 2>&1 </dev/null` in > > -*GNU* | *'with BFD'*) > > - lt_cv_prog_gnu_ld=yes > > - ;; > > -*) > > - lt_cv_prog_gnu_ld=no > > - ;; > > -esac > > -fi > > -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5 > > -$as_echo "$lt_cv_prog_gnu_ld" >&6; } > > -with_gnu_ld=$lt_cv_prog_gnu_ld > > - > > - > > - > > - > > - > > - > > - > > # If we're not using GNU ld, then there's no point in even trying these > > # tests. Check for that first. We should have already tested for gld > > # by now (in libtool), but require it now just to be safe... > > @@ -15599,7 +15489,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld > > # set (hence we're using an older libtool), then set it. > > if test x${with_gnu_ld+set} != xset; then > > if test x${ac_cv_prog_gnu_ld+set} != xset; then > > - # We got through "ac_require(ac_prog_ld)" and still not set? Huh? > > + # We got through "ac_require(lt_path_ld)" and still not set? Huh? > > with_gnu_ld=no > > else > > with_gnu_ld=$ac_cv_prog_gnu_ld > > diff --git a/libgomp/acinclude.m4 b/libgomp/acinclude.m4 > > index 4b81c23098d..086eb1a6248 100644 > > --- a/libgomp/acinclude.m4 > > +++ b/libgomp/acinclude.m4 > > @@ -123,7 +123,7 @@ AC_DEFUN([LIBGOMP_CHECK_LINKER_FEATURES], [ > > # by now (in libtool), but require it now just to be safe... > > test -z "$SECTION_LDFLAGS" && SECTION_LDFLAGS='' > > test -z "$OPT_LDFLAGS" && OPT_LDFLAGS='' > > - AC_REQUIRE([AC_PROG_LD]) > > + AC_REQUIRE([LT_PATH_LD]) > > AC_REQUIRE([AC_PROG_AWK]) > > > > # The name set by libtool depends on the version of libtool. Shame on us > > @@ -134,7 +134,7 @@ AC_DEFUN([LIBGOMP_CHECK_LINKER_FEATURES], [ > > # set (hence we're using an older libtool), then set it. > > if test x${with_gnu_ld+set} != xset; then > > if test x${ac_cv_prog_gnu_ld+set} != xset; then > > - # We got through "ac_require(ac_prog_ld)" and still not set? Huh? > > + # We got through "ac_require(lt_path_ld)" and still not set? Huh? > > with_gnu_ld=no > > else > > with_gnu_ld=$ac_cv_prog_gnu_ld > > diff --git a/libgomp/configure b/libgomp/configure > > index 75ac6131dc7..94ea7935d85 100755 > > --- a/libgomp/configure > > +++ b/libgomp/configure > > @@ -16325,116 +16325,6 @@ $as_echo "#define HAVE_ATTRIBUTE_ALIAS 1" > > >>confdefs.h > > > > fi > > > > - > > -# Check whether --with-gnu-ld was given. > > -if test "${with_gnu_ld+set}" = set; then : > > - withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes > > -else > > - with_gnu_ld=no > > -fi > > - > > -ac_prog=ld > > -if test "$GCC" = yes; then > > - # Check if gcc -print-prog-name=ld gives a path. > > - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 > > -$as_echo_n "checking for ld used by $CC... " >&6; } > > - case $host in > > - *-*-mingw*) > > - # gcc leaves a trailing carriage return which upsets mingw > > - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; > > - *) > > - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; > > - esac > > - case $ac_prog in > > - # Accept absolute paths. > > - [\\/]* | ?:[\\/]*) > > - re_direlt='/[^/][^/]*/\.\./' > > - # Canonicalize the pathname of ld > > - ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` > > - while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do > > - ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` > > - done > > - test -z "$LD" && LD="$ac_prog" > > - ;; > > - "") > > - # If it fails, then pretend we aren't using GCC. > > - ac_prog=ld > > - ;; > > - *) > > - # If it is relative, then search for the first ld in PATH. > > - with_gnu_ld=unknown > > - ;; > > - esac > > -elif test "$with_gnu_ld" = yes; then > > - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 > > -$as_echo_n "checking for GNU ld... " >&6; } > > -else > > - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 > > -$as_echo_n "checking for non-GNU ld... " >&6; } > > -fi > > -if ${lt_cv_path_LD+:} false; then : > > - $as_echo_n "(cached) " >&6 > > -else > > - if test -z "$LD"; then > > - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR > > - for ac_dir in $PATH; do > > - IFS="$lt_save_ifs" > > - test -z "$ac_dir" && ac_dir=. > > - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; > > then > > - lt_cv_path_LD="$ac_dir/$ac_prog" > > - # Check to see if the program is GNU ld. I'd rather use --version, > > - # but apparently some variants of GNU ld only accept -v. > > - # Break only if it was the GNU/non-GNU ld that we prefer. > > - case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in > > - *GNU* | *'with BFD'*) > > - test "$with_gnu_ld" != no && break > > - ;; > > - *) > > - test "$with_gnu_ld" != yes && break > > - ;; > > - esac > > - fi > > - done > > - IFS="$lt_save_ifs" > > -else > > - lt_cv_path_LD="$LD" # Let the user override the test with a path. > > -fi > > -fi > > - > > -LD="$lt_cv_path_LD" > > -if test -n "$LD"; then > > - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 > > -$as_echo "$LD" >&6; } > > -else > > - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 > > -$as_echo "no" >&6; } > > -fi > > -test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" > > "$LINENO" 5 > > -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is > > GNU ld" >&5 > > -$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } > > -if ${lt_cv_prog_gnu_ld+:} false; then : > > - $as_echo_n "(cached) " >&6 > > -else > > - # I'd rather use --version here, but apparently some GNU lds only accept > > -v. > > -case `$LD -v 2>&1 </dev/null` in > > -*GNU* | *'with BFD'*) > > - lt_cv_prog_gnu_ld=yes > > - ;; > > -*) > > - lt_cv_prog_gnu_ld=no > > - ;; > > -esac > > -fi > > -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5 > > -$as_echo "$lt_cv_prog_gnu_ld" >&6; } > > -with_gnu_ld=$lt_cv_prog_gnu_ld > > - > > - > > - > > - > > - > > - > > - > > # If we're not using GNU ld, then there's no point in even trying these > > # tests. Check for that first. We should have already tested for gld > > # by now (in libtool), but require it now just to be safe... > > @@ -16451,7 +16341,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld > > # set (hence we're using an older libtool), then set it. > > if test x${with_gnu_ld+set} != xset; then > > if test x${ac_cv_prog_gnu_ld+set} != xset; then > > - # We got through "ac_require(ac_prog_ld)" and still not set? Huh? > > + # We got through "ac_require(lt_path_ld)" and still not set? Huh? > > with_gnu_ld=no > > else > > with_gnu_ld=$ac_cv_prog_gnu_ld > > diff --git a/libitm/acinclude.m4 b/libitm/acinclude.m4 > > index 98ac55c0ff9..d46d44d1bb7 100644 > > --- a/libitm/acinclude.m4 > > +++ b/libitm/acinclude.m4 > > @@ -231,7 +231,7 @@ AC_DEFUN([LIBITM_CHECK_LINKER_FEATURES], [ > > # by now (in libtool), but require it now just to be safe... > > test -z "$SECTION_LDFLAGS" && SECTION_LDFLAGS='' > > test -z "$OPT_LDFLAGS" && OPT_LDFLAGS='' > > - AC_REQUIRE([AC_PROG_LD]) > > + AC_REQUIRE([LT_PATH_LD]) > > AC_REQUIRE([AC_PROG_AWK]) > > > > # The name set by libtool depends on the version of libtool. Shame on us > > @@ -242,7 +242,7 @@ AC_DEFUN([LIBITM_CHECK_LINKER_FEATURES], [ > > # set (hence we're using an older libtool), then set it. > > if test x${with_gnu_ld+set} != xset; then > > if test x${ac_cv_prog_gnu_ld+set} != xset; then > > - # We got through "ac_require(ac_prog_ld)" and still not set? Huh? > > + # We got through "ac_require(lt_path_ld)" and still not set? Huh? > > with_gnu_ld=no > > else > > with_gnu_ld=$ac_cv_prog_gnu_ld > > diff --git a/libitm/configure b/libitm/configure > > index 9014085a00c..b951ac6f598 100755 > > --- a/libitm/configure > > +++ b/libitm/configure > > @@ -17054,116 +17054,6 @@ $as_echo "#define HAVE_ATTRIBUTE_ALIAS 1" > > >>confdefs.h > > > > # Check linker hardware capability support. > > > > - > > -# Check whether --with-gnu-ld was given. > > -if test "${with_gnu_ld+set}" = set; then : > > - withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes > > -else > > - with_gnu_ld=no > > -fi > > - > > -ac_prog=ld > > -if test "$GCC" = yes; then > > - # Check if gcc -print-prog-name=ld gives a path. > > - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 > > -$as_echo_n "checking for ld used by $CC... " >&6; } > > - case $host in > > - *-*-mingw*) > > - # gcc leaves a trailing carriage return which upsets mingw > > - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; > > - *) > > - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; > > - esac > > - case $ac_prog in > > - # Accept absolute paths. > > - [\\/]* | ?:[\\/]*) > > - re_direlt='/[^/][^/]*/\.\./' > > - # Canonicalize the pathname of ld > > - ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` > > - while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do > > - ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` > > - done > > - test -z "$LD" && LD="$ac_prog" > > - ;; > > - "") > > - # If it fails, then pretend we aren't using GCC. > > - ac_prog=ld > > - ;; > > - *) > > - # If it is relative, then search for the first ld in PATH. > > - with_gnu_ld=unknown > > - ;; > > - esac > > -elif test "$with_gnu_ld" = yes; then > > - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 > > -$as_echo_n "checking for GNU ld... " >&6; } > > -else > > - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 > > -$as_echo_n "checking for non-GNU ld... " >&6; } > > -fi > > -if ${lt_cv_path_LD+:} false; then : > > - $as_echo_n "(cached) " >&6 > > -else > > - if test -z "$LD"; then > > - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR > > - for ac_dir in $PATH; do > > - IFS="$lt_save_ifs" > > - test -z "$ac_dir" && ac_dir=. > > - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; > > then > > - lt_cv_path_LD="$ac_dir/$ac_prog" > > - # Check to see if the program is GNU ld. I'd rather use --version, > > - # but apparently some variants of GNU ld only accept -v. > > - # Break only if it was the GNU/non-GNU ld that we prefer. > > - case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in > > - *GNU* | *'with BFD'*) > > - test "$with_gnu_ld" != no && break > > - ;; > > - *) > > - test "$with_gnu_ld" != yes && break > > - ;; > > - esac > > - fi > > - done > > - IFS="$lt_save_ifs" > > -else > > - lt_cv_path_LD="$LD" # Let the user override the test with a path. > > -fi > > -fi > > - > > -LD="$lt_cv_path_LD" > > -if test -n "$LD"; then > > - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 > > -$as_echo "$LD" >&6; } > > -else > > - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 > > -$as_echo "no" >&6; } > > -fi > > -test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" > > "$LINENO" 5 > > -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is > > GNU ld" >&5 > > -$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } > > -if ${lt_cv_prog_gnu_ld+:} false; then : > > - $as_echo_n "(cached) " >&6 > > -else > > - # I'd rather use --version here, but apparently some GNU lds only accept > > -v. > > -case `$LD -v 2>&1 </dev/null` in > > -*GNU* | *'with BFD'*) > > - lt_cv_prog_gnu_ld=yes > > - ;; > > -*) > > - lt_cv_prog_gnu_ld=no > > - ;; > > -esac > > -fi > > -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5 > > -$as_echo "$lt_cv_prog_gnu_ld" >&6; } > > -with_gnu_ld=$lt_cv_prog_gnu_ld > > - > > - > > - > > - > > - > > - > > - > > test -z "$HWCAP_LDFLAGS" && HWCAP_LDFLAGS='' > > > > > > @@ -17233,7 +17123,7 @@ fi > > # set (hence we're using an older libtool), then set it. > > if test x${with_gnu_ld+set} != xset; then > > if test x${ac_cv_prog_gnu_ld+set} != xset; then > > - # We got through "ac_require(ac_prog_ld)" and still not set? Huh? > > + # We got through "ac_require(lt_path_ld)" and still not set? Huh? > > with_gnu_ld=no > > else > > with_gnu_ld=$ac_cv_prog_gnu_ld > > diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 > > index 9315c5e074b..8b4ccc1e692 100644 > > --- a/libstdc++-v3/acinclude.m4 > > +++ b/libstdc++-v3/acinclude.m4 > > @@ -190,7 +190,7 @@ AC_DEFUN([GLIBCXX_CHECK_LINKER_FEATURES], [ > > # by now (in libtool), but require it now just to be safe... > > test -z "$SECTION_LDFLAGS" && SECTION_LDFLAGS='' > > test -z "$OPT_LDFLAGS" && OPT_LDFLAGS='' > > - AC_REQUIRE([AC_PROG_LD]) > > + AC_REQUIRE([LT_PATH_LD]) > > AC_REQUIRE([AC_PROG_AWK]) > > > > # The name set by libtool depends on the version of libtool. Shame on us > > @@ -201,7 +201,7 @@ AC_DEFUN([GLIBCXX_CHECK_LINKER_FEATURES], [ > > # set (hence we're using an older libtool), then set it. > > if test x${with_gnu_ld+set} != xset; then > > if test x${ac_cv_prog_gnu_ld+set} != xset; then > > - # We got through "ac_require(ac_prog_ld)" and still not set? Huh? > > + # We got through "ac_require(lt_path_ld)" and still not set? Huh? > > with_gnu_ld=no > > else > > with_gnu_ld=$ac_cv_prog_gnu_ld > > diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure > > index b8eb29f4f0f..f98e54607ab 100755 > > --- a/libstdc++-v3/configure > > +++ b/libstdc++-v3/configure > > @@ -22966,116 +22966,6 @@ if $GLIBCXX_IS_NATIVE; then > > CANADIAN=no > > > > > > - > > -# Check whether --with-gnu-ld was given. > > -if test "${with_gnu_ld+set}" = set; then : > > - withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes > > -else > > - with_gnu_ld=no > > -fi > > - > > -ac_prog=ld > > -if test "$GCC" = yes; then > > - # Check if gcc -print-prog-name=ld gives a path. > > - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 > > -$as_echo_n "checking for ld used by $CC... " >&6; } > > - case $host in > > - *-*-mingw*) > > - # gcc leaves a trailing carriage return which upsets mingw > > - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; > > - *) > > - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; > > - esac > > - case $ac_prog in > > - # Accept absolute paths. > > - [\\/]* | ?:[\\/]*) > > - re_direlt='/[^/][^/]*/\.\./' > > - # Canonicalize the pathname of ld > > - ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` > > - while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do > > - ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` > > - done > > - test -z "$LD" && LD="$ac_prog" > > - ;; > > - "") > > - # If it fails, then pretend we aren't using GCC. > > - ac_prog=ld > > - ;; > > - *) > > - # If it is relative, then search for the first ld in PATH. > > - with_gnu_ld=unknown > > - ;; > > - esac > > -elif test "$with_gnu_ld" = yes; then > > - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 > > -$as_echo_n "checking for GNU ld... " >&6; } > > -else > > - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 > > -$as_echo_n "checking for non-GNU ld... " >&6; } > > -fi > > -if ${lt_cv_path_LD+:} false; then : > > - $as_echo_n "(cached) " >&6 > > -else > > - if test -z "$LD"; then > > - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR > > - for ac_dir in $PATH; do > > - IFS="$lt_save_ifs" > > - test -z "$ac_dir" && ac_dir=. > > - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; > > then > > - lt_cv_path_LD="$ac_dir/$ac_prog" > > - # Check to see if the program is GNU ld. I'd rather use --version, > > - # but apparently some variants of GNU ld only accept -v. > > - # Break only if it was the GNU/non-GNU ld that we prefer. > > - case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in > > - *GNU* | *'with BFD'*) > > - test "$with_gnu_ld" != no && break > > - ;; > > - *) > > - test "$with_gnu_ld" != yes && break > > - ;; > > - esac > > - fi > > - done > > - IFS="$lt_save_ifs" > > -else > > - lt_cv_path_LD="$LD" # Let the user override the test with a path. > > -fi > > -fi > > - > > -LD="$lt_cv_path_LD" > > -if test -n "$LD"; then > > - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 > > -$as_echo "$LD" >&6; } > > -else > > - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 > > -$as_echo "no" >&6; } > > -fi > > -test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" > > "$LINENO" 5 > > -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is > > GNU ld" >&5 > > -$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } > > -if ${lt_cv_prog_gnu_ld+:} false; then : > > - $as_echo_n "(cached) " >&6 > > -else > > - # I'd rather use --version here, but apparently some GNU lds only accept > > -v. > > -case `$LD -v 2>&1 </dev/null` in > > -*GNU* | *'with BFD'*) > > - lt_cv_prog_gnu_ld=yes > > - ;; > > -*) > > - lt_cv_prog_gnu_ld=no > > - ;; > > -esac > > -fi > > -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5 > > -$as_echo "$lt_cv_prog_gnu_ld" >&6; } > > -with_gnu_ld=$lt_cv_prog_gnu_ld > > - > > - > > - > > - > > - > > - > > - > > # If we're not using GNU ld, then there's no point in even trying these > > # tests. Check for that first. We should have already tested for gld > > # by now (in libtool), but require it now just to be safe... > > @@ -23092,7 +22982,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld > > # set (hence we're using an older libtool), then set it. > > if test x${with_gnu_ld+set} != xset; then > > if test x${ac_cv_prog_gnu_ld+set} != xset; then > > - # We got through "ac_require(ac_prog_ld)" and still not set? Huh? > > + # We got through "ac_require(lt_path_ld)" and still not set? Huh? > > with_gnu_ld=no > > else > > with_gnu_ld=$ac_cv_prog_gnu_ld > > @@ -29021,7 +28911,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu > > # set (hence we're using an older libtool), then set it. > > if test x${with_gnu_ld+set} != xset; then > > if test x${ac_cv_prog_gnu_ld+set} != xset; then > > - # We got through "ac_require(ac_prog_ld)" and still not set? Huh? > > + # We got through "ac_require(lt_path_ld)" and still not set? Huh? > > with_gnu_ld=no > > else > > with_gnu_ld=$ac_cv_prog_gnu_ld > > @@ -32155,7 +32045,7 @@ done > > # set (hence we're using an older libtool), then set it. > > if test x${with_gnu_ld+set} != xset; then > > if test x${ac_cv_prog_gnu_ld+set} != xset; then > > - # We got through "ac_require(ac_prog_ld)" and still not set? Huh? > > + # We got through "ac_require(lt_path_ld)" and still not set? Huh? > > with_gnu_ld=no > > else > > with_gnu_ld=$ac_cv_prog_gnu_ld > > @@ -38280,7 +38170,7 @@ done > > # set (hence we're using an older libtool), then set it. > > if test x${with_gnu_ld+set} != xset; then > > if test x${ac_cv_prog_gnu_ld+set} != xset; then > > - # We got through "ac_require(ac_prog_ld)" and still not set? Huh? > > + # We got through "ac_require(lt_path_ld)" and still not set? Huh? > > with_gnu_ld=no > > else > > with_gnu_ld=$ac_cv_prog_gnu_ld > > @@ -38571,7 +38461,7 @@ done > > # set (hence we're using an older libtool), then set it. > > if test x${with_gnu_ld+set} != xset; then > > if test x${ac_cv_prog_gnu_ld+set} != xset; then > > - # We got through "ac_require(ac_prog_ld)" and still not set? Huh? > > + # We got through "ac_require(lt_path_ld)" and still not set? Huh? > > with_gnu_ld=no > > else > > with_gnu_ld=$ac_cv_prog_gnu_ld > > @@ -39038,7 +38928,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu > > # set (hence we're using an older libtool), then set it. > > if test x${with_gnu_ld+set} != xset; then > > if test x${ac_cv_prog_gnu_ld+set} != xset; then > > - # We got through "ac_require(ac_prog_ld)" and still not set? Huh? > > + # We got through "ac_require(lt_path_ld)" and still not set? Huh? > > with_gnu_ld=no > > else > > with_gnu_ld=$ac_cv_prog_gnu_ld > > @@ -42435,7 +42325,7 @@ done > > # set (hence we're using an older libtool), then set it. > > if test x${with_gnu_ld+set} != xset; then > > if test x${ac_cv_prog_gnu_ld+set} != xset; then > > - # We got through "ac_require(ac_prog_ld)" and still not set? Huh? > > + # We got through "ac_require(lt_path_ld)" and still not set? Huh? > > with_gnu_ld=no > > else > > with_gnu_ld=$ac_cv_prog_gnu_ld > > @@ -45785,7 +45675,7 @@ $as_echo "#define HAVE_TLS 1" >>confdefs.h > > # set (hence we're using an older libtool), then set it. > > if test x${with_gnu_ld+set} != xset; then > > if test x${ac_cv_prog_gnu_ld+set} != xset; then > > - # We got through "ac_require(ac_prog_ld)" and still not set? Huh? > > + # We got through "ac_require(lt_path_ld)" and still not set? Huh? > > with_gnu_ld=no > > else > > with_gnu_ld=$ac_cv_prog_gnu_ld > > @@ -46001,7 +45891,7 @@ done > > # set (hence we're using an older libtool), then set it. > > if test x${with_gnu_ld+set} != xset; then > > if test x${ac_cv_prog_gnu_ld+set} != xset; then > > - # We got through "ac_require(ac_prog_ld)" and still not set? Huh? > > + # We got through "ac_require(lt_path_ld)" and still not set? Huh? > > with_gnu_ld=no > > else > > with_gnu_ld=$ac_cv_prog_gnu_ld > > @@ -53740,7 +53630,7 @@ $as_echo "$glibcxx_cv_libbacktrace_atomics" >&6; } > > CXXFLAGS='-O0 -S' > > > > cat > conftest.$ac_ext << EOF > > -#line 53743 "configure" > > +#line 53633 "configure" > > #include <stddef.h> > > int main() > > {
