diff options
| author | Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> | 2019-06-17 08:30:16 +0000 |
|---|---|---|
| committer | Rainer Orth <ro@gcc.gnu.org> | 2019-06-17 08:30:16 +0000 |
| commit | 7cd4af82dc5737ced4e6affcb06204001e8e0205 (patch) | |
| tree | 00313aed9e35d1554b33d5ff3e06bf5a894b199e /gcc | |
| parent | 9a9c7a625d3813d062a6b17d071bd8cc9fe5cb8b (diff) | |
| download | gcc-7cd4af82dc5737ced4e6affcb06204001e8e0205.zip gcc-7cd4af82dc5737ced4e6affcb06204001e8e0205.tar.gz gcc-7cd4af82dc5737ced4e6affcb06204001e8e0205.tar.bz2 | |
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
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rwxr-xr-x | gcc/configure | 8 | ||||
| -rw-r--r-- | gcc/configure.ac | 8 |
3 files changed, 10 insertions, 12 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 6b893fd..7a2e420 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -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 ... diff --git a/gcc/configure b/gcc/configure index 43f595e..955e9cc 100755 --- a/gcc/configure +++ b/gcc/configure @@ -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 diff --git a/gcc/configure.ac b/gcc/configure.ac index cbc0c25..066a6f4 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -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 |