[gcc r12-10339] build: Allow for Xcode 15 ld -v output

[Iain D Sandoe via Gcc-cvs]

https://gcc.gnu.org/g:23fa5cdd4cd0feb6580e1451c3ad849b24cfa570

commit r12-10339-g23fa5cdd4cd0feb6580e1451c3ad849b24cfa570
Author: Rainer Orth <r...@cebitec.uni-bielefeld.de>
Date:   Thu Aug 17 10:14:49 2023 +0200

    build: Allow for Xcode 15 ld -v output
    
    Since Xcode 15 beta 6, ld -v output differs from previous versions:
    
    * macOS 13/Xcode 14:
    
      @(#)PROGRAM:ld  PROJECT:ld64-857.1
    
    * macOS 14/Xcode 15:
    
      @(#)PROGRAM:ld  PROJECT:dyld-1015.1
    
    configure cannot handle the new form, so LD64_VERSION isn't set.
    
    This patch fixes this.  The autoconf manual states that sed doesn't
    portably support alternation, so I'm using two separate expressions to
    extract the version number.
    
    Tested on x86_64-apple-darwin23.0.0.
    
    2023-08-16  Rainer Orth  <r...@cebitec.uni-bielefeld.de>
    
            gcc:
            * configure.ac (gcc_cv_ld64_version): Allow for dyld in ld -v
            output.
            * configure: Regenerate.
    
    (cherry picked from commit 0beac9209f0ae230b34ad31e76e7b0b633a5fb21)

Diff:
---
 gcc/configure    | 3 ++-
 gcc/configure.ac | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/gcc/configure b/gcc/configure
index 04acb3fb3a8..d62b03a75c9 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -30852,7 +30852,8 @@ $as_echo "$gcc_cv_ld64_major" >&6; }
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking linker version" >&5
 $as_echo_n "checking linker version... " >&6; }
     if test x"${gcc_cv_ld64_version}" = x; then
-      gcc_cv_ld64_version=`$gcc_cv_ld -v 2>&1 | grep ld64 | sed s/.*ld64-// | 
awk '{print $1}'`
+      gcc_cv_ld64_version=`$gcc_cv_ld -v 2>&1 | $EGREP 'ld64|dyld' \
+      | sed -e 's/.*ld64-//' -e 's/.*dyld-//'| awk '{print $1}'`
     fi
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_ld64_version" >&5
 $as_echo "$gcc_cv_ld64_version" >&6; }
diff --git a/gcc/configure.ac b/gcc/configure.ac
index 0fe8f4ad6fc..e387ffa8ed5 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -6406,7 +6406,8 @@ if test x"$ld64_flag" = x"yes"; then
     # If the version was not specified, try to find it.
     AC_MSG_CHECKING(linker version)
     if test x"${gcc_cv_ld64_version}" = x; then
-      gcc_cv_ld64_version=`$gcc_cv_ld -v 2>&1 | grep ld64 | sed s/.*ld64-// | 
awk '{print $1}'`
+      gcc_cv_ld64_version=`$gcc_cv_ld -v 2>&1 | $EGREP 'ld64|dyld' \
+      | sed -e 's/.*ld64-//' -e 's/.*dyld-//'| awk '{print $1}'`
     fi
     AC_MSG_RESULT($gcc_cv_ld64_version)