From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id mNTANu7QN2S2RwEASxT56A (envelope-from ) for ; Thu, 13 Apr 2023 11:52:47 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id yL/dNe7QN2RrBgEAG6o9tA (envelope-from ) for ; Thu, 13 Apr 2023 11:52:46 +0200 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 62113BB74 for ; Thu, 13 Apr 2023 11:52:46 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pmtcX-0003P5-MY; Thu, 13 Apr 2023 05:52:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pmtcU-0003Oo-NQ for guix-devel@gnu.org; Thu, 13 Apr 2023 05:51:59 -0400 Received: from hera.aquilenet.fr ([185.233.100.1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pmtcS-0004vC-V8 for guix-devel@gnu.org; Thu, 13 Apr 2023 05:51:58 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id A43F11C70; Thu, 13 Apr 2023 11:51:53 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at hera.aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rCVfwtUBf_CI; Thu, 13 Apr 2023 11:51:52 +0200 (CEST) Received: from jurong (unknown [IPv6:2001:861:c4:f2f0::c64]) by hera.aquilenet.fr (Postfix) with ESMTPSA id AF0521C6F; Thu, 13 Apr 2023 11:51:52 +0200 (CEST) Date: Thu, 13 Apr 2023 11:51:51 +0200 From: Andreas Enge To: guix-devel@gnu.org Cc: Efraim Flashner , 61879@debbugs.gnu.org Subject: Re: Powerpc on core-updates Message-ID: References: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="gVO+DanPEUbFQpuJ" Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: Received-SPF: pass client-ip=185.233.100.1; envelope-from=andreas@enge.fr; helo=hera.aquilenet.fr 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: guix-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+larch=yhetil.org@gnu.org Sender: guix-devel-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1681379566; a=rsa-sha256; cv=none; b=DitB2bndva+TEH6mE7hyIEKa2EbUw0navTWdDcRXVEnLZkFKTe7ztid69WzUd6CYbnmmCH ffhse49K85ne7uuRWTlWqWairi0XEstREVpd3cTYb5A19RhPu+4JtTCjXCu9joyVlRkWo7 RVMy8leoMz6L6kSgYIXyHvpV9yc34ZBikvkY7ODifH2+m5V/YTQgchcy14HuAB2Z3V+O1w SieH6RFrEl0JR/83YU5Nx5949zBiM4fldm67WoLpXOM9vhUOmr7/dTPpfzuohLCELPPGSe V3sxdoDaUQPOv1s4ee4BlMAwYnwHejLXyDlDpCSH8NPe0l4rWMkfu0mvPF35AA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-devel-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-devel-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1681379566; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=isxcBypnxBEaWwmlbGLiKy/If6iPF5Vgoiwjo6rCMrE=; b=gL51SNp0CwoBJNiAwPJMTmwPm2DEuV/Xh7W1y82mAXn/+3s9AbmogyX6LzkUyo4dRkBTHn O/32YtoaW9huDenoJD9hgF/sXzbpNfIbGRx3YQfNBmF/Mo4TDlDLF7mQXpfJuac0oX9zeR AVbLAlBs7xMV1H4wHTLP6jSRsQcFmC4i0i/bhxhdqh7YYGRRxwYfk9xdvzXbUZ/Gnc8D/k mT/UeUi5eku14m61kvbY6B6LVLgmC1q0WX9JeRWzDf5HhHd7VyMPeXYh082OJyhAwIuREU uiX+7WeNsrhzkuOD5cOL5YJLEzra/i90UrR0MHq1C3OcMXmstMtDlS626S0YIQ== X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: -2.52 X-Spam-Score: -2.52 X-Migadu-Queue-Id: 62113BB74 Authentication-Results: aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-devel-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-devel-bounces+larch=yhetil.org@gnu.org"; dmarc=none X-TUID: Vfd1MnA2o2p4 --gVO+DanPEUbFQpuJ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline I may as well try to provide a patch. It is untested even on x86_64, since it requires quite a few rebuilds. If it works on powerpc, it should probably be made conditional on the architecture to avoid a world rebuild. I do not know whether this is possible in the patches field in an origin. Andreas --gVO+DanPEUbFQpuJ Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: attachment; filename="0001-gnu-gcc-11-Fix-build-on-powerpc64le.patch" Content-Transfer-Encoding: 8bit >From 5eb50bdc34759d4c917f2143e037fad62bc08ed7 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Thu, 13 Apr 2023 11:46:47 +0200 Subject: [PATCH] gnu: gcc-11: Fix build on powerpc64le. * gnu/packages/patches/gcc-11-libstdc++-powerpc.patch: New file. * gnu/local.mk (dist_patch_DATA): Register patch. * gnu/packages/gcc.scm (gcc-11)[origin]: Use patch. --- gnu/local.mk | 1 + gnu/packages/gcc.scm | 5 +++-- .../patches/gcc-11-libstdc++-powerpc.patch | 18 ++++++++++++++++++ 3 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/gcc-11-libstdc++-powerpc.patch diff --git a/gnu/local.mk b/gnu/local.mk index b07811f1cb..1255846462 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1184,6 +1184,7 @@ dist_patch_DATA = \ %D%/packages/patches/gcc-11-libstdc++-hurd-libpthread.patch \ %D%/packages/patches/gcc-12-cross-environment-variables.patch \ %D%/packages/patches/gcc-10-tree-sra-union-handling.patch \ + %D%/packages/patches/gcc-11-libstdc++-powerpc.patch \ %D%/packages/patches/gcolor3-update-libportal-usage.patch \ %D%/packages/patches/gd-fix-tests-on-i686.patch \ %D%/packages/patches/gd-brect-bounds.patch \ diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index a511cdbc45..631e08db25 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2012-2023 Ludovic Courtčs ;;; Copyright © 2014, 2015, 2018 Mark H Weaver ;;; Copyright © 2014, 2015, 2016, 2017, 2019, 2021 Ricardo Wurmus -;;; Copyright © 2015 Andreas Enge +;;; Copyright © 2015, 2023 Andreas Enge ;;; Copyright © 2015-2018, 2020-2023 Efraim Flashner ;;; Copyright © 2016 Carlos Sánchez de La Lama ;;; Copyright © 2018 Tobias Geerinckx-Rice @@ -703,7 +703,8 @@ (define-public gcc-11 "0fdclcwf728wbq52vphfcjywzhpsjp3kifzj3pib3xcihs0z4z5l")) (patches (search-patches "gcc-9-strmov-store-file-names.patch" "gcc-5.0-libvtv-runpath.patch" - "gcc-10-tree-sra-union-handling.patch")) + "gcc-10-tree-sra-union-handling.patch" + "gcc-11-libstdc++-powerpc.patch")) (modules '((guix build utils))) (snippet gcc-canadian-cross-objdump-snippet))) (arguments diff --git a/gnu/packages/patches/gcc-11-libstdc++-powerpc.patch b/gnu/packages/patches/gcc-11-libstdc++-powerpc.patch new file mode 100644 index 0000000000..aff2ef16f1 --- /dev/null +++ b/gnu/packages/patches/gcc-11-libstdc++-powerpc.patch @@ -0,0 +1,18 @@ +diff -u -r gcc-11.3.0.alt/libstdc++-v3/src/c++17/floating_from_chars.cc gcc-11.3.0/libstdc++-v3/src/c++17/floating_from_chars.cc +--- gcc-11.3.0.alt/libstdc++-v3/src/c++17/floating_from_chars.cc 2023-04-13 11:36:08.169841428 +0200 ++++ gcc-11.3.0/libstdc++-v3/src/c++17/floating_from_chars.cc 2023-04-13 11:36:54.825827304 +0200 +@@ -495,8 +495,14 @@ + from_chars(const char* first, const char* last, __ieee128& value, + chars_format fmt) noexcept + { ++#if _GLIBCXX_USE_CXX11_ABI + buffer_resource mr; + pmr::string buf(&mr); ++#else ++ string buf; ++ if (!reserve_string(buf)) ++ return make_result(first, 0, {}, ec); ++#endif + size_t len = 0; + errc ec = errc::invalid_argument; + __try -- 2.39.2 --gVO+DanPEUbFQpuJ--