From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id NRg9IxuEvGDmcQEAgWs5BA (envelope-from ) for ; Sun, 06 Jun 2021 10:15:23 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id eL04HhuEvGAVGQAAB5/wlQ (envelope-from ) for ; Sun, 06 Jun 2021 08:15:23 +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 CD1AE27302 for ; Sun, 6 Jun 2021 10:15:22 +0200 (CEST) Received: from localhost ([::1]:32998 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lpnwH-0004KW-Om for larch@yhetil.org; Sun, 06 Jun 2021 04:15:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58108) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lpnvz-0004KO-28 for guix-patches@gnu.org; Sun, 06 Jun 2021 04:15:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39012) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lpnvy-00060Y-Rj for guix-patches@gnu.org; Sun, 06 Jun 2021 04:15:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lpnvy-0001ni-HS for guix-patches@gnu.org; Sun, 06 Jun 2021 04:15: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: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 06 Jun 2021 08:15:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48825 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Chris Marusich Cc: 48825@debbugs.gnu.org X-Debbugs-Original-Cc: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16229672486847 (code B ref -1); Sun, 06 Jun 2021 08:15:02 +0000 Received: (at submit) by debbugs.gnu.org; 6 Jun 2021 08:14:08 +0000 Received: from localhost ([127.0.0.1]:50558 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lpnv6-0001mN-Cy for submit@debbugs.gnu.org; Sun, 06 Jun 2021 04:14:08 -0400 Received: from lists.gnu.org ([209.51.188.17]:48730) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lpnv4-0001mF-7b for submit@debbugs.gnu.org; Sun, 06 Jun 2021 04:14:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58080) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lpnv4-0004HV-0O for guix-patches@gnu.org; Sun, 06 Jun 2021 04:14:06 -0400 Received: from flashner.co.il ([178.62.234.194]:53272) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lpnv1-00059j-VF for guix-patches@gnu.org; Sun, 06 Jun 2021 04:14:05 -0400 Received: from localhost (unknown [31.210.177.125]) by flashner.co.il (Postfix) with ESMTPSA id 62E45402D0; Sun, 6 Jun 2021 08:13:31 +0000 (UTC) Date: Sun, 6 Jun 2021 11:12:59 +0300 From: Efraim Flashner Message-ID: Mail-Followup-To: Chris Marusich , guix-patches@gnu.org References: <87o8cmtdxr.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="1dbK/XcJ4chkIrb0" Content-Disposition: inline In-Reply-To: <87o8cmtdxr.fsf@gmail.com> X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Received-SPF: pass client-ip=178.62.234.194; envelope-from=efraim@flashner.co.il; helo=flashner.co.il X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-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=1622967323; 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:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post; bh=d6OafPKcHO2NREhaz70XaIJmkuA9Lb+TSj2MKaTsv7U=; b=O4XZtDmI3c0T6YTsVN0zgaIBRL2iXKv/5c4siTKm/AXAjwYIvbZYv+fJUNl3Vd9Xw+q68/ x/3tLJpr1xWndRWdf9zBHJDaBXOwhCzsjYBsfnqxgWv+O+XUjwe5BJkUuvTQCBXiRS9nCN BQIgFBzVHkst0Uud88dJ+WYMY67s/vb4ZkBbX2KDRP9mO+gylHt8ebdfqpS/jErT4RzLac zm+UU93OF80VBA06A6ExKMfd76vmwzTYnHbV8dPdu50CT5k/wqAlSN6Cgyqc31Mh5W4vqQ MNYfTlv+xR6NoBftvZeTgP/f8OGHjCLnwND97BxemyNg5becnGfRz6YiZ+yCxg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1622967323; a=rsa-sha256; cv=none; b=rUxLfhFvJwyd42RDZ3YxhspHRAZi677nkXsXVc2OGUZTZwdkZ9VvK72pd6AA91wZoMd4+f jXP1urxyvPZKdqPS7xvYr9cMUVkCTwNXJBAB3mlr7eDHd7n2x4z25+Pt1RDR59+9rzItLI tEIbFjulGZcywG8tvnjhyvJenUdY4ZfwFYst/1syt+b9uOr3+mhokyQHAL6QyUI1RnjDz0 THPPHk73E9ww3CV22kZtN308BdhIb5DKb8oOw8uoguRlMW0Row0AmTojZegCcsyxThoUAt 4jqgBZJKn9gLxIUBVVV9Hu9VkHjgau8BC+jt3NPCFi33j7L281VTGJjo+Ugn9Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=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: -4.03 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=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: CD1AE27302 X-Spam-Score: -4.03 X-Migadu-Scanner: scn1.migadu.com X-TUID: 3ISUyw1Ury1W --1dbK/XcJ4chkIrb0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Jun 03, 2021 at 10:08:00PM -0700, Chris Marusich wrote: > Hi, >=20 > 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. >=20 > 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. >=20 > 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. >=20 > --=20 > Chris couple of thoughts: powerpc64le is in 'technology preview', so IMO it's fine to make big changes to it as needed. On master (and probably on core-updates too) we have a patch for glibc to force ... something (that I don't remember) on powerpc architectures, which has the side effect of needing '--with-long-double-128' on powerpc-linux also in commencement.scm. If we could drop that patch then I don't think we would need it anymore for powerpc. > From ad89f9f59d22cc10fbf7dd6f738ce15a6e79b640 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. >=20 > 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. >=20 > * gnu/packages/gcc.scm (gcc-configure-flags-for-triplet): Add a clause for > targets starting with "powerpc64le-" which adds the "--with-long-double-1= 28" > option. This causes any package using this procedure to be built using t= his > 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 powerpc6= 4le, > since it is now redundant. The gcc-boot0 package uses (and adds to) the g= cc > 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]: R= emove > 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,= the > above change in gcc.scm is sufficient to ensure that the cross-gcc-argume= nts > procedure's configure options will include "--with-long-double-128" on > powerpc64le systems. > --- > gnu/packages/commencement.scm | 7 ------- > gnu/packages/cross-base.scm | 6 ------ > gnu/packages/gcc.scm | 3 +++ > 3 files changed, 3 insertions(+), 13 deletions(-) >=20 > diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm > index d4511ed914..db564db9c4 100644 > --- 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 I've adjusted this on core-updates to also take effect on powerpc-linux. > - ;; boot-triplet inserts "guix" in the triplet. > - ,@(if (equal? "powerpc64le-guix-linux-gnu" (b= oot-triplet)) > - ;; On POWER9 (little endian) glibc need= s the > - ;; 128-bit long double type. > - '("--with-long-double-128") > - '()) > - > ;; 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 > --- 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 = libc package or #f.)" > "--disable-decimal-float" ;would need libc > "--disable-libcilkrts" > =20 > - ,@(if (string-prefix? "powerpc64le-" targe= t) > - ;; On POWER9 (little endian) glibc ne= eds > - ;; the 128-bit long double type. > - '("--with-long-double-128") > - '()) > - > ;; 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 > --- a/gnu/packages/gcc.scm > +++ b/gnu/packages/gcc.scm > @@ -79,6 +79,9 @@ where the OS part is overloaded to denote a specific AB= I---into GCC > ;; Cilk has been removed from GCC 8 anyway. > '("--disable-libcilkrts")) > =20 This can be just 'powerpc64le' > + ((string-prefix? "powerpc64le-" target) > + '("--with-long-double-128")) > + > (else > ;; TODO: Add `arm.*-gnueabi', etc. > '()))) > --=20 > 2.30.2 >=20 --=20 Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --1dbK/XcJ4chkIrb0 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmC8g4oACgkQQarn3Mo9 g1E7pw/7BNfd7Pc5XiUhOOWmXpvJhLj0IREfH8ysn+YFdJtj0vZMfkWtv1Q+vhHZ G6t/QPn+2vJGDK9DvWNmruWCtkeYsKiY/EwWmJ/VikcKJ5QdqQkcCrnZpFrQEyfR LIcMo1wMqCWeiRglziGsN+Hx5lys9L3BkBN7qa9ndN1tDW6VwRpe6NKJ5HN/xnCC tOgkjjWfuoAZtiSn/TgMWFYcaBUMDxawan51wxxEqQDW9md9OtDDZRT4IKJi4xt+ ERifbsbZzMluUfYJFln2anEz258UT8fb+5tsieL1FP1iOImmSDa8YHME+ctlsZmz J9sZE0tMdmtxIlEzftmTTwwcVam6F0PjHl0zNXBriVKnw/KRxHehzBzgWEKqiL2H qIRDgqAvDNjtdeHWaoQwSgTZx2MXfkY7/6NDUUrIzHMqofZ+XTsZkyigoV8lzX1U w1ReyIeWAjZjRItEGz5g2aSpiNBUyPyJvGgdIskptuVNYhJuXBdlQ/yu7OOBPR4N Gs6skeWrZE9THAy4PxfhU4oqB5WjxuMyZCpzvCv12dPY3fJvbaShSlJ3hRBgnLv0 ambxOF1BqNdv3xSgDwTkYfIxtksfYaMNygJ84qYcSQ+gbXoqnAMHkyawGLHzMjqa FaVRhewitD3YGymE18KrFxxXehyxixHU5r2zARdnKdDYO61S5QA= =HX/K -----END PGP SIGNATURE----- --1dbK/XcJ4chkIrb0--