From patchwork Fri Jul 8 15:58:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Hogan X-Patchwork-Id: 40605 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 10B0227BBEA; Fri, 8 Jul 2022 18:22:57 +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 6DADD27BBE9 for ; Fri, 8 Jul 2022 18:22:56 +0100 (BST) Received: from localhost ([::1]:50804 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o9rgt-0002CY-HG for patchwork@mira.cbaines.net; Fri, 08 Jul 2022 13:22:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47416) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o9qOi-0004p3-08 for guix-patches@gnu.org; Fri, 08 Jul 2022 12:00:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39168) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o9qOh-0007cK-ID for guix-patches@gnu.org; Fri, 08 Jul 2022 12:00:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o9qOh-0001yj-Fo for guix-patches@gnu.org; Fri, 08 Jul 2022 12:00:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56452] [PATCH 2/5] gnu: llvm-3.7, llvm-3.8: Fix build with gcc. Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Jul 2022 16:00:03 +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.16572959477475 (code B ref 56452); Fri, 08 Jul 2022 16:00:03 +0000 Received: (at 56452) by debbugs.gnu.org; 8 Jul 2022 15:59:07 +0000 Received: from localhost ([127.0.0.1]:33058 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o9qNm-0001wJ-2K for submit@debbugs.gnu.org; Fri, 08 Jul 2022 11:59:06 -0400 Received: from mail-qt1-f172.google.com ([209.85.160.172]:44837) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o9qNj-0001vU-Li for 56452@debbugs.gnu.org; Fri, 08 Jul 2022 11:59:04 -0400 Received: by mail-qt1-f172.google.com with SMTP id bs20so28002104qtb.11 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:in-reply-to:references :mime-version:content-transfer-encoding; bh=UzmUGRlT+QgtBEsrtGmCDcsUXA7iQUAEk4omXP0bDVw=; b=jQgtjh17xE8DVk/7/Dp39DMvjdShse5zGRt+tykhYfGTnB/KDBk4g2yeDR50eprJPQ FJ2mORRytviKOg0otK/PsTshAPrMzW06XXntEYaqmWX4YDKSZu7t53L65wJztKzBSIvk QvJzadvnlAnSmy2pXu947hh/yRoMKWMd4lH433MVU+8drMb4Ssk9o7Glk/A3EuI5aWEu DVvSI+KBVfuMh3yt64q37NlrTDH68MoymCRUHOJ8prAgyO4bd7+HY3txLJi1EAGBGeeJ SF1L2VpcnVQv/+lYp9Kv1e5qDb//Q/oGqBud38wqTuzJH8WrxUa7vj8EmklJ0AC+ZJsx 59Og== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=UzmUGRlT+QgtBEsrtGmCDcsUXA7iQUAEk4omXP0bDVw=; b=IZjTlwXySesNIwZOpeGfiX5IlKoWZhg9LXLMq1GNHURTza7hYF/Ugg8UQix4j9WGo5 LTfENWsN8A/y/WoZh6R7Y7AlwkPsUaDavjQJR0Ev4cVQFDBLBElNR30b27HbvlN2w0Ru Mp02jvPzRGOQu6ZdStuka1sL/kAUF9mXH5ntflPYpimkEKamijpabWBCIbudantgjK8/ mlCqMniKSFCDCeM21U3od+wiKJnuBm0MgEDwwBJ585J8Uw9wihaZZkSEzUpNQYhX0xo3 HyV01enmhPcfoNS9yVLmt27QYcoQyM4cxoLuyyenFJUUms1Xx8UkqZTN+xhtD88l80Wd ZMSg== X-Gm-Message-State: AJIora+4HqRuSLbNYM+jVQd+40Y/swy0Omk89hkb0ATESneUmcXNjmRN xVaQw1LoLPc8DysP84RNoNs+dW2RYaxP5mUD X-Google-Smtp-Source: AGRyM1sdy1KxTScKDvoYZYdSdgHiRwLQnQ22mh68HmR1wC9Oo7k92EJOdWeh1Z0tdjPzilnJYVgMxw== X-Received: by 2002:a05:6214:e85:b0:472:f6fd:3b48 with SMTP id hf5-20020a0562140e8500b00472f6fd3b48mr3131818qvb.54.1657295937869; 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.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Jul 2022 08:58:57 -0700 (PDT) From: Greg Hogan Date: Fri, 8 Jul 2022 15:58:49 +0000 Message-Id: <106f54f2d334a9a65286fc3ab96a2bc40cdb7f4f.1657294938.git.code@greghogan.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <985ab84c845abce551a920787da67fc982a664bc.1657294938.git.code@greghogan.com> References: <985ab84c845abce551a920787da67fc982a664bc.1657294938.git.code@greghogan.com> 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/clang-runtime-3.7-fix-build-with-python3.patch, gnu/packages/patches/llvm-3.x.1-fix-build-with-gcc.patch: New files. * gnu/packages/llvm.scm (clang-runtime-3.7, llvm-3.7, llvm-3.8): Use patches. * gnu/local.mk: Register patches. --- gnu/local.mk | 2 ++ gnu/packages/llvm.scm | 9 ++++++--- ...lang-runtime-3.7-fix-build-with-python3.patch | 16 ++++++++++++++++ .../patches/llvm-3.x.1-fix-build-with-gcc.patch | 15 +++++++++++++++ 4 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/clang-runtime-3.7-fix-build-with-python3.patch create mode 100644 gnu/packages/patches/llvm-3.x.1-fix-build-with-gcc.patch diff --git a/gnu/local.mk b/gnu/local.mk index 0a5de26266..d646a19f0d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -955,6 +955,7 @@ dist_patch_DATA = \ %D%/packages/patches/clang-runtime-esan-build-fixes.patch \ %D%/packages/patches/clang-runtime-9-libsanitizer-mode-field.patch \ %D%/packages/patches/clang-runtime-3.5-libsanitizer-mode-field.patch \ + %D%/packages/patches/clang-runtime-3.7-fix-build-with-python3.patch \ %D%/packages/patches/clang-runtime-3.9-libsanitizer-mode-field.patch \ %D%/packages/patches/clang-runtime-3.8-libsanitizer-mode-field.patch \ %D%/packages/patches/classpath-aarch64-support.patch \ @@ -1452,6 +1453,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-3.x.1-fix-build-with-gcc.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 \ diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index f8320c4112..6b216ee78c 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -1036,7 +1036,8 @@ (define-public llvm-3.8 (uri (llvm-uri "llvm" version)) (sha256 (base32 - "1ybmnid4pw2hxn12ax5qa5kl1ldfns0njg8533y3mzslvd5cx0kf")))))) + "1ybmnid4pw2hxn12ax5qa5kl1ldfns0njg8533y3mzslvd5cx0kf")) + (patches (search-patches "llvm-3.x.1-fix-build-with-gcc.patch")))))) (define-public clang-runtime-3.8 (clang-runtime-from-llvm @@ -1060,7 +1061,8 @@ (define-public llvm-3.7 (uri (llvm-uri "llvm" version)) (sha256 (base32 - "1masakdp9g2dan1yrazg7md5am2vacbkb3nahb3dchpc1knr8xxy")))))) + "1masakdp9g2dan1yrazg7md5am2vacbkb3nahb3dchpc1knr8xxy")) + (patches (search-patches "llvm-3.x.1-fix-build-with-gcc.patch")))))) (define-public clang-runtime-3.7 (clang-runtime-from-llvm @@ -1068,7 +1070,8 @@ (define-public clang-runtime-3.7 "10c1mz2q4bdq9bqfgr3dirc6hz1h3sq8573srd5q5lr7m7j6jiwx" '("clang-runtime-asan-build-fixes.patch" "clang-runtime-3.8-libsanitizer-mode-field.patch" - "clang-3.5-libsanitizer-ustat-fix.patch"))) + "clang-3.5-libsanitizer-ustat-fix.patch" + "clang-runtime-3.7-fix-build-with-python3.patch"))) (define-public clang-3.7 (clang-from-llvm llvm-3.7 clang-runtime-3.7 diff --git a/gnu/packages/patches/clang-runtime-3.7-fix-build-with-python3.patch b/gnu/packages/patches/clang-runtime-3.7-fix-build-with-python3.patch new file mode 100644 index 0000000000..042f0e025a --- /dev/null +++ b/gnu/packages/patches/clang-runtime-3.7-fix-build-with-python3.patch @@ -0,0 +1,16 @@ +Patch based on changes from +https://github.com/llvm/llvm-project/commit/c1fde4fa943fd03a3d40bc5d32b9e0045fd29208 + +diff --git a/lib/sanitizer_common/scripts/gen_dynamic_list.py b/lib/sanitizer_common/scripts/gen_dynamic_list.py +index 5ea2ca1..d7bc287 100755 +--- a/lib/sanitizer_common/scripts/gen_dynamic_list.py ++++ b/lib/sanitizer_common/scripts/gen_dynamic_list.py +@@ -100,7 +100,7 @@ def main(argv): + print('global:') + result.sort() + for f in result: +- print(' ' + f.encode('utf-8') + ';') ++ print(u' %s;' % f) + if args.version_list: + print('local:') + print(' *;') diff --git a/gnu/packages/patches/llvm-3.x.1-fix-build-with-gcc.patch b/gnu/packages/patches/llvm-3.x.1-fix-build-with-gcc.patch new file mode 100644 index 0000000000..75236c4069 --- /dev/null +++ b/gnu/packages/patches/llvm-3.x.1-fix-build-with-gcc.patch @@ -0,0 +1,15 @@ +Patch from https://github.com/digego/extempore/issues/318 + +diff --git a/include/llvm/IR/ValueMap.h.orig b/include/llvm/IR/ValueMap.h +index ad518ac..d928f6a 100644 +--- a/include/llvm/IR/ValueMap.h ++++ b/include/llvm/IR/ValueMap.h +@@ -99,7 +99,7 @@ + explicit ValueMap(const ExtraData &Data, unsigned NumInitBuckets = 64) + : Map(NumInitBuckets), Data(Data) {} + +- bool hasMD() const { return MDMap; } ++ bool hasMD() const { return static_cast(MDMap); } + MDMapT &MD() { + if (!MDMap) + MDMap.reset(new MDMapT);