Remove support for alternative Solaris 11.4 ld -V output

	Backport from mainline
	2019-06-17  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>

	* configure.ac (ld_vers) <*-*-solaris2*>: Remove support for
	alternative Solaris 11.4 format.
	* configure: Regenerate.

From-SVN: r272676

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5d58de6aec562a6fd6d1296faca30900db9702fd..7596c456e4b55aa6c29d27d1c708dd98ccfb0ceb 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2019-06-26  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+       Backport from mainline
+       2019-06-17  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+       * configure.ac (ld_vers) <*-*-solaris2*>: Remove support for
+       alternative Solaris 11.4 format.
+       * configure: Regenerate.
+
 2019-06-25  Claudiu Zissulescu  <claziss@synopsys.com>
 
        Backport from mainline

diff --git a/gcc/configure b/gcc/configure
index 3dcf7752b7f449e42128a468302842308cf13f01..481071b426519212f87ccac5088f952547c871ca 100755 (executable)
--- a/gcc/configure
+++ b/gcc/configure
@@ -23060,17 +23060,13 @@ if test $in_tree_ld != yes ; then
        #
        # ld: Software Generation Utilities - Solaris Link Editors: 5.11-1.1701:onnv-ab196087-6931056-03/25/10
        #
-       # In Solaris 11.4, this was changed to
-       #
-       # ld: Solaris ELF Utilities: 11.4-1.3123
-       #
        # ld and ld.so.1 are guaranteed to be updated in lockstep, so ld version
        # numbers can be used in ld.so.1 feature checks even if a different
        # linker is configured.
        ld_ver=`$gcc_cv_ld -V 2>&1`
-       if echo "$ld_ver" | $EGREP 'Solaris Link Editors|Solaris ELF Utilities' > /dev/null; then
+       if echo "$ld_ver" | grep 'Solaris Link Editors' > /dev/null; then
          ld_vers=`echo $ld_ver | sed -n \
-           -e 's,^.*: \(5\|1[0-9]\)\.[0-9][0-9]*-\([0-9]\.[0-9][0-9]*\).*$,\2,p'`
+           -e 's,^.*: 5\.[0-9][0-9]*-\([0-9]\.[0-9][0-9]*\).*$,\1,p'`
          ld_vers_major=`expr "$ld_vers" : '\([0-9]*\)'`
          ld_vers_minor=`expr "$ld_vers" : '[0-9]*\.\([0-9]*\)'`
        fi

diff --git a/gcc/configure.ac b/gcc/configure.ac
index 51f520c150842183d7a584acdf37a68701237364..ce2825580c68ebad8f98e8914a65feb35a47b803 100644 (file)
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -2673,17 +2673,13 @@ if test $in_tree_ld != yes ; then
        #
        # ld: Software Generation Utilities - Solaris Link Editors: 5.11-1.1701:onnv-ab196087-6931056-03/25/10
        #
-       # In Solaris 11.4, this was changed to
-       #
-       # ld: Solaris ELF Utilities: 11.4-1.3123
-       #
        # ld and ld.so.1 are guaranteed to be updated in lockstep, so ld version
        # numbers can be used in ld.so.1 feature checks even if a different
        # linker is configured.
        ld_ver=`$gcc_cv_ld -V 2>&1`
-       if echo "$ld_ver" | $EGREP 'Solaris Link Editors|Solaris ELF Utilities' > /dev/null; then
+       if echo "$ld_ver" | grep 'Solaris Link Editors' > /dev/null; then
          ld_vers=`echo $ld_ver | sed -n \
-           -e 's,^.*: \(5\|1[0-9]\)\.[0-9][0-9]*-\([0-9]\.[0-9][0-9]*\).*$,\2,p'`
+           -e 's,^.*: 5\.[0-9][0-9]*-\([0-9]\.[0-9][0-9]*\).*$,\1,p'`
          ld_vers_major=`expr "$ld_vers" : '\([0-9]*\)'`
          ld_vers_minor=`expr "$ld_vers" : '[0-9]*\.\([0-9]*\)'`
        fi