From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 0AyhJ3e1uWDxBAEAgWs5BA (envelope-from ) for ; Fri, 04 Jun 2021 07:09:11 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id OK8sI3e1uWDeLgAAbx9fmQ (envelope-from ) for ; Fri, 04 Jun 2021 05:09:11 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id C1E3827476 for ; Fri, 4 Jun 2021 07:09:10 +0200 (CEST) Received: from localhost ([::1]:55828 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lp24z-0002bg-EK for larch@yhetil.org; Fri, 04 Jun 2021 01:09:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57816) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lp24s-0002bH-WC for guix-patches@gnu.org; Fri, 04 Jun 2021 01:09:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33603) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lp24s-0006Kb-P9 for guix-patches@gnu.org; Fri, 04 Jun 2021 01:09:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lp24s-0000bx-Ks for guix-patches@gnu.org; Fri, 04 Jun 2021 01:09:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48825] [PATCH] gnu: Simplify the use of --with-long-double-128 on powerpc64le. Resent-From: Chris Marusich Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 04 Jun 2021 05:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 48825 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48825@debbugs.gnu.org Cc: Efraim Flashner X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16227832912266 (code B ref -1); Fri, 04 Jun 2021 05:09:02 +0000 Received: (at submit) by debbugs.gnu.org; 4 Jun 2021 05:08:11 +0000 Received: from localhost ([127.0.0.1]:45141 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lp243-0000aT-2w for submit@debbugs.gnu.org; Fri, 04 Jun 2021 01:08:11 -0400 Received: from lists.gnu.org ([209.51.188.17]:43322) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lp241-0000aH-Eo for submit@debbugs.gnu.org; Fri, 04 Jun 2021 01:08:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57714) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lp241-0002Z9-7i for guix-patches@gnu.org; Fri, 04 Jun 2021 01:08:09 -0400 Received: from mail-pj1-x102f.google.com ([2607:f8b0:4864:20::102f]:43957) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lp23z-0005lA-0a for guix-patches@gnu.org; Fri, 04 Jun 2021 01:08:08 -0400 Received: by mail-pj1-x102f.google.com with SMTP id l10-20020a17090a150ab0290162974722f2so5207913pja.2 for ; Thu, 03 Jun 2021 22:08:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:user-agent:mime-version; bh=foQjUA4JO1kMYlFfckZ0KigAMYaSC2VfOnjJQnr4exM=; b=IF7GacyU1KSaGP1+u0u/b5y/SvjCnc0QoHQR3ISU7UeI5x2U7ovfvYicD7ekodMkMQ eXZi/lIcXH2/1HOUuGfExqY0890lJLxrZv2PLwhvVR2ATL58Dt4H3TGaQC2EYze7xUMU aDuGmav3EphNXbCsdnO/X0ov3sdQpWlGrOLnSoEPZHwVpTISh7hVD8R56PxXXCTbFr9t 71zsQe6xtvuLsMFhLtr+FHdMKHSlyms5FQIxg8sgn8Wc5yybr9HCcykvr8lNmpEYMSSz p30SVimgP7kk2MYA16A3OlA3cT79lGj1bhWPDfmfRMznlTCf1qZmY7geHBERClJOc4j8 iR4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:user-agent :mime-version; bh=foQjUA4JO1kMYlFfckZ0KigAMYaSC2VfOnjJQnr4exM=; b=sSqGvcfbvypc/LmmZ/aqvYtQAsu2l7pUOisCych0VGj++HWjqbxfRQtpxOPdQr2VcF eNYQ/Dt19kN1gP/i9OO8rd+9fV8Ix/GZfAV2IK7xX1JZf0QRGGYGTA84qzqjfVoK7AuA uqBZ/QUQpifFBFFrWDg7QcsbTOlzOtfpkiTLVE+KnB8MgZ0aqFsm+wOwh7G8Nk09jUCQ ClbINHWXgtTk58HuQ789VS41ezw3Skgh16s78alhGntG7w/ewDI6oHEOcbrqdSlp2kih MtG7eT8/DCaq9rc+o01sV4CTWTLBgYDbcDpU1M/P/512/ZqlAbkdw4hxUB2BpL0uU0T/ MSIQ== X-Gm-Message-State: AOAM531eKuYE/f8MmyUWd2U2Yt1kek7cDsm/f1/1dThO59y+qacnkLnY H3IXMl4yNdC7JLb2yTa7aUDcJLu4UoA= X-Google-Smtp-Source: ABdhPJwsx1cycZU50dF+FyAeDI7804udIi6wNAkbR+V6dLSsxNdwKLbXN8s+PXDI49QJmnVfEBwTpg== X-Received: by 2002:a17:90a:8902:: with SMTP id u2mr2974538pjn.143.1622783285174; Thu, 03 Jun 2021 22:08:05 -0700 (PDT) Received: from garuda-lan ([2601:601:9d01:3f90::b043]) by smtp.gmail.com with ESMTPSA id 4sm689640pgn.31.2021.06.03.22.08.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Jun 2021 22:08:04 -0700 (PDT) From: Chris Marusich Date: Thu, 03 Jun 2021 22:08:00 -0700 Message-ID: <87o8cmtdxr.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" Received-SPF: pass client-ip=2607:f8b0:4864:20::102f; envelope-from=cmmarusich@gmail.com; helo=mail-pj1-x102f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1622783351; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:list-id:list-help:list-unsubscribe:list-subscribe: list-post:dkim-signature; bh=foQjUA4JO1kMYlFfckZ0KigAMYaSC2VfOnjJQnr4exM=; b=MWeQwQctRqpF0ePQsDzwT84HPhb90FFjaBlo5VRaKGvQNvS55YzEtZvaw2qkMQnKTGQ7bb xE62vh9ATc0xripuekcuzGIhDdFDpai8vvZcKU+Z41ICeoxiMH75ruaHTpDH1D2ZIwu9x2 cZJLuwxGf8FfjUBY5j7ZkCXu7f4juXChUM5VlJYFLlUGKMpYd7+AgX/krQDmrmd14npDOi 8v2VSeP23hBKF1EP9GLcrVaiwk/elX/Uvcu53d9QikyvKdsEMGjyKGZEKahNI3edjNxbr6 8547BB2hKG2b8KN5eHP0SAKKmHFkRZScPswGIoYEerejIJXvco/6sqUOnmVZlg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1622783351; a=rsa-sha256; cv=none; b=PDmJGZ9zDT5BrweOQxdKc2+b4Dz5pW1df+ZhHgiQGoZnQI1mwKXGhulz8o7kn0D+GXAyLy yRJZUXMHYisBpu4YDDfb202pdr7AcDvGcYxY1lCDtLS3fVOovt/Esggdu0GDHTbptycf/2 wsW3XSP/1bR1tIwiUHrFK97nI4BJuF4iuU55GjPc5YWtrPuQt6c0Coorz0ZFQ8ViiEHOK7 E5U8j22Q2rw4DcFdKcg3PbB1ijTGGyCDqKA4gSXHwxrT8ECDNu9MbPeRJXe9zDf2tKLg+E arwD9qq4w9ZFL6c+lho32yxnu5WaSn1dm6izqujLNdS8CCF1B0jCKCQZPhK9lw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20161025 header.b=IF7GacyU; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -0.93 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20161025 header.b=IF7GacyU; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: C1E3827476 X-Spam-Score: -0.93 X-Migadu-Scanner: scn1.migadu.com X-TUID: kKeLczpefAbi --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Hi, Currently in Guix, we explicitly specify --with-long-double-128 on powerpc64le-linux (and potentially other powerpc64-* systems) in two places. It turns out that this is not necessary. This patch simplifies our code. I originally authored this in order to try fixing bug 47698, but it didn't solve that problem, and it turns out the --with-long-double-128 option is probably unrelated to that bug. However, it's still worth making this change to simplify our code. If nobody has any issues with this, then in 2 weeks I will commit it. One question is: where should I commit it? I'd like to commit it to master, but it causes many rebuilds on powerpc64le-linux (it does not cause rebuilds on any other platforms), so per the guidelines ((guix) Submitting Patches) I ought to commit it to core-updates. However, because the glibc upgrade from 2.31 to 2.32 on core-updates causes many problems for powerpc64le-linux, core-updates has never once been a viable branch for powerpc64le-linux in the time since support was first added on master. So if I commit this patch to core-updates, it won't really do anyone any good right now. With all this in mind, I think master is the right place to commit this patch. =2D-=20 Chris --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-Simplify-the-use-of-with-long-double-128-on-powe.patch Content-Transfer-Encoding: quoted-printable From=20ad89f9f59d22cc10fbf7dd6f738ce15a6e79b640 Mon Sep 17 00:00:00 2001 From: Chris Marusich Date: Sat, 10 Apr 2021 18:16:17 -0700 Subject: [PATCH] gnu: Simplify the use of --with-long-double-128 on powerpc64le. In short, this change adds the "--with-long-double-128" configure option in one place and removes it from two other (now-redundant) places. It does not cause any rebuilds on systems other than powerpc64le-linux. * gnu/packages/gcc.scm (gcc-configure-flags-for-triplet): Add a clause for targets starting with "powerpc64le-" which adds the "--with-long-double-128" option. This causes any package using this procedure to be built using this new option on powerpc64le systems. In particular, this affects the gcc package and the gcc-final package, in addition to all the other versions of GCC defined in (gnu packages gcc). * gnu/packages/commencement.scm (gcc-boot0)[#:configure-flags]: Remove the code that adds the "--with-long-double-128" configure option for powerpc64l= e, since it is now redundant. The gcc-boot0 package uses (and adds to) the gcc package's configure options. This means that the above change in gcc.scm is sufficient to ensure that the gcc-boot0 package's configure options will include "--with-long-double-128" on powerpc64le systems. * gnu/packages/cross-base.scm (cross-gcc-arguments)[#:configure-flags]: Rem= ove the code that adds the "--with-long-double-128" configure option for powerpc64le, since it is now redundant. The cross-gcc-arguments procedure uses (and adds to) the configure options of its xgcc argument (a package). This means that regardless of which gcc from gcc.scm is used as the xgcc, t= he above change in gcc.scm is sufficient to ensure that the cross-gcc-arguments procedure's configure options will include "--with-long-double-128" on powerpc64le systems. =2D-- gnu/packages/commencement.scm | 7 ------- gnu/packages/cross-base.scm | 6 ------ gnu/packages/gcc.scm | 3 +++ 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index d4511ed914..db564db9c4 100644 =2D-- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2819,13 +2819,6 @@ exec " gcc "/bin/" program "--disable-shared" "--enable-languages=3Dc,c++" =20 =2D ;; boot-triplet inserts "guix" in the triplet. =2D ,@(if (equal? "powerpc64le-guix-linux-gnu" (b= oot-triplet)) =2D ;; On POWER9 (little endian) glibc need= s the =2D ;; 128-bit long double type. =2D '("--with-long-double-128") =2D '()) =2D ;; libstdc++ cannot be built at this stage ;; ("Link tests are not allowed after ;; GCC_NO_EXECUTABLES."). diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index 180594509b..c1e5f2eb79 100644 =2D-- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -153,12 +153,6 @@ base compiler and using LIBC (which may be either a li= bc package or #f.)" "--disable-decimal-float" ;would need libc "--disable-libcilkrts" =20 =2D ,@(if (string-prefix? "powerpc64le-" targe= t) =2D ;; On POWER9 (little endian) glibc ne= eds =2D ;; the 128-bit long double type. =2D '("--with-long-double-128") =2D '()) =2D ;; When target is any OS other than 'none' = these ;; libraries will fail if there is no libc ;; present. See diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index a412c93c29..22a0f35422 100644 =2D-- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -79,6 +79,9 @@ where the OS part is overloaded to denote a specific ABI-= --into GCC ;; Cilk has been removed from GCC 8 anyway. '("--disable-libcilkrts")) =20 + ((string-prefix? "powerpc64le-" target) + '("--with-long-double-128")) + (else ;; TODO: Add `arm.*-gnueabi', etc. '()))) =2D-=20 2.30.2 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJJBAEBCAAzFiEEy/WXVcvn5+/vGD+x3UCaFdgiRp0FAmC5tTAVHGNtbWFydXNp Y2hAZ21haWwuY29tAAoJEN1AmhXYIkadI2EP/0VfqYHZTEbOxY3ATiks/2HAtT6q MF/0FvZ24nA7zvAJV+8D9tUDLK6RJYR2Ttx6Dc/awmDgTzvIebn3o2O2zgLMbZ5a rck16+7qlEpSMIei77AXma+k44mGbc1enanHgJbo3KXEOD6EE4Kn6SmOvLCh9PUZ nAqNszOpwj87geBgViFGiQ/g55Br/LdC0ajsWKT6Wjg3Rk8PztZfnJKOoqF5aUGP MS6p5FHQ7UkEIBEkKGz68TV+DlIiQ9GcyKTmpdrglmZavBubgMHMmJaapf2MAETW WBJ4ZW75/dln9qTlsiAiJJnkg9Xk4mMcF2Wihl4hG7F9z4oI08mxKeqWPMjI8sC8 AatpNYOmrmVqhHe6LTFC1XWbb7oq+CL8TqNlJUHpw6c18/MTV/gJ7PQ8lXwIO4/3 FwTwFnpa2lFpib+u0eKao1LRexfWYiYjNd4cHPOdUry2ILDtZmH17pEFmMRmuFM/ 0n4YvWwTBabnFbfCwx4dJKTS1X+JJu4wySb/HgkxlxqPLsGqkZ06GkjciRb4nP4M JKd/KL3HL14ulRd/PF0+dg8vmHOhZftTBbLpYY4vIygFfSu3HBm9187/fca0h8n6 hFaLjCtRPh5eDYepPWUm/G7jtr/U1c9gIX5pang+SlLkXaHhYkLqbgw9uT0T5qns 3LaZqRd+9tZGcg0P =8DL3 -----END PGP SIGNATURE----- --==-=-=--