From patchwork Mon Jun 17 08:41:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rainer Orth X-Patchwork-Id: 1116882 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-503055-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=CeBiTec.Uni-Bielefeld.DE Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45S4TX5vxZz9s3l for ; Mon, 17 Jun 2019 18:42:23 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:subject:date:message-id:mime-version:content-type; q=dns; s= default; b=N+HvxuFCgNh+DhjNI9NTksZN8i+IsBuAQJAe5Tdz11FHchSYx0uKT OtqEOAmHe9JYCCno0dt8IAx4ZDKuKhFyqKEGoQ+vReYTBDuqPbVrTUlSQolJxRnA QyNxuvS5FQBMgI/Jq2xPeZFOFtjW9DFymph2jPeuef/dc9dxz1FhJg= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:subject:date:message-id:mime-version:content-type; s= default; bh=GAyP4Z9+a8y2tPJsPr6y42g/7gU=; b=THzLQuvawVacmEzZpbEF v9c+24wskB4G8cFTBtzkaSjmI41lOsarEv3Oqmi0PzzUzqcV2juVqEpzCHLtHS3m rgZR9FjpPMUcqVo9NV7OQoDVnmI8NrhHWvHRg37k2tnprCzo0qvYj4+/shEut+3L CM0LbVvMwsrME9TImlNEw48= Received: (qmail 39370 invoked by alias); 17 Jun 2019 08:42:15 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 39259 invoked by uid 89); 17 Jun 2019 08:42:15 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-11.4 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT autolearn=ham version=3.3.1 spammy=Biotechnology, bielefeld, biotechnology, Bielefeld X-HELO: smtp.CeBiTec.Uni-Bielefeld.DE Received: from smtp.CeBiTec.Uni-Bielefeld.DE (HELO smtp.CeBiTec.Uni-Bielefeld.DE) (129.70.160.84) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 17 Jun 2019 08:42:04 +0000 Received: from localhost (localhost.CeBiTec.Uni-Bielefeld.DE [127.0.0.1]) by smtp.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTP id 73AC48C8 for ; Mon, 17 Jun 2019 10:42:00 +0200 (CEST) Received: from smtp.CeBiTec.Uni-Bielefeld.DE ([127.0.0.1]) by localhost (malfoy.CeBiTec.Uni-Bielefeld.DE [127.0.0.1]) (amavisd-new, port 10024) with LMTP id xzIyqNKZNHyK for ; Mon, 17 Jun 2019 10:41:57 +0200 (CEST) Received: from itzacchiuatl.CeBiTec.Uni-Bielefeld.DE (itzacchiuatl.CeBiTec.Uni-Bielefeld.DE [129.70.161.157]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTPS id A17068C6 for ; Mon, 17 Jun 2019 10:41:57 +0200 (CEST) Received: (from ro@localhost) by itzacchiuatl.CeBiTec.Uni-Bielefeld.DE (8.15.2+Sun/8.15.2/Submit) id x5H8fp6H003869; Mon, 17 Jun 2019 10:41:51 +0200 (CEST) From: Rainer Orth To: gcc-patches@gcc.gnu.org Subject: [build] Remove support for alternative Solaris 11.4 ld -V output Date: Mon, 17 Jun 2019 10:41:51 +0200 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.2 (usg-unix-v) MIME-Version: 1.0 X-IsSubscribed: yes I've been informed that parsing of Solaris ld -V output doesn't work with Solaris sed. The problem is that the alternation used since [build] Cleanup Solaris linker version checks https://gcc.gnu.org/ml/gcc-patches/2017-11/msg00068.html isn't recognized by /usr/bin/sed and /usr/xpg4/bin/sed which can only handle BREs. This means that all features dependent on ld version checking aren't supported anymore. I hadn't recognized this before since I've been using GNU sed exclusively. While Illumos sed could work around this by using sed -E instead, which enables ERE support, this option isn't recognized by Solaris sed. Fortunately, the fix is simple: the alternative ld -V output format handled since the patch above never made it into a non-beta version of Solaris, and never will, so I'm just removing this again. Bootstrapped without regressions on i386-pc-solaris2.11 and sparc-sun-solaris2.11. Installed for mainline now; will backport to the gcc-9 and gcc-8 branches after some soak time. For good measure, I've also run Solaris bootstraps with /usr/bin in front of /usr/gnu/bin, but this issue was the only difference. Rainer # HG changeset patch # Parent 5e2355b076a745aef941612cd3fa7827279e9325 Remove support for alternative Solaris 11.4 ld -V output diff --git a/gcc/configure.ac b/gcc/configure.ac --- 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