From patchwork Fri Apr 29 12:41:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rainer Orth X-Patchwork-Id: 616727 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 3qxCyW4kd3z9s8d for ; Fri, 29 Apr 2016 22:42:27 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=iKLqqL8y; dkim-atps=neutral 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:cc:subject:references:date:in-reply-to:message-id :mime-version:content-type; q=dns; s=default; b=pKfjhz4xCT0TK/03 sktTLeK+3qcWShzwgkRPMlD4wKIp2ZGSctYu3fPJN6kTOtZr0jb7UToqi/sqa2G+ 7bAKaUcQr8gCeqZFPVwoeAEty21raYQoHRs+qfKr7qSB+lnXF2Fm8nbUZxgRuaf3 0cAY26BhAG+W4MsOnFQKo/DqhVY= 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:cc:subject:references:date:in-reply-to:message-id :mime-version:content-type; s=default; bh=7byJPBmFeAib0QUQnw7OVt a6wto=; b=iKLqqL8yw2e3Og+FkXEO28NJM9e2bVWkA/KjAhlwFSCY0vu1zHbJW7 0nCMzifUatTOpuX5HK29Wp5sNK8DOIccEE/2jNUOQefzTDuX1NmAQMVVsuaO28fk bdzkER4DVzsdRM4vX1Pzq+ZoDyILNus+XnMfprdo+UJs2MeNatJok= Received: (qmail 112842 invoked by alias); 29 Apr 2016 12:42:18 -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 112828 invoked by uid 89); 29 Apr 2016 12:42:17 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.3 required=5.0 tests=AWL, BAYES_00, KAM_LAZY_DOMAIN_SECURITY, RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy=1797, 179, 7, weekends 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; Fri, 29 Apr 2016 12:42:07 +0000 Received: from localhost (localhost.CeBiTec.Uni-Bielefeld.DE [127.0.0.1]) by smtp.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTP id 1C9E013; Fri, 29 Apr 2016 14:42:05 +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 UZkjFJXr57u8; Fri, 29 Apr 2016 14:41:59 +0200 (CEST) Received: from lokon.CeBiTec.Uni-Bielefeld.DE (lokon.CeBiTec.Uni-Bielefeld.DE [129.70.161.110]) (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 27CC512; Fri, 29 Apr 2016 14:41:59 +0200 (CEST) Received: (from ro@localhost) by lokon.CeBiTec.Uni-Bielefeld.DE (8.15.2+Sun/8.15.2/Submit) id u3TCfw9N003141; Fri, 29 Apr 2016 14:41:58 +0200 (CEST) From: Rainer Orth To: "Dominique =?iso-8859-15?Q?d'Humi=E8res?=" Cc: Iain Sandoe , gcc-patches Subject: Re: Cilk Plus testsuite needs massive cleanup (PR testsuite/70595) References: <322D7B06-0EEE-4AB9-B649-B59840F590A3@lps.ens.fr> Date: Fri, 29 Apr 2016 14:41:58 +0200 In-Reply-To: <322D7B06-0EEE-4AB9-B649-B59840F590A3@lps.ens.fr> ("Dominique =?iso-8859-15?Q?d'Humi=E8res=22's?= message of "Fri, 29 Apr 2016 14:09:35 +0200") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (usg-unix-v) MIME-Version: 1.0 X-IsSubscribed: yes Hi Dominique, > Any reason why the dg-additional-options "*-lcilkrts" have been removed? > AFAICT they are needed for darwin. -fcilkplus does (and should) include -lcilkrts when linking. It certainly does on Solaris and Linux. Everything else is a usability nightmare: you don't need to link Fortran programs with $ gfortran -lgfortran -lquadmath do you? gcc.c (LINK_COMMAND_SPEC) has %{fcilkplus:%:include(libcilkrts.spec)%(link_cilkrts)}\ and the generated libcilkrts.spec on Darwin has *link_cilkrts: -lcilkrts %{static: } Unfortunately, the darwin.h almost-copy of LINK_COMMAND_SPEC lacks this. We should really find a way to better modularize this (and other) specs to avoid this error-prone duplication. The following patch (completely untested) adds the above line to its darwin.h counterpart. I'll give it a whirl myself in this weekend's bootstraps. Sorry about the breakage. Rainer 2016-04-29 Rainer Orth * config/darwin.h (LINK_COMMAND_SPEC_A): Handle -fcilkplus. # HG changeset patch # Parent 297a270669c098610ed0f7333b9a11ab4d3ef2bd Handle -fcilkplus in Mac OS X LINK_COMMAND_SPEC diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h --- a/gcc/config/darwin.h +++ b/gcc/config/darwin.h @@ -179,6 +179,7 @@ extern GTY(()) int darwin_ms_struct; %{L*} %(link_libgcc) %o %{fprofile-arcs|fprofile-generate*|coverage:-lgcov} \ %{fopenacc|fopenmp|%:gt(%{ftree-parallelize-loops=*:%*} 1): \ %{static|static-libgcc|static-libstdc++|static-libgfortran: libgomp.a%s; : -lgomp } } \ + %{fcilkplus:%:include(libcilkrts.spec)%(link_cilkrts)}\ %{fgnu-tm: \ %{static|static-libgcc|static-libstdc++|static-libgfortran: libitm.a%s; : -litm } } \ %{!nostdlib:%{!nodefaultlibs:\