From patchwork Fri Jul 8 15:58:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Hogan X-Patchwork-Id: 40604 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 287B427BBEA; Fri, 8 Jul 2022 18:22:26 +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=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 9B8CF27BBE9 for ; Fri, 8 Jul 2022 18:22:25 +0100 (BST) Received: from localhost ([::1]:49980 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o9rgO-0001dP-F7 for patchwork@mira.cbaines.net; Fri, 08 Jul 2022 13:22:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47410) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o9qOh-0004o1-Cz for guix-patches@gnu.org; Fri, 08 Jul 2022 12:00:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39167) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o9qOg-0007aq-UC for guix-patches@gnu.org; Fri, 08 Jul 2022 12:00:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o9qOg-0001yY-Rn for guix-patches@gnu.org; Fri, 08 Jul 2022 12:00:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56452] [PATCH 1/5] gnu: llvm-8: Fix build with gcc-10. References: In-Reply-To: Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Jul 2022 16:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56452 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56452@debbugs.gnu.org Cc: Greg Hogan Received: via spool by 56452-submit@debbugs.gnu.org id=B56452.16572959467462 (code B ref 56452); Fri, 08 Jul 2022 16:00:02 +0000 Received: (at 56452) by debbugs.gnu.org; 8 Jul 2022 15:59:06 +0000 Received: from localhost ([127.0.0.1]:33055 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o9qNl-0001wA-F1 for submit@debbugs.gnu.org; Fri, 08 Jul 2022 11:59:06 -0400 Received: from mail-qk1-f172.google.com ([209.85.222.172]:47000) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o9qNj-0001vS-CB for 56452@debbugs.gnu.org; Fri, 08 Jul 2022 11:59:03 -0400 Received: by mail-qk1-f172.google.com with SMTP id x22so3175545qkf.13 for <56452@debbugs.gnu.org>; Fri, 08 Jul 2022 08:59:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=XaxBZFDH3AmpCYNs/uTcSnB+76E2+dYuT5AL4130hCQ=; b=JnTbFu09Xz5KQpdi5dqgA5z1L+694o5c9eEqqfSwJBiEe3TCiAE99C6RObGFEV1aAm IQLr+hX2MVKw1b0oXEbVsK+rVhLliuevkFfu2PBaba5b7JcqKP2y/7aQB5CGN77mvM0u EuoZ++6C7y+2OXqF9IMDjntttCZm8I7d0F3LQRq6xo0ymS4IhFb89Af15JrYeaHO8Gby czUsrFdXHyciTcFCdxf6zFutcoTNYsd/VtZx5G0qlxuj9NKF6bkxSlnTqVrxw+lk7G1a Id4feJr8vU07lgUb0s/nsdPDbeS29z750Gip6tI5t3FSt9JdfYcI17zXzJXrop9niO2S USlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=XaxBZFDH3AmpCYNs/uTcSnB+76E2+dYuT5AL4130hCQ=; b=JV7fjUgklvxPNxJypOuS5GbrsxvPUROgrY7nuFs3u0GPVSeJuWibwPiIAwsXHCfd8h 7OqsOZEXdo3prW6wVofZ1Ld3rFv/UiKmqCjkm8qTM5tLC32bmzniqG6DKlTn1eZXD8N6 HOlEYW6/OzzAuQpK9Xwe/zMC+PzyXVxmvNCUnhIQnDVBR43vDvw4M8ooI1AFf69Orhys LqFi7b44is9SnVBgu8UzsrDl46EkhHbT54mClz5ABKQrnkDC5j3US2qOgvCmW8+XAXLV tCBp+2+kOxLUD7ayBQPDddMGX3lhch1b6vsqcU4Cq6Y7sJm78DZqy0rZ8qK52J+7ERjP ZWXg== X-Gm-Message-State: AJIora8bQf78mZ3E0FTAo7ylSyjUhq2ngpFMEN1XwC+mZ4VIaR3P/hej gMH1RLeSR6J48IzoufpsdBVez4NXoJSmpsw3 X-Google-Smtp-Source: AGRyM1vGcUkxP4/lSq4ejfYZ0VtMIPjmthOjsUJwPeD/y8ON57ibJoGcB1VYPXd+bcCiD0V3n/977A== X-Received: by 2002:a05:620a:2183:b0:6af:2a1f:42fb with SMTP id g3-20020a05620a218300b006af2a1f42fbmr2827802qka.360.1657295937395; Fri, 08 Jul 2022 08:58:57 -0700 (PDT) Received: from ip-10-114-89-251.evoforge.org (ec2-52-70-167-183.compute-1.amazonaws.com. [52.70.167.183]) by smtp.gmail.com with ESMTPSA id z3-20020a05622a124300b00316a384447fsm28890911qtx.16.2022.07.08.08.58.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Jul 2022 08:58:56 -0700 (PDT) From: Greg Hogan Date: Fri, 8 Jul 2022 15:58:48 +0000 Message-Id: <985ab84c845abce551a920787da67fc982a664bc.1657294938.git.code@greghogan.com> X-Mailer: git-send-email 2.36.1 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/llvm-8-fix-build-with-gcc-10.patch: New file. * gnu/packages/llvm.scm (clang-8, clang-runtime-8): Update to 8.0.1. * gnu/packages/llvm.scm (llvm-8): Use patch and update to 8.0.1. * gnu/local.mk: Register patch. --- gnu/local.mk | 1 + gnu/packages/llvm.scm | 9 ++--- .../llvm-8-fix-build-with-gcc-10.patch | 34 +++++++++++++++++++ 3 files changed, 40 insertions(+), 4 deletions(-) create mode 100644 gnu/packages/patches/llvm-8-fix-build-with-gcc-10.patch diff --git a/gnu/local.mk b/gnu/local.mk index 2516562ea4..0a5de26266 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1452,6 +1452,7 @@ dist_patch_DATA = \ %D%/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch \ %D%/packages/patches/llvm-3.5-fix-clang-build-with-gcc5.patch \ %D%/packages/patches/llvm-3.6-fix-build-with-gcc-10.patch \ + %D%/packages/patches/llvm-8-fix-build-with-gcc-10.patch \ %D%/packages/patches/llvm-9-fix-bitcast-miscompilation.patch \ %D%/packages/patches/llvm-9-fix-lpad-miscompilation.patch \ %D%/packages/patches/llvm-9-fix-scev-miscompilation.patch \ diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index ffa156af15..f8320c4112 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -912,24 +912,25 @@ (define-public clang-toolchain-9 (define-public llvm-8 (package (inherit llvm-9) - (version "8.0.0") + (version "8.0.1") (source (origin (method url-fetch) (uri (llvm-uri "llvm" version)) (sha256 (base32 - "0k124sxkfhfi1rca6kzkdraf4axhx99x3cw2rk55056628dvwwl8")))) + "1rvm5gqp5v8hfn17kqws3zhk94w4kxndal12bqa0y57p09nply24")) + (patches (search-patches "llvm-8-fix-build-with-gcc-10.patch")))) (license license:ncsa))) (define-public clang-runtime-8 (clang-runtime-from-llvm llvm-8 - "1c919wsm17xnv7lr8bhpq2wkq8113lzlw6hzhfr737j59x3wfddl" + "0dqqf8f930l8gag4d9qjgn1n0pj0nbv2anviqqhdi1rkhas8z0hi" '("clang-runtime-9-libsanitizer-mode-field.patch"))) (define-public clang-8 (clang-from-llvm llvm-8 clang-runtime-8 - "0svk1f70hvpwrjp6x5i9kqwrqwxnmcrw5s7f4cxyd100mdd12k08" + "0ihnbdl058gvl2wdy45p5am55bq8ifx8m9mhcsgj9ax8yxlzvvvh" #:patches '("clang-8.0-libc-search-path.patch"))) (define-public clang-toolchain-8 diff --git a/gnu/packages/patches/llvm-8-fix-build-with-gcc-10.patch b/gnu/packages/patches/llvm-8-fix-build-with-gcc-10.patch new file mode 100644 index 0000000000..9b36cc772c --- /dev/null +++ b/gnu/packages/patches/llvm-8-fix-build-with-gcc-10.patch @@ -0,0 +1,34 @@ +From b288d90b39f4b905c02092a9bfcfd6d78f99b191 Mon Sep 17 00:00:00 2001 +From: Than McIntosh +Date: Fri, 19 Jul 2019 13:13:54 +0000 +Subject: [PATCH] [NFC] include cstdint/string prior to using uint8_t/string + +Summary: include proper header prior to use of uint8_t typedef +and std::string. + +Subscribers: llvm-commits + +Reviewers: cherry + +Tags: #llvm + +Differential Revision: https://reviews.llvm.org/D64937 + +llvm-svn: 366572 +--- + llvm/include/llvm/Demangle/MicrosoftDemangleNodes.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/include/llvm/Demangle/MicrosoftDemangleNodes.h b/include/llvm/Demangle/MicrosoftDemangleNodes.h +index da9d9d5bfdc0c..3d47471f0ef0e 100644 +--- a/include/llvm/Demangle/MicrosoftDemangleNodes.h ++++ b/include/llvm/Demangle/MicrosoftDemangleNodes.h +@@ -16,6 +16,8 @@ + #include "llvm/Demangle/DemangleConfig.h" + #include "llvm/Demangle/StringView.h" + #include ++#include ++#include + + namespace llvm { + namespace itanium_demangle {