From patchwork Tue Oct 24 15:29:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg Hogan X-Patchwork-Id: 55313 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 DEE7E27BBEA; Tue, 24 Oct 2023 16:30:53 +0100 (BST) 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=ham 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 A82B927BBE2 for ; Tue, 24 Oct 2023 16:30:52 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qvJMg-0004Ok-7c; Tue, 24 Oct 2023 11:30:42 -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 1qvJMc-0004I1-7J for guix-patches@gnu.org; Tue, 24 Oct 2023 11:30:38 -0400 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 1qvJMX-000575-5F for guix-patches@gnu.org; Tue, 24 Oct 2023 11:30:36 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qvJN0-0003jS-KG for guix-patches@gnu.org; Tue, 24 Oct 2023 11:31:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66730] [PATCH core-updates] gnu: gcc@11: Update to 11.4.0. Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 24 Oct 2023 15:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 66730 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66730@debbugs.gnu.org Cc: Greg Hogan X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.169816146014336 (code B ref -1); Tue, 24 Oct 2023 15:31:02 +0000 Received: (at submit) by debbugs.gnu.org; 24 Oct 2023 15:31:00 +0000 Received: from localhost ([127.0.0.1]:56289 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qvJMy-0003jA-Ck for submit@debbugs.gnu.org; Tue, 24 Oct 2023 11:31:00 -0400 Received: from lists.gnu.org ([2001:470:142::17]:52528) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qvJMt-0003il-K9 for submit@debbugs.gnu.org; Tue, 24 Oct 2023 11:30:59 -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 1qvJMI-0004Bn-GG for guix-patches@gnu.org; Tue, 24 Oct 2023 11:30:18 -0400 Received: from mail-qv1-xf35.google.com ([2607:f8b0:4864:20::f35]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qvJMB-00053J-VV for guix-patches@gnu.org; Tue, 24 Oct 2023 11:30:18 -0400 Received: by mail-qv1-xf35.google.com with SMTP id 6a1803df08f44-66d1ef93284so28282086d6.3 for ; Tue, 24 Oct 2023 08:30:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20230601.gappssmtp.com; s=20230601; t=1698161409; x=1698766209; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=AIpQxTryi7eH5MBxIjCMg169XvL5Dw5kct3AF+80WKo=; b=pwFwQXv1HVKTVPFwsXtog/BsZX2oglanBNifAA8DYO7Aj7TaehCxb5YQEXVsanbo/j YR496GHyxRQIK9SAldlwpicS6b689IDLUHmgKQ8WaUjuKkOmMXfR6w2VrGQf2ZDbgWGI 6aA8yvBGe5fdbvuqK9eVEO+EUVKsOPEuO5KXh6pdB51Dus+9oImXHs8KBQ3OGL9Iiqxm vvO/khblousl+P7w19yG3FjGKHZAjOfJj2Qucm9I0F6Wx97GVHYeE1GAxvQ+EdQ+NCYv 5F20vCQuvkVmTdtYiqCzGg3/SR0c9lqhHawivaYoWR22fHo8GgwG4CIV1q04e/6mLcUx XH4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698161409; x=1698766209; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=AIpQxTryi7eH5MBxIjCMg169XvL5Dw5kct3AF+80WKo=; b=YOS+kgH8c5TWrO2jd4RFKKTu32F1+CvewuI4ydrb+Y3PFdiYKjDUtcVMQZVEABO8lM 0XWoT6rcany+xPzWyBhR4rhH1nzd6m3AW1tB1ea6nlazVNI73sBZ5UW8mqn+prKer0QL eh7htvtvl4znk1HE2AldlwhoIb4HXaGV/o/RRkqMj17AgRuK2HR5pDlwP2zkkY3/s8SR KdlXb7XfK2i8pOND/a3dioBrD5MV4QT1a3jofWJEZ8E230uqGg3ttaHxFVaI8CZo7zlq 83082te87kD5z1JZCwkw/kZznLJsKir/ffWcpfyscM8gmaV7YQwMQyNFOmzGn6lOoZuv fn0w== X-Gm-Message-State: AOJu0YyB7T3v27gVo7ZbpZy5JM9Jcf9KJkm9wCUBQ7fxwzsDNPBB6kML K5q2Iy2oY/ZOt2lSEQ3d2o3GbvJb+nk7uYwtrX/xrA== X-Google-Smtp-Source: AGHT+IFyebOpRK3UIK9zsuEtUVR4v6Yfgg2oz/N/V5HjhKX/XYcX6ogzyX1L4AKpKI8b4jfCM5LQCQ== X-Received: by 2002:a05:6214:c48:b0:66d:1fcf:e1c9 with SMTP id r8-20020a0562140c4800b0066d1fcfe1c9mr17091455qvj.35.1698161409391; Tue, 24 Oct 2023 08:30:09 -0700 (PDT) Received: from ip-172-31-19-221.us-east-2.compute.internal (ec2-18-223-188-34.us-east-2.compute.amazonaws.com. [18.223.188.34]) by smtp.gmail.com with ESMTPSA id v15-20020ad4528f000000b0065b09512e14sm3639607qvr.21.2023.10.24.08.30.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Oct 2023 08:30:09 -0700 (PDT) From: Greg Hogan Date: Tue, 24 Oct 2023 15:29:27 +0000 Message-ID: <20231024152950.71342-1-code@greghogan.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: none client-ip=2607:f8b0:4864:20::f35; envelope-from=code@greghogan.com; helo=mail-qv1-xf35.google.com 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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. --- 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 43145caf80..b4d588fdc6 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1245,7 +1245,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/gcolor3-update-libportal-usage.patch \ %D%/packages/patches/gd-fix-tests-on-i686.patch \ diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 621644b93f..f50cd0969e 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -728,17 +728,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))