From patchwork Thu Dec 7 10:22:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 57351 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 62A6327BBE9; Thu, 7 Dec 2023 10:24:48 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0494E27BBE2 for ; Thu, 7 Dec 2023 10:24:47 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rBBXt-0003Jn-OV; Thu, 07 Dec 2023 05:23:55 -0500 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 1rBBXq-0003IS-6D for guix-patches@gnu.org; Thu, 07 Dec 2023 05:23:50 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rBBXp-0000qa-UP for guix-patches@gnu.org; Thu, 07 Dec 2023 05:23:49 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rBBY2-0005X4-5l for guix-patches@gnu.org; Thu, 07 Dec 2023 05:24:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67686] [PATCH core-updates 1/5] gnu: gcc@11: Update to 11.4.0. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 07 Dec 2023 10:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67686 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67686@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= , Greg Hogan Received: via spool by 67686-submit@debbugs.gnu.org id=B67686.170194460521182 (code B ref 67686); Thu, 07 Dec 2023 10:24:02 +0000 Received: (at 67686) by debbugs.gnu.org; 7 Dec 2023 10:23:25 +0000 Received: from localhost ([127.0.0.1]:41132 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBBXQ-0005VV-DF for submit@debbugs.gnu.org; Thu, 07 Dec 2023 05:23:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50314) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBBXN-0005Us-VY for 67686@debbugs.gnu.org; Thu, 07 Dec 2023 05:23:22 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rBBX6-0000ip-0z; Thu, 07 Dec 2023 05:23:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=o5lm29u3kq0AyVzCzbv5mf+7qxpSo/bBkobyLg0FW5k=; b=XAB+xWhlaJQRWxwpfPk2 PF/BBLxKEsMba7L5Y/i5ndt+tHUnCDIkszZbOgS1nGGFZRXfCdFCBjSIAOu6JTmx4ltJZ8G1+xtks uHkvhPVARL7AE9M1lxhE2WTI/X6keBp4O8jsJ+brSW55YAQhMsO+lvwsup84Ad8RDJsGLh8DDrdyk jw0uqbkVoLAZU/jyGmJ0Dx3qe67nuJe0wWCsGVa35WTB+huwIOw8aewo9SLxVPAnkJ9ZklxyOHyvb PsDcHR97kb/iD4+DFKfNAJWwap6qMkoaYPSMchezAnkfSPAGfefh9+2DkKKbFMRy71N2Hz9V0/OWy eoDiSfjilb/TZA==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Thu, 7 Dec 2023 11:22:44 +0100 Message-ID: <84287ec2c97471228f0b4e1db1ae14b155bbde88.1701943221.git.ludo@gnu.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Greg Hogan * gnu/packages/gcc.scm (gcc-11): Update to 11.4.0. Remove ‘gcc-10-tree-sra-union-handling.patch’. * gnu/local.mk: Delist patch. * gnu/packages/patches/gcc-10-tree-sra-union-handling.patch: Delete. Signed-off-by: Ludovic Courtès --- gnu/local.mk | 1 - gnu/packages/gcc.scm | 7 ++-- .../gcc-10-tree-sra-union-handling.patch | 33 ------------------- 3 files changed, 3 insertions(+), 38 deletions(-) delete mode 100644 gnu/packages/patches/gcc-10-tree-sra-union-handling.patch diff --git a/gnu/local.mk b/gnu/local.mk index ce850c9f7e..f1839319c8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1250,7 +1250,6 @@ dist_patch_DATA = \ %D%/packages/patches/gcc-10-cross-environment-variables.patch \ %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/gcc-13.2.0-libstdc++-docbook-xsl-uri.patch \ %D%/packages/patches/gcc-13.2.0-libstdc++-info-install-fix.patch \ diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 3137fe2d75..313a92d8aa 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -719,17 +719,16 @@ (define-public gcc-10 (define-public gcc-11 (package (inherit gcc-8) - (version "11.3.0") + (version "11.4.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/gcc/gcc-" version "/gcc-" version ".tar.xz")) (sha256 (base32 - "0fdclcwf728wbq52vphfcjywzhpsjp3kifzj3pib3xcihs0z4z5l")) + "1ncd7akww0hl5kkmw1dj3qgqp3phdrr5dfnm7jia9s07n0ib4b9z")) (patches (search-patches "gcc-9-strmov-store-file-names.patch" - "gcc-5.0-libvtv-runpath.patch" - "gcc-10-tree-sra-union-handling.patch")) + "gcc-5.0-libvtv-runpath.patch")) (modules '((guix build utils))) (snippet gcc-canadian-cross-objdump-snippet))) (arguments diff --git a/gnu/packages/patches/gcc-10-tree-sra-union-handling.patch b/gnu/packages/patches/gcc-10-tree-sra-union-handling.patch deleted file mode 100644 index aae5fc9f72..0000000000 --- a/gnu/packages/patches/gcc-10-tree-sra-union-handling.patch +++ /dev/null @@ -1,33 +0,0 @@ -Fix a regression in GCC 10/11/12 where some union structures -could get miscompiled when optimizations are enabled: - - https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105860 - -Taken from upstream: - - https://gcc.gnu.org/g:16afe2e2862f3dd93c711d7f8d436dee23c6c34d - -diff --git a/gcc/tree-sra.c b/gcc/tree-sra.c -index 09d951a261b..420329f63f6 100644 ---- a/gcc/tree-sra.c -+++ b/gcc/tree-sra.c -@@ -1647,7 +1647,18 @@ build_ref_for_offset (location_t loc, tree base, poly_int64 offset, - static tree - build_reconstructed_reference (location_t, tree base, struct access *model) - { -- tree expr = model->expr, prev_expr = NULL; -+ tree expr = model->expr; -+ /* We have to make sure to start just below the outermost union. */ -+ tree start_expr = expr; -+ while (handled_component_p (expr)) -+ { -+ if (TREE_CODE (TREE_TYPE (TREE_OPERAND (expr, 0))) == UNION_TYPE) -+ start_expr = expr; -+ expr = TREE_OPERAND (expr, 0); -+ } -+ -+ expr = start_expr; -+ tree prev_expr = NULL_TREE; - while (!types_compatible_p (TREE_TYPE (expr), TREE_TYPE (base))) - { - if (!handled_component_p (expr))