From patchwork Wed Aug 17 11:05:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jakub Jelinek X-Patchwork-Id: 572 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6a10:38f:b0:2d5:3c95:9e21 with SMTP id 15csp2571645pxh; Wed, 17 Aug 2022 04:06:23 -0700 (PDT) X-Google-Smtp-Source: AA6agR5XhP010hQgEgC4DwYAlpIOO4NzUTndIzj6zhf16xFP4WESIpm8KldKGGWKYgqVEBF/ASzP X-Received: by 2002:a05:6402:3495:b0:43d:d76e:e9ff with SMTP id v21-20020a056402349500b0043dd76ee9ffmr23195620edc.227.1660734383171; Wed, 17 Aug 2022 04:06:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660734383; cv=none; d=google.com; s=arc-20160816; b=VEO03u1G140anGTzzzE0iBii97m2ai+6yii3wTxOmJUSawjmlfLUjrDJ2Wx90oks1k Cvz9DoZthQ1fnC6qNtV3tSE1S7Ss/4q/BpfJ6FUfB0s+iIvsRWvxMpPUxwU3hOgm4KcO xdAnnORQdqxxDoEsRKECYZzMH1jU6CQN8HyPYL4Io2S56TKdIbfe9zyXoP2BVMm5rbEg zeb7fdbeD3oiQR6uMrjLCDehIHGIZPTYa6y3MRJUtdflPzrxxjEefRoxR8m8FPu2zqZr Qs2837VJySEecLuh5RD5fB4c4p+lFxUI9NUuSmPmxWaLfnrKsNz6D3DymWw9Ad5MWXA2 yLFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:reply-to:from:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:content-disposition:in-reply-to :mime-version:references:message-id:subject:to:date:dmarc-filter :delivered-to:dkim-signature:dkim-filter; bh=hdtL16YplqCdsVuMI3JFUWM/PPOBjo8FCR0NdHfKF24=; b=xNotOVgo/TKSetIOB6U0/HDoEbRIOvcXIiX7fks9E5XqW5gAHbUW7dgx2cfr3/9Ikj XkaAl/YXtGfycSpSP0pSBLy07UnysShtc5RkSZXnaOfndi07g+UZCZNk55/794LNhSMP 4P1a0ITAeLtaUSbHIonLJsg1/QlR5bKu4ZG8M26WHyVvWf8yAqVJ5qMdlXBOwugIbEbe JAzZSr58yoP7y6eH9gg+CyW/fBIHe22M8MPDIcOiTXgXw6D7sp9SuFnTCG345eWbdl+I 5cLfsLPxcZNx5C+pSevAlqlG8H9yE993VvYaLN9331XVoxLvkIA5AXgBAxbVMBZ53gEv OXjQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=kJwkqpgh; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id w21-20020a170906131500b0072ee7a299f5si10516029ejb.19.2022.08.17.04.06.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Aug 2022 04:06:23 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=kJwkqpgh; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id AB82C3858422 for ; Wed, 17 Aug 2022 11:06:21 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AB82C3858422 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1660734381; bh=hdtL16YplqCdsVuMI3JFUWM/PPOBjo8FCR0NdHfKF24=; h=Date:To:Subject:References:In-Reply-To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=kJwkqpghSw32QG4mkyFll8nT9Bg4W/5yBO2ILRjuyUyVj2Rcrn3bQC2tv+gjuAWBo oNQz66PHMe5xil82ws9QG2bmaM31dmJ60pdDRP9+1cYTuHiPj5IAiLbBEnN+zLJPjG r/ZLxyeIjaBDCqsmLkW4wuTa6eR4gASfEsqfMpQU= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 73A913858D1E for ; Wed, 17 Aug 2022 11:05:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 73A913858D1E Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-457-7mGuGxRiMMS8Fr3MLypG-A-1; Wed, 17 Aug 2022 07:05:34 -0400 X-MC-Unique: 7mGuGxRiMMS8Fr3MLypG-A-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7908B801755; Wed, 17 Aug 2022 11:05:34 +0000 (UTC) Received: from tucnak.zalov.cz (unknown [10.39.192.41]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 38874C15BB3; Wed, 17 Aug 2022 11:05:34 +0000 (UTC) Received: from tucnak.zalov.cz (localhost [127.0.0.1]) by tucnak.zalov.cz (8.17.1/8.17.1) with ESMTPS id 27HB5UdC3133157 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Wed, 17 Aug 2022 13:05:31 +0200 Received: (from jakub@localhost) by tucnak.zalov.cz (8.17.1/8.17.1/Submit) id 27HB5T4T3133156; Wed, 17 Aug 2022 13:05:29 +0200 Date: Wed, 17 Aug 2022 13:05:29 +0200 To: Mikael Morin Subject: [PATCH] fortran, v2: Add -static-libquadmath support [PR46539] Message-ID: References: MIME-Version: 1.0 In-Reply-To: X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline X-Spam-Status: No, score=-4.0 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Jakub Jelinek via Gcc-patches From: Jakub Jelinek Reply-To: Jakub Jelinek Cc: gcc-patches@gcc.gnu.org, fortran@gcc.gnu.org Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1741406217022241956?= X-GMAIL-MSGID: =?utf-8?q?1741406217022241956?= On Wed, Aug 17, 2022 at 10:28:29AM +0200, Mikael Morin wrote: > Tobias approved it already, but I spotted what looks like typos. > See below. Thanks for catching that. > > --- gcc/config/darwin.h.jj 2022-08-16 14:51:14.529544492 +0200 > > +++ gcc/config/darwin.h 2022-08-16 14:53:54.402460097 +0200 > > @@ -443,6 +443,7 @@ extern GTY(()) int darwin_ms_struct; > > %:replace-outfile(-lobjc libobjc-gnu.a%s); \ > > :%:replace-outfile(-lobjc -lobjc-gnu )}}\ > > %{static|static-libgcc|static-libgfortran:%:replace-outfile(-lgfortran libgfortran.a%s)}\ > > + %{static|static-libgcc|static-libgfortran:%:replace-outfile(-lquadmath libquadmath.a%s)}\ > > s/static-libgfortran/static-libquadmath/ I guess? Otherwise I don’t > understand the corresponding ChangeLog description. Yeah. I just copied this part from the 2014 patch and didn't spot that. > > + elif grep "conftest1.$ac_objext.* -aarchive_shared -lgfortran -adefault .*conftest2.$ac_objext" \ > > + conftest.cmd >/dev/null 2>&1; then > > + LQUADMATH="%{static-libquadmath:-aarchive_shared} -lquadmath %{static-libquadmath:-adefault}" > > + elif grep "conftest1.$ac_objext.* ligfortran.a .*conftest2.$ac_objext" \ > > s/ligfortran.a/libgfortran.a/ Indeed. Also removed the space before libgfortran.a because I'm not sure if it won't have because of the %s full path in front of that. This is Darwin only stuff. I must say I don't know if even this elif ... LQUADMATH part is needed, maybe replace-outfile will rename even the -lquadmath from the spec file. Here is an updated version (but nothing relevant to Linux changed, so there is no point for me to bootstrap/regtest it again): 2022-08-17 Francois-Xavier Coudert Jakub Jelinek PR fortran/46539 gcc/ * common.opt (static-libquadmath): New option. * gcc.c (driver_handle_option): Always accept -static-libquadmath. * config/darwin.h (LINK_SPEC): Handle -static-libquadmath. gcc/fortran/ * lang.opt (static-libquadmath): New option. * invoke.texi (-static-libquadmath): Document it. * options.c (gfc_handle_option): Error out if -static-libquadmath is passed but we do not support it. libgfortran/ * acinclude.m4 (LIBQUADSPEC): From $FC -static-libgfortran -### output determine -Bstatic/-Bdynamic, -bstatic/-bdynamic, -aarchive_shared/-adefault linker support or Darwin remapping of -lgfortran to libgfortran.a%s and use that around or instead of -lquadmath in LIBQUADSPEC. * configure: Regenerated. Jakub --- gcc/common.opt.jj 2022-06-27 11:18:02.050066582 +0200 +++ gcc/common.opt 2022-08-16 14:51:04.611673800 +0200 @@ -3601,6 +3601,10 @@ static-libphobos Driver ; Documented for D, but always accepted by driver. +static-libquadmath +Driver +; Documented for Fortran, but always accepted by driver. + static-libstdc++ Driver --- gcc/gcc.cc.jj 2022-08-11 09:57:24.765334380 +0200 +++ gcc/gcc.cc 2022-08-16 14:57:54.708327024 +0200 @@ -4585,12 +4585,14 @@ driver_handle_option (struct gcc_options case OPT_static_libgcc: case OPT_shared_libgcc: case OPT_static_libgfortran: + case OPT_static_libquadmath: case OPT_static_libphobos: case OPT_static_libstdc__: /* These are always valid, since gcc.cc itself understands the first two, gfortranspec.cc understands -static-libgfortran, - d-spec.cc understands -static-libphobos, and g++spec.cc - understands -static-libstdc++ */ + d-spec.cc understands -static-libphobos, g++spec.cc + understands -static-libstdc++ and libgfortran.spec handles + -static-libquadmath. */ validated = true; break; --- gcc/config/darwin.h.jj 2022-08-16 14:51:14.529544492 +0200 +++ gcc/config/darwin.h 2022-08-16 14:53:54.402460097 +0200 @@ -443,6 +443,7 @@ extern GTY(()) int darwin_ms_struct; %:replace-outfile(-lobjc libobjc-gnu.a%s); \ :%:replace-outfile(-lobjc -lobjc-gnu )}}\ %{static|static-libgcc|static-libgfortran:%:replace-outfile(-lgfortran libgfortran.a%s)}\ + %{static|static-libgcc|static-libquadmath:%:replace-outfile(-lquadmath libquadmath.a%s)}\ %{static|static-libgcc|static-libphobos:%:replace-outfile(-lgphobos libgphobos.a%s)}\ %{static|static-libgcc|static-libstdc++|static-libgfortran:%:replace-outfile(-lgomp libgomp.a%s)}\ %{static|static-libgcc|static-libstdc++:%:replace-outfile(-lstdc++ libstdc++.a%s)}\ --- gcc/fortran/lang.opt.jj 2022-02-04 14:36:55.050604670 +0100 +++ gcc/fortran/lang.opt 2022-08-16 14:52:52.459267705 +0200 @@ -863,6 +863,10 @@ static-libgfortran Fortran Statically link the GNU Fortran helper library (libgfortran). +static-libquadmath +Fortran +Statically link the GCC Quad-Precision Math Library (libquadmath). + std=f2003 Fortran Conform to the ISO Fortran 2003 standard. --- gcc/fortran/options.cc.jj 2022-01-18 11:58:59.568982256 +0100 +++ gcc/fortran/options.cc 2022-08-16 14:56:22.807525218 +0200 @@ -692,6 +692,13 @@ gfc_handle_option (size_t scode, const c #endif break; + case OPT_static_libquadmath: +#ifndef HAVE_LD_STATIC_DYNAMIC + gfc_fatal_error ("%<-static-libquadmath%> is not supported in this " + "configuration"); +#endif + break; + case OPT_fintrinsic_modules_path: case OPT_fintrinsic_modules_path_: --- gcc/fortran/invoke.texi.jj 2022-05-09 09:09:20.312473272 +0200 +++ gcc/fortran/invoke.texi 2022-08-16 16:12:47.638203577 +0200 @@ -170,7 +170,7 @@ and warnings}. @item Link Options @xref{Link Options,,Options for influencing the linking step}. -@gccoptlist{-static-libgfortran} +@gccoptlist{-static-libgfortran -static-libquadmath} @item Runtime Options @xref{Runtime Options,,Options for influencing runtime behavior}. @@ -1425,6 +1425,20 @@ configured, this option has no effect. @end table +@table @gcctabopt +@item -static-libquadmath +@opindex @code{static-libquadmath} +On systems that provide @file{libquadmath} as a shared and a static +library, this option forces the use of the static version. If no +shared version of @file{libquadmath} was built when the compiler was +configured, this option has no effect. + +Please note that the @file{libquadmath} runtime library is licensed under the +GNU Lesser General Public License (LGPL), and linking it statically introduces +requirements when redistributing the resulting binaries. +@end table + + @node Runtime Options @section Influencing runtime behavior @cindex options, runtime --- libgfortran/acinclude.m4.jj 2022-06-29 17:05:45.478790781 +0200 +++ libgfortran/acinclude.m4 2022-08-16 16:06:50.047814043 +0200 @@ -356,18 +356,39 @@ AC_DEFUN([LIBGFOR_CHECK_FLOAT128], [ ac_[]_AC_LANG_ABBREV[]_werror_flag=$ac_xsave_[]_AC_LANG_ABBREV[]_werror_flag ]) + dnl Determine -Bstatic ... -Bdynamic etc. support from gfortran -### stderr. + touch conftest1.$ac_objext conftest2.$ac_objext + LQUADMATH=-lquadmath + $FC -static-libgfortran -### -o conftest \ + conftest1.$ac_objext -lgfortran conftest2.$ac_objext 2>&1 >/dev/null \ + | grep "conftest1.$ac_objext.*conftest2.$ac_objext" > conftest.cmd + if grep "conftest1.$ac_objext.* -Bstatic -lgfortran -Bdynamic .*conftest2.$ac_objext" \ + conftest.cmd >/dev/null 2>&1; then + LQUADMATH="%{static-libquadmath:-Bstatic} -lquadmath %{static-libquadmath:-Bdynamic}" + elif grep "conftest1.$ac_objext.* -bstatic -lgfortran -bdynamic .*conftest2.$ac_objext" \ + conftest.cmd >/dev/null 2>&1; then + LQUADMATH="%{static-libquadmath:-bstatic} -lquadmath %{static-libquadmath:-bdynamic}" + elif grep "conftest1.$ac_objext.* -aarchive_shared -lgfortran -adefault .*conftest2.$ac_objext" \ + conftest.cmd >/dev/null 2>&1; then + LQUADMATH="%{static-libquadmath:-aarchive_shared} -lquadmath %{static-libquadmath:-adefault}" + elif grep "conftest1.$ac_objext.*libgfortran.a .*conftest2.$ac_objext" \ + conftest.cmd >/dev/null 2>&1; then + LQUADMATH="%{static-libquadmath:libquadmath.a%s;:-lquadmath}" + fi + rm -f conftest1.$ac_objext conftest2.$ac_objext conftest conftest.cmd + dnl For static libgfortran linkage, depend on libquadmath only if needed. dnl If using *f128 APIs from libc/libm, depend on libquadmath only if needed dnl even for dynamic libgfortran linkage, and don't link libgfortran against dnl -lquadmath. if test "x$libgfor_cv_have_as_needed" = xyes; then if test "x$USE_IEC_60559" = xyes; then - LIBQUADSPEC="$libgfor_cv_as_needed_option -lquadmath $libgfor_cv_no_as_needed_option" + LIBQUADSPEC="$libgfor_cv_as_needed_option $LQUADMATH $libgfor_cv_no_as_needed_option" else - LIBQUADSPEC="%{static-libgfortran:$libgfor_cv_as_needed_option} -lquadmath %{static-libgfortran:$libgfor_cv_no_as_needed_option}" + LIBQUADSPEC="%{static-libgfortran:$libgfor_cv_as_needed_option} $LQUADMATH %{static-libgfortran:$libgfor_cv_no_as_needed_option}" fi else - LIBQUADSPEC="-lquadmath" + LIBQUADSPEC="$LQUADMATH" fi if test "x$USE_IEC_60559" != xyes; then if test -f ../libquadmath/libquadmath.la; then --- libgfortran/configure.jj 2022-06-29 17:05:45.483790716 +0200 +++ libgfortran/configure 2022-08-16 16:06:54.119761574 +0200 @@ -30323,14 +30323,34 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libgfor_cv_have_as_needed" >&5 $as_echo "$libgfor_cv_have_as_needed" >&6; } + touch conftest1.$ac_objext conftest2.$ac_objext + LQUADMATH=-lquadmath + $FC -static-libgfortran -### -o conftest \ + conftest1.$ac_objext -lgfortran conftest2.$ac_objext 2>&1 >/dev/null \ + | grep "conftest1.$ac_objext.*conftest2.$ac_objext" > conftest.cmd + if grep "conftest1.$ac_objext.* -Bstatic -lgfortran -Bdynamic .*conftest2.$ac_objext" \ + conftest.cmd >/dev/null 2>&1; then + LQUADMATH="%{static-libquadmath:-Bstatic} -lquadmath %{static-libquadmath:-Bdynamic}" + elif grep "conftest1.$ac_objext.* -bstatic -lgfortran -bdynamic .*conftest2.$ac_objext" \ + conftest.cmd >/dev/null 2>&1; then + LQUADMATH="%{static-libquadmath:-bstatic} -lquadmath %{static-libquadmath:-bdynamic}" + elif grep "conftest1.$ac_objext.* -aarchive_shared -lgfortran -adefault .*conftest2.$ac_objext" \ + conftest.cmd >/dev/null 2>&1; then + LQUADMATH="%{static-libquadmath:-aarchive_shared} -lquadmath %{static-libquadmath:-adefault}" + elif grep "conftest1.$ac_objext.*libgfortran.a .*conftest2.$ac_objext" \ + conftest.cmd >/dev/null 2>&1; then + LQUADMATH="%{static-libquadmath:libquadmath.a%s;:-lquadmath}" + fi + rm -f conftest1.$ac_objext conftest2.$ac_objext conftest conftest.cmd + if test "x$libgfor_cv_have_as_needed" = xyes; then if test "x$USE_IEC_60559" = xyes; then - LIBQUADSPEC="$libgfor_cv_as_needed_option -lquadmath $libgfor_cv_no_as_needed_option" + LIBQUADSPEC="$libgfor_cv_as_needed_option $LQUADMATH $libgfor_cv_no_as_needed_option" else - LIBQUADSPEC="%{static-libgfortran:$libgfor_cv_as_needed_option} -lquadmath %{static-libgfortran:$libgfor_cv_no_as_needed_option}" + LIBQUADSPEC="%{static-libgfortran:$libgfor_cv_as_needed_option} $LQUADMATH %{static-libgfortran:$libgfor_cv_no_as_needed_option}" fi else - LIBQUADSPEC="-lquadmath" + LIBQUADSPEC="$LQUADMATH" fi if test "x$USE_IEC_60559" != xyes; then if test -f ../libquadmath/libquadmath.la; then