Remove support for alternative Solaris 11.4 ld -V output
* configure.ac (ld_vers) <*-*-solaris2*>: Remove support for alternative Solaris 11.4 format. * configure: Regenerate. From-SVN: r272377
This commit is contained in:
parent
9a9c7a625d
commit
7cd4af82dc
|
@ -1,3 +1,9 @@
|
|||
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-17 Tom de Vries <tdevries@suse.de>
|
||||
|
||||
* config/nvptx/nvptx.md (define_insn "call_insn"): Rename to ...
|
||||
|
|
|
@ -23069,17 +23069,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
|
||||
|
|
|
@ -2684,17 +2684,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
|
||||
|
|
Loading…
Reference in New Issue