From patchwork Mon Oct 23 12:36:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 55160 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 D7AFC27BBEA; Mon, 23 Oct 2023 13:39:30 +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=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 BECF727BBE2 for ; Mon, 23 Oct 2023 13:39:29 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1quuCs-0003JS-UM; Mon, 23 Oct 2023 08:38:55 -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 1quuCY-0003DV-Cy for guix-patches@gnu.org; Mon, 23 Oct 2023 08:38:35 -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 1quuCX-0001MY-T7 for guix-patches@gnu.org; Mon, 23 Oct 2023 08:38:33 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1quuD0-0007U3-Du; Mon, 23 Oct 2023 08:39:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66701] [PATCH 01/14] gnu: clang-runtime-from-llvm: Adjust inputs for version 15 or later. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: hako@ultrarare.space, guix-patches@gnu.org Resent-Date: Mon, 23 Oct 2023 12:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66701 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66701@debbugs.gnu.org Cc: Hilton Chain , Hilton Chain X-Debbugs-Original-Xcc: Hilton Chain Received: via spool by 66701-submit@debbugs.gnu.org id=B66701.169806472128703 (code B ref 66701); Mon, 23 Oct 2023 12:39:02 +0000 Received: (at 66701) by debbugs.gnu.org; 23 Oct 2023 12:38:41 +0000 Received: from localhost ([127.0.0.1]:49338 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quuCf-0007St-AR for submit@debbugs.gnu.org; Mon, 23 Oct 2023 08:38:41 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:50318) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quuCa-0007SW-IF for 66701@debbugs.gnu.org; Mon, 23 Oct 2023 08:38:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1698064531; h=from:from: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; bh=ty7G8JkYWufVefkHe7kclbbd+JgAr8KFxvWFpt4SVuw=; b=dqOWzqM6X/eJ1Fl0k/NfGcrLkcl7dozDxXhUXKh4gzjrJN+NJqkOaYsezXJ9ofVmY6fbmY Gq7WoInIQ7NOHNNMVL2FJ5kog89RC9XVQxqgWlpW3eQD57WMe93N6HkgWhxIge1w/AScfI bs+RkZNaL58W4ajCYXsco+M+TjZjrm3+smK0JVjONULr7N/2Z2nASU9oMnQ46/+R/na0PQ Jzm8RXcoWegR60QbKYmXYSjPN81TZW3gXHVxvjl1XVPZSENt+m1mn0E78RxSl1LDnuxacH zjE7j4ukz/ErcneUFw5Z1XSGw/Wp1dpSaIjPT0NeiGvpDPC5QApiQmPEpOfGrA== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Date: Mon, 23 Oct 2023 20:36:09 +0800 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: --- 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: , Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain 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/llvm.scm (clang-runtime-from-llvm)[native-inputs]: Add gcc-12 when version >= 15. [inputs]: Add libffi when version >= 15. (clang-runtime-15)[native-inputs,inputs]: Remove fields. Change-Id: I4b385b937edbb7a2840b998b6dd3e31a17cb556f --- gnu/packages/llvm.scm | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index cd551f4e02..38c4047f48 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -26,6 +26,7 @@ ;;; Copyright © 2022 John Kehayias ;;; Copyright © 2022 Clément Lassieur ;;; Copyright © 2022 Zhu Zihao +;;; Copyright © 2023 Hilton Chain ;;; ;;; This file is part of GNU Guix. ;;; @@ -139,9 +140,19 @@ (define* (clang-runtime-from-llvm llvm (patches (map search-patch patches))) (llvm-monorepo (package-version llvm)))) (build-system cmake-build-system) - (native-inputs (package-native-inputs llvm)) + (native-inputs + (if (version>=? version "15") + ;; TODO: Remove this when GCC 12 is the default. + ;; libfuzzer fails to build with GCC 11 + (modify-inputs (package-native-inputs llvm) + (prepend gcc-12)) + (package-native-inputs llvm))) (inputs - (list llvm)) + (append + (list llvm) + (if (version>=? version "15") + (list libffi) + '()))) (arguments `(;; Don't use '-g' during the build to save space. #:build-type "Release" @@ -712,13 +723,7 @@ (define-public clang-runtime-15 #~(modify-phases #$phases (add-after 'unpack 'change-directory (lambda _ - (chdir "compiler-rt"))))))) - (native-inputs - (modify-inputs (package-native-inputs template) - (prepend gcc-12))) ;libfuzzer fails to build with GCC 11 - (inputs - (modify-inputs (package-inputs template) - (append libffi)))))) + (chdir "compiler-rt")))))))))) (define-public clang-runtime-14 (let ((template (clang-runtime-from-llvm llvm-14))) From patchwork Mon Oct 23 12:36:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 55157 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 7925D27BBEA; Mon, 23 Oct 2023 13:39:13 +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=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 5ECD427BBE2 for ; Mon, 23 Oct 2023 13:39:12 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1quuCp-0003IB-4H; Mon, 23 Oct 2023 08:38:51 -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 1quuCY-0003DU-CX for guix-patches@gnu.org; Mon, 23 Oct 2023 08:38:35 -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 1quuCX-0001Ma-TE for guix-patches@gnu.org; Mon, 23 Oct 2023 08:38:33 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1quuD0-0007UC-R0; Mon, 23 Oct 2023 08:39:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66701] [PATCH 02/14] gnu: clang-runtime-from-llvm: Add phase for LLVM monorepo. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: hako@ultrarare.space, guix-patches@gnu.org Resent-Date: Mon, 23 Oct 2023 12:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66701 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66701@debbugs.gnu.org Cc: Hilton Chain , Hilton Chain X-Debbugs-Original-Xcc: Hilton Chain Received: via spool by 66701-submit@debbugs.gnu.org id=B66701.169806472528716 (code B ref 66701); Mon, 23 Oct 2023 12:39:02 +0000 Received: (at 66701) by debbugs.gnu.org; 23 Oct 2023 12:38:45 +0000 Received: from localhost ([127.0.0.1]:49340 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quuCi-0007T6-Q3 for submit@debbugs.gnu.org; Mon, 23 Oct 2023 08:38:45 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:56740) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quuCe-0007Se-6g for 66701@debbugs.gnu.org; Mon, 23 Oct 2023 08:38:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1698064537; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=iDXFO6C+8HbHQC+Eb8G91B8EhouBzJsSvEfprfzsexk=; b=QrDVDItacSxILmz1LsmGVn2Yk9yX5rLMbBGrDgqOg5eXNkOTfMLHXiUA6Ix+tO3SRfx79L ofdFttF0cydsIXdh7I6RDj4KdFtQK/OF6wtxPEtzd4ZA6W+KC95p0TrakFBxH9oetwDOa8 xPjM0Bz+R3LZt5uYssSEu2fvIssnFf2IRNTAqcsFyRSzU1LGdDzXCxmk9byy6+ij0qZbA5 L4udfzMfoF4zFfokcPziC8WY6iGbsPnU6hT2EKKe78nwsfufZQWnGZbtnsEisZI8ydp9q4 jMJBtH1gr5TpoSPLBNEMuievEFf5SjG89/qqLEcCDRK646MFXVRFlNb87x2/7g== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Date: Mon, 23 Oct 2023 20:36:10 +0800 Message-ID: <07785d53bcb056226595ed303d4669f43dba5970.1698063805.git.hako@ultrarare.space> In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: -- 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: , Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain 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/llvm.scm (clang-runtime-from-llvm)[arguments]<#:phases>: Change directory to "compiler-rt" for LLVM monorepo. (clang-runtime-15,clang-runtime-14): Adjust accordingly. Change-Id: I6a77c9d106439e4794b8531e2160e2c9ce63d86e --- gnu/packages/llvm.scm | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 38c4047f48..97902fcf5c 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -161,6 +161,11 @@ (define* (clang-runtime-from-llvm llvm (ice-9 match) ,@%cmake-build-system-modules) #:phases (modify-phases (@ (guix build cmake-build-system) %standard-phases) + ,@(if hash + '() + '((add-after 'unpack 'change-directory + (lambda _ + (chdir "compiler-rt"))))) (add-after 'set-paths 'hide-glibc ;; Work around https://issues.guix.info/issue/36882. We need to ;; remove glibc from CPLUS_INCLUDE_PATH so that the one hardcoded @@ -714,28 +719,10 @@ (define-public llvm-14 ("perl" ,perl))))) (define-public clang-runtime-15 - (let ((template (clang-runtime-from-llvm llvm-15))) - (package - (inherit template) - (arguments - (substitute-keyword-arguments (package-arguments template) - ((#:phases phases '(@ (guix build cmake-build-system) %standard-phases)) - #~(modify-phases #$phases - (add-after 'unpack 'change-directory - (lambda _ - (chdir "compiler-rt")))))))))) + (clang-runtime-from-llvm llvm-15)) (define-public clang-runtime-14 - (let ((template (clang-runtime-from-llvm llvm-14))) - (package - (inherit template) - (arguments - (substitute-keyword-arguments (package-arguments template) - ((#:phases phases '(@ (guix build cmake-build-system) %standard-phases)) - #~(modify-phases #$phases - (add-after 'unpack 'change-directory - (lambda _ - (chdir "compiler-rt")))))))))) + (clang-runtime-from-llvm llvm-14)) (define-public clang-15 (clang-from-llvm From patchwork Mon Oct 23 12:36:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 55158 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 D991127BBE9; Mon, 23 Oct 2023 13:39:18 +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=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 8594427BBE2 for ; Mon, 23 Oct 2023 13:39:17 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1quuCp-0003II-8N; Mon, 23 Oct 2023 08:38:51 -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 1quuCY-0003Dj-OE for guix-patches@gnu.org; Mon, 23 Oct 2023 08:38:35 -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 1quuCY-0001Mo-Cz for guix-patches@gnu.org; Mon, 23 Oct 2023 08:38:34 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1quuD1-0007UK-9m; Mon, 23 Oct 2023 08:39:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66701] [PATCH 03/14] gnu: Add llvm-16. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: hako@ultrarare.space, guix-patches@gnu.org Resent-Date: Mon, 23 Oct 2023 12:39:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66701 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66701@debbugs.gnu.org Cc: Hilton Chain , Hilton Chain X-Debbugs-Original-Xcc: Hilton Chain Received: via spool by 66701-submit@debbugs.gnu.org id=B66701.169806472928734 (code B ref 66701); Mon, 23 Oct 2023 12:39:03 +0000 Received: (at 66701) by debbugs.gnu.org; 23 Oct 2023 12:38:49 +0000 Received: from localhost ([127.0.0.1]:49343 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quuCn-0007TN-5w for submit@debbugs.gnu.org; Mon, 23 Oct 2023 08:38:49 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:56752) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quuCj-0007TD-MU for 66701@debbugs.gnu.org; Mon, 23 Oct 2023 08:38:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1698064542; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=z+U/L/CPRZvxh7HThBdA3N6QLUZNpHp4pCUFhPTri70=; b=zIZ8wp5RMVawn+0o5CJFH1yDVmKuHQMo3oGyFOJN6WG+jXf9hkP03TY9+E383tnqCMi2hk 24BqVUBmNfB4GYlSgtNDz2dan9IqCAi/x15dScX0SwBfphzIkDUAbt+QFssRQpVAXdWAnt CtwT7nDpk99nqbK5EIiBJK0Lyl/mHomJfVrr5HNm8u1JQqOxrIpGZnX/R0V6Ki1JQ2To4T X0essJN30aG+ZVPkIREwZ65O2MIoH9AlzwdroV5zMgpoHLAs3nEU2xS2YM7X5NHVd7Nni+ 7UL8gokrwQ7lJZVaraPj12BSqmMj7RZ5/DaN2WHboNnnMomhleRJjGuCQViBhQ== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Date: Mon, 23 Oct 2023 20:36:11 +0800 Message-ID: <09af827fbb41a351b4ce67e139505de43b2b03ca.1698063805.git.hako@ultrarare.space> In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: -- 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: , Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain 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/llvm.scm (llvm-16): New variable. * gnu/packages/patches/clang-16.0-libc-search-path.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. Change-Id: I27738152ca95aeeef8d8b7150fdf14825b6b0b4d --- gnu/local.mk | 1 + gnu/packages/llvm.scm | 12 ++- .../patches/clang-16.0-libc-search-path.patch | 95 +++++++++++++++++++ 3 files changed, 106 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/clang-16.0-libc-search-path.patch diff --git a/gnu/local.mk b/gnu/local.mk index 43145caf80..d606cffd1f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1016,6 +1016,7 @@ dist_patch_DATA = \ %D%/packages/patches/clang-13.0-libc-search-path.patch \ %D%/packages/patches/clang-14.0-libc-search-path.patch \ %D%/packages/patches/clang-15.0-libc-search-path.patch \ + %D%/packages/patches/clang-16.0-libc-search-path.patch \ %D%/packages/patches/clang-runtime-asan-build-fixes.patch \ %D%/packages/patches/clang-runtime-esan-build-fixes.patch \ %D%/packages/patches/clang-runtime-9-libsanitizer-mode-field.patch \ diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 97902fcf5c..6014787efc 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -590,11 +590,13 @@ (define-public (make-clang-toolchain clang libomp) (define %llvm-monorepo-hashes '(("14.0.6" . "14f8nlvnmdkp9a9a79wv67jbmafvabczhah8rwnqrgd5g3hfxxxx") - ("15.0.7" . "12sggw15sxq1krh1mfk3c1f07h895jlxbcifpwk3pznh4m1rjfy2"))) + ("15.0.7" . "12sggw15sxq1krh1mfk3c1f07h895jlxbcifpwk3pznh4m1rjfy2") + ("16.0.6" . "0jxmapg7shwkl88m4mqgfjv4ziqdmnppxhjz6vz51ycp2x4nmjky"))) (define %llvm-patches '(("14.0.6" . ("clang-14.0-libc-search-path.patch")) - ("15.0.7" . ("clang-15.0-libc-search-path.patch")))) + ("15.0.7" . ("clang-15.0-libc-search-path.patch")) + ("16.0.6" . ("clang-16.0-libc-search-path.patch")))) (define (llvm-monorepo version) (origin @@ -1450,6 +1452,12 @@ (define-public clang-3.5 #:legacy-build-shared-libs? #t #:patches '("clang-3.5-libc-search-path.patch"))) +(define-public llvm-16 + (package + (inherit llvm-15) + (version "16.0.6") + (source (llvm-monorepo version)))) + ;; Default LLVM and Clang version. (define-public libomp libomp-13) (define-public llvm llvm-13) diff --git a/gnu/packages/patches/clang-16.0-libc-search-path.patch b/gnu/packages/patches/clang-16.0-libc-search-path.patch new file mode 100644 index 0000000000..282f58f03b --- /dev/null +++ b/gnu/packages/patches/clang-16.0-libc-search-path.patch @@ -0,0 +1,95 @@ +Clang attempts to guess file names based on the OS and distro (yes!), +but unfortunately, that doesn't work for us. + +This patch makes it easy to insert libc's $libdir so that Clang passes the +correct absolute file name of crt1.o etc. to 'ld'. It also disables all +the distro-specific stuff and removes the hard-coded FHS directory names +to make sure Clang also works on foreign distros. + +diff --git a/clang/lib/Driver/Distro.cpp b/clang/lib/Driver/Distro.cpp +index 87a0c5a58511..86ea82eda4b5 100644 +--- a/clang/lib/Driver/Distro.cpp ++++ b/clang/lib/Driver/Distro.cpp +@@ -98,6 +98,10 @@ static Distro::DistroType DetectLsbRelease(llvm::vfs::FileSystem &VFS) { + } + + static Distro::DistroType DetectDistro(llvm::vfs::FileSystem &VFS) { ++ // The compiler should always behave the same, even when used via Guix on a ++ // foreign distro. ++ return Distro::UnknownDistro; ++ + Distro::DistroType Version = Distro::UnknownDistro; + + // Newer freedesktop.org's compilant systemd-based systems +diff --git a/clang/lib/Driver/ToolChains/Cuda.cpp b/clang/lib/Driver/ToolChains/Cuda.cpp +index aa125bb308e8..8b86e144054c 100644 +--- a/clang/lib/Driver/ToolChains/Cuda.cpp ++++ b/clang/lib/Driver/ToolChains/Cuda.cpp +@@ -124,6 +124,9 @@ CudaInstallationDetector::CudaInstallationDetector( + const Driver &D, const llvm::Triple &HostTriple, + const llvm::opt::ArgList &Args) + : D(D) { ++ // Don't look for CUDA in /usr. ++ return; ++ + struct Candidate { + std::string Path; + bool StrictChecking; +diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp +index c6fb290ffdb4..4736f4bb3392 100644 +--- a/clang/lib/Driver/ToolChains/Linux.cpp ++++ b/clang/lib/Driver/ToolChains/Linux.cpp +@@ -189,6 +189,10 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) + + Generic_GCC::PushPPaths(PPaths); + ++ // Comment out the distro-specific tweaks so that they don't bite when ++ // using Guix on a foreign distro. ++#if 0 ++ + Distro Distro(D.getVFS(), Triple); + + if (Distro.IsAlpineLinux() || Triple.isAndroid()) { +@@ -249,6 +253,7 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) + + #ifdef ENABLE_LINKER_BUILD_ID + ExtraOpts.push_back("--build-id"); ++#endif + #endif + + // The selection of paths to try here is designed to match the patterns which +@@ -270,6 +275,7 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) + } + Generic_GCC::AddMultilibPaths(D, SysRoot, OSLibDir, MultiarchTriple, Paths); + ++#if 0 + addPathIfExists(D, concat(SysRoot, "/lib", MultiarchTriple), Paths); + addPathIfExists(D, concat(SysRoot, "/lib/..", OSLibDir), Paths); + +@@ -298,9 +304,11 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) + addPathIfExists(D, concat(SysRoot, "/", OSLibDir, ABIName), Paths); + addPathIfExists(D, concat(SysRoot, "/usr", OSLibDir, ABIName), Paths); + } ++#endif + + Generic_GCC::AddMultiarchPaths(D, SysRoot, OSLibDir, Paths); + ++#if 0 + // The deprecated -DLLVM_ENABLE_PROJECTS=libcxx configuration installs + // libc++.so in D.Dir+"/../lib/". Detect this path. + // TODO Remove once LLVM_ENABLE_PROJECTS=libcxx is unsupported. +@@ -310,6 +318,14 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) + + addPathIfExists(D, concat(SysRoot, "/lib"), Paths); + addPathIfExists(D, concat(SysRoot, "/usr/lib"), Paths); ++#endif ++ ++ // Add libc's lib/ directory to the search path, so that crt1.o, crti.o, ++ // and friends can be found. ++ addPathIfExists(D, "@GLIBC_LIBDIR@", Paths); ++ ++ // Add GCC's lib/ directory so libstdc++.so can be found. ++ addPathIfExists(D, GCCInstallation.getParentLibPath(), Paths); + } + + ToolChain::RuntimeLibType Linux::GetDefaultRuntimeLibType() const { From patchwork Mon Oct 23 12:36:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 55159 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 38D2027BBEA; Mon, 23 Oct 2023 13:39:29 +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=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 AA52127BBE2 for ; Mon, 23 Oct 2023 13:39:28 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1quuCr-0003In-Kn; Mon, 23 Oct 2023 08:38:53 -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 1quuCY-0003Dk-Va for guix-patches@gnu.org; Mon, 23 Oct 2023 08:38:35 -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 1quuCY-0001N7-Na for guix-patches@gnu.org; Mon, 23 Oct 2023 08:38:34 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1quuD1-0007UT-LO; Mon, 23 Oct 2023 08:39:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66701] [PATCH 04/14] gnu: Add clang-runtime-16. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: hako@ultrarare.space, guix-patches@gnu.org Resent-Date: Mon, 23 Oct 2023 12:39:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66701 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66701@debbugs.gnu.org Cc: Hilton Chain , Hilton Chain X-Debbugs-Original-Xcc: Hilton Chain Received: via spool by 66701-submit@debbugs.gnu.org id=B66701.169806473428751 (code B ref 66701); Mon, 23 Oct 2023 12:39:03 +0000 Received: (at 66701) by debbugs.gnu.org; 23 Oct 2023 12:38:54 +0000 Received: from localhost ([127.0.0.1]:49346 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quuCr-0007Tf-Oq for submit@debbugs.gnu.org; Mon, 23 Oct 2023 08:38:54 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:53444) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quuCp-0007TX-Pv for 66701@debbugs.gnu.org; Mon, 23 Oct 2023 08:38:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1698064549; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OjQVxG3A/aU7HFghAvasjyTfQWKs2gjQmzylysSYdPs=; b=hsvtVykx3Txd0N8hDvI8p5kuoquQ2yHE5k01dI8kqKfkwf4jw94ziDdsfDl50U5WwL7ktm AyFz6pUEH6aJ3QwDkdbSALwfOmt25g6aDqcXGtMKVJv+K+/I7TRg+VPsAuNGORckTXhasS br8p/GGHxn7bP5zrHC1rKIgtgIidzcXyWiTMCLXUT3kQ67syFD7hBdhnGIsO7tVzaSICJf Vj8O6JWt8uKP0AVnaR5hmyy0QaERKmPIKVz/UWYnPqlbuJEU+hQVfahPfEXLM0ge3VX+IC TUVq0Hz/gTK1ssRoEtcu0Tby42w34+abFy9pEhWk9/xu3m/nDodYAssHoOwUTA== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Date: Mon, 23 Oct 2023 20:36:12 +0800 Message-ID: <98ca328b441ac4fc6be92d28dd8101405695368c.1698063805.git.hako@ultrarare.space> In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: -- 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: , Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain 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/llvm.scm (clang-runtime-16): New variable. Change-Id: I8812e9e72b711505f7575cc3d62a9a009d25f641 --- gnu/packages/llvm.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 6014787efc..0b1403deb6 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -1458,6 +1458,9 @@ (define-public llvm-16 (version "16.0.6") (source (llvm-monorepo version)))) +(define-public clang-runtime-16 + (clang-runtime-from-llvm llvm-16)) + ;; Default LLVM and Clang version. (define-public libomp libomp-13) (define-public llvm llvm-13) From patchwork Mon Oct 23 12:43:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 55163 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 ACEB527BBE2; Mon, 23 Oct 2023 13:47: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=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 1472C27BBE9 for ; Mon, 23 Oct 2023 13:47:26 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1quuKe-00020f-3D; Mon, 23 Oct 2023 08:46:56 -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 1quuKL-0001fe-96 for guix-patches@gnu.org; Mon, 23 Oct 2023 08:46:41 -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 1quuKI-0003Va-BG for guix-patches@gnu.org; Mon, 23 Oct 2023 08:46:35 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1quuKk-0007jg-8D; Mon, 23 Oct 2023 08:47:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66701] [PATCH 05/14] gnu: Add clang-16. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: hako@ultrarare.space, guix-patches@gnu.org Resent-Date: Mon, 23 Oct 2023 12:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66701 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66701@debbugs.gnu.org Cc: Hilton Chain , Hilton Chain X-Debbugs-Original-Xcc: Hilton Chain Received: via spool by 66701-submit@debbugs.gnu.org id=B66701.169806518029575 (code B ref 66701); Mon, 23 Oct 2023 12:47:02 +0000 Received: (at 66701) by debbugs.gnu.org; 23 Oct 2023 12:46:20 +0000 Received: from localhost ([127.0.0.1]:49374 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quuK4-0007gx-Ht for submit@debbugs.gnu.org; Mon, 23 Oct 2023 08:46:20 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:48432) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quuK0-0007gn-UJ for 66701@debbugs.gnu.org; Mon, 23 Oct 2023 08:46:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1698064993; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=syoLsqArXFfVBiklLB+z8Ajy5qTV0thwNFe9080AYG0=; b=I7O6fepSYtgWN62sbqFXjHID9+kIM0JkaxhAlWp0Abk1UgXQZkEget7iok5SZZ4wh9Cl6h GW6iUNUYcwTeHmu/STMShrgunrc3ji+f2P6M2HWEa4uAuNbUzdIPGnDWQ3rn/1gt8j2pKc CbZrgjjkrkO1iejye5ajbA1PmdIUjVZdMmRzxkds5vQ3AH9x2g/sgZr+lkg1L/VmVw0qUu aUP3UmKcdyVRHFXcLwvEu/BpicISicepk1e3SZC+NAZ0nsBXE0c/XjBdh7CAmY1tgEGAaa v5tFPdhQQKhf78jzDmIpFGhaablIPT2saUfspzrCGG1Cpy3unH48om7VmScDow== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Date: Mon, 23 Oct 2023 20:43:49 +0800 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: -- 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: , Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain 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/llvm.scm (clang-16): New variable. Change-Id: I0e62bced33d2ff5a3064917d4e95004d43dc56fb --- gnu/packages/llvm.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 0b1403deb6..f4b69a7141 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -1461,6 +1461,18 @@ (define-public llvm-16 (define-public clang-runtime-16 (clang-runtime-from-llvm llvm-16)) +(define-public clang-16 + (clang-from-llvm + llvm-16 clang-runtime-16 + #:tools-extra + (origin + (method url-fetch) + (uri (llvm-uri "clang-tools-extra" + (package-version llvm-16))) + (sha256 + (base32 + "0cbgffciql06a1i0ybyyqbnkkr4g7x8cxaar5a5v3415vd27hk0p"))))) + ;; Default LLVM and Clang version. (define-public libomp libomp-13) (define-public llvm llvm-13) From patchwork Mon Oct 23 12:43:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 55164 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 9651027BBE9; Mon, 23 Oct 2023 13:47:28 +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=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 3FC0C27BBEA for ; Mon, 23 Oct 2023 13:47:26 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1quuL1-0002fc-GE; Mon, 23 Oct 2023 08:47:19 -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 1quuKL-0001fg-9D for guix-patches@gnu.org; Mon, 23 Oct 2023 08:46:41 -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 1quuKI-0003Uy-8p for guix-patches@gnu.org; Mon, 23 Oct 2023 08:46:35 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1quuKk-0007jp-L9; Mon, 23 Oct 2023 08:47:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66701] [PATCH 06/14] gnu: Add libomp-16. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: hako@ultrarare.space, guix-patches@gnu.org Resent-Date: Mon, 23 Oct 2023 12:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66701 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66701@debbugs.gnu.org Cc: Hilton Chain , Hilton Chain X-Debbugs-Original-Xcc: Hilton Chain Received: via spool by 66701-submit@debbugs.gnu.org id=B66701.169806519129603 (code B ref 66701); Mon, 23 Oct 2023 12:47:02 +0000 Received: (at 66701) by debbugs.gnu.org; 23 Oct 2023 12:46:31 +0000 Received: from localhost ([127.0.0.1]:49377 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quuKE-0007hN-RC for submit@debbugs.gnu.org; Mon, 23 Oct 2023 08:46:31 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:36288) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quuKC-0007hD-UQ for 66701@debbugs.gnu.org; Mon, 23 Oct 2023 08:46:29 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1698065006; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PJvPxXWV3dHSPWaPp5b7Iz25ueuyOjyqDNJQjWqBZAU=; b=2QYBDrTBT7MzSYRTdpkOyfDEtvEClRlD5hAJTmK+g9yCYeBgSspcVlLBw5uhYELOAcM2dK BV7X61Kpbjg708a9lpSLJFemC18Xr7EoQFxtujwoRhZl7fxVj1EVZ7Rrl2W8GPVNjgB27P rqe1hhFsp4jybeo11haqHwe4oe0qsahexXPUK8EP2y9A71o7abAlOOOxOzkDQqU5Fjd+LD CgtEza66yFvbqtVT/4v3t3SYH4+kaV7aOogkRzb8wU3uSrsmm6bS+M+La1OdvT0NYPWB96 Foy0Wg/aOaf19Wt/zZ9z5VJY6QsZTeWNHZaYJGn3JBEFfdWwPdDAArVeZmMCsw== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Date: Mon, 23 Oct 2023 20:43:50 +0800 Message-ID: <81a0bc6ff849963633347ba59cc82a8a42cad260.1698063805.git.hako@ultrarare.space> In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: -- 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: , Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain 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/llvm.scm (libomp-16): New variable. Change-Id: I2a396f7c7a4c0e35a15ed315c291b4298c0ee967 --- gnu/packages/llvm.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index f4b69a7141..5ba29e3236 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -1473,6 +1473,16 @@ (define-public clang-16 (base32 "0cbgffciql06a1i0ybyyqbnkkr4g7x8cxaar5a5v3415vd27hk0p"))))) +(define-public libomp-16 + (package + (inherit libomp-15) + (version (package-version llvm-16)) + (source (llvm-monorepo version)) + (native-inputs + (modify-inputs (package-native-inputs libomp-15) + (replace "clang" clang-16) + (replace "llvm" llvm-16))))) + ;; Default LLVM and Clang version. (define-public libomp libomp-13) (define-public llvm llvm-13) From patchwork Mon Oct 23 12:43:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 55161 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 38CC827BBEA; Mon, 23 Oct 2023 13:47:09 +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=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 AEA2F27BBE2 for ; Mon, 23 Oct 2023 13:47:08 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1quuKf-0002F8-Ta; Mon, 23 Oct 2023 08:46:58 -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 1quuKL-0001ff-9k for guix-patches@gnu.org; Mon, 23 Oct 2023 08:46:41 -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 1quuKI-0003VZ-Al for guix-patches@gnu.org; Mon, 23 Oct 2023 08:46:35 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1quuKl-0007jx-1g; Mon, 23 Oct 2023 08:47:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66701] [PATCH 07/14] gnu: Add clang-toolchain-16. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: hako@ultrarare.space, guix-patches@gnu.org Resent-Date: Mon, 23 Oct 2023 12:47:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66701 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66701@debbugs.gnu.org Cc: Hilton Chain , Hilton Chain X-Debbugs-Original-Xcc: Hilton Chain Received: via spool by 66701-submit@debbugs.gnu.org id=B66701.169806519629628 (code B ref 66701); Mon, 23 Oct 2023 12:47:03 +0000 Received: (at 66701) by debbugs.gnu.org; 23 Oct 2023 12:46:36 +0000 Received: from localhost ([127.0.0.1]:49380 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quuKK-0007ho-3J for submit@debbugs.gnu.org; Mon, 23 Oct 2023 08:46:36 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:36304) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quuKI-0007hh-Rr for 66701@debbugs.gnu.org; Mon, 23 Oct 2023 08:46:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1698065012; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GtJpOPu3GvgsRd1EgYVs4GxYZ+I61VLZK6FL0Evru/k=; b=VeuHNosKtJR+CsZ01ecLD7yQ4tX5t0J8M9scSAh4m3ke7tIw9W9KwDlNeNRh7JGb0dIv9u WSM8efks9OoBEVo8YRVwdtnSGRpyBQrcUGtL/tnTqQ69eiIwn4S7FmrcP8kPd5MYopqagy F/tfuosdNvGa1zYaH4VfTE4Xe12kdl4OnmjGUc/nmbWeovzW3D4odkp6aNsEI4FrkV8CJR pUOLXSZy4/vBTEWh5UGxx/Bx2T6L+7L4hQjAVZpsswOFvSzmKZ6lcXfYniDcUDHqBvmYKr 42vDVwuvLfN3cl24bXV+G7QK6KhZM2RGCPC4TWshkGXsaR8jW+7kW1oFDBvYKA== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Date: Mon, 23 Oct 2023 20:43:51 +0800 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: -- 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: , Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain 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/llvm.scm (clang-toolchain-16): New variable. Change-Id: I4bc7820b249ab93ff8b7143901c8e4220b7b8b5b --- gnu/packages/llvm.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 5ba29e3236..879e843e4a 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -1483,6 +1483,9 @@ (define-public libomp-16 (replace "clang" clang-16) (replace "llvm" llvm-16))))) +(define-public clang-toolchain-16 + (make-clang-toolchain clang-16 libomp-16)) + ;; Default LLVM and Clang version. (define-public libomp libomp-13) (define-public llvm llvm-13) From patchwork Mon Oct 23 12:43:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 55169 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 22C1727BBE2; Mon, 23 Oct 2023 13:47:50 +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=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 872B727BBEC for ; Mon, 23 Oct 2023 13:47:46 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1quuL5-00034v-BD; Mon, 23 Oct 2023 08:47:23 -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 1quuKL-0001fi-GG for guix-patches@gnu.org; Mon, 23 Oct 2023 08:46:41 -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 1quuKI-0003Vb-LE for guix-patches@gnu.org; Mon, 23 Oct 2023 08:46:35 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1quuKl-0007k5-H8; Mon, 23 Oct 2023 08:47:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66701] [PATCH 08/14] gnu: Add lld-16. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: hako@ultrarare.space, guix-patches@gnu.org Resent-Date: Mon, 23 Oct 2023 12:47:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66701 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66701@debbugs.gnu.org Cc: Hilton Chain , Hilton Chain X-Debbugs-Original-Xcc: Hilton Chain Received: via spool by 66701-submit@debbugs.gnu.org id=B66701.169806520229648 (code B ref 66701); Mon, 23 Oct 2023 12:47:03 +0000 Received: (at 66701) by debbugs.gnu.org; 23 Oct 2023 12:46:42 +0000 Received: from localhost ([127.0.0.1]:49383 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quuKP-0007i7-Oj for submit@debbugs.gnu.org; Mon, 23 Oct 2023 08:46:42 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:43326) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quuKN-0007hy-LG for 66701@debbugs.gnu.org; Mon, 23 Oct 2023 08:46:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1698065016; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+8rjjrCqnIUvcR+rns8Xsd7AtLjlJGdyYtDHhlZr0Iw=; b=JjDM3emo3qf6tPOVMRgJ/5IBTgtMyZPSVbsW7sGy/YiTpyd/krv/qiWQHichO6qdYHA3jg /lGaPiiuLFXUIHa+1kG1I/usPYfKtMOI+iI2RVmqsOhuCXwZZgrhMJydsYFWiPC/AINPQj 42NlocB8Ub/K6CzdCupAJPuu2gHLwseZ8QDP6Miyx7tq8rXghDaJfM3WB7iR9Gi2/j71Lf Ggkf3pwaIDk5VAfUPkqT0y1yb4mr1R7uvHDkMVzIwLm4VfpKMMsaAwW3YFTsz7hWLN8IaN hHTcl2jypl6qC1X9xaz5vTw859ArNiRu+ji2K1eA7iBVzk/PlEmOOAWVIHC/GQ== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Date: Mon, 23 Oct 2023 20:43:52 +0800 Message-ID: <52bfec31d16552c70a32a81303a6cad97220cca4.1698063805.git.hako@ultrarare.space> In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: -- 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: , Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain 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/llvm.scm (lld-16): New variable. Change-Id: If34c0785531bc3603a56f18c18a8e4318cabc493 --- gnu/packages/llvm.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 879e843e4a..ee2131b0dd 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -1630,6 +1630,13 @@ (define-public lld-11 (inputs (modify-inputs (package-inputs lld) (replace "llvm" llvm-11))))) +(define-public lld-16 + (package + (inherit lld-15) + (version (package-version llvm-16)) + (source (llvm-monorepo version)) + (inputs (list llvm-16)))) + (define-public lld lld-14) (define* (make-lld-wrapper lld #:key lld-as-ld?) From patchwork Mon Oct 23 12:43:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 55162 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 491DC27BBE9; Mon, 23 Oct 2023 13:47:18 +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=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 24E5527BBE2 for ; Mon, 23 Oct 2023 13:47:17 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1quuKl-0002Fl-3b; Mon, 23 Oct 2023 08:47:05 -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 1quuKL-0001fh-FV for guix-patches@gnu.org; Mon, 23 Oct 2023 08:46:41 -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 1quuKJ-0003Vc-2E for guix-patches@gnu.org; Mon, 23 Oct 2023 08:46:35 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1quuKl-0007kE-UT; Mon, 23 Oct 2023 08:47:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66701] [PATCH 09/14] gnu: Add llvm-17. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: hako@ultrarare.space, guix-patches@gnu.org Resent-Date: Mon, 23 Oct 2023 12:47:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66701 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66701@debbugs.gnu.org Cc: Hilton Chain , Hilton Chain X-Debbugs-Original-Xcc: Hilton Chain Received: via spool by 66701-submit@debbugs.gnu.org id=B66701.169806520729668 (code B ref 66701); Mon, 23 Oct 2023 12:47:03 +0000 Received: (at 66701) by debbugs.gnu.org; 23 Oct 2023 12:46:47 +0000 Received: from localhost ([127.0.0.1]:49386 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quuKV-0007iS-BP for submit@debbugs.gnu.org; Mon, 23 Oct 2023 08:46:47 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:43342) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quuKS-0007iJ-U6 for 66701@debbugs.gnu.org; Mon, 23 Oct 2023 08:46:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1698065022; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bZBJFOGBdGwFwEgV/HF3vNRcTDKF3Qfyp9WCYy3w0xU=; b=qJsko1F/ulOBetlK8KB9fr5z1qPyIVU1xoMjvc8iNWyOc2JDcBCUvUHPDhZaQQcceHbYeI o54ygBAY75lylPYAFfoS0+U/MTuJMrkndtwX9ERdicKXtD/puICpQnb4/cjXBwkym8GqJ3 wuu8LQgKctP5Lujj6N2luRYiWDL0Sr+5c1fqPe+MEK5FCvp/enaEZVa4g0Bk7BJrmYxhnl AVn1Jb9NLl5htDJ8AbwfBxHFDsAdFH75rs2/L326u1F67Toz6vBXBTcGo3L2K2fRzlhkhK ZY8BkTbKNoBMLPYmK0V7n0VwItACLUG/4T76tIXRT+R4/f9pGjmRWjMaddSqGw== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Date: Mon, 23 Oct 2023 20:43:53 +0800 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: -- 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: , Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain 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/llvm.scm (llvm-17): New variable. * gnu/packages/patches/clang-17.0-libc-search-path.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. Change-Id: I8cdda0737b1137cf86887fb5b854e71977a88b6b --- gnu/local.mk | 1 + gnu/packages/llvm.scm | 12 ++- .../patches/clang-17.0-libc-search-path.patch | 90 +++++++++++++++++++ 3 files changed, 101 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/clang-17.0-libc-search-path.patch diff --git a/gnu/local.mk b/gnu/local.mk index d606cffd1f..6057456c2b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1017,6 +1017,7 @@ dist_patch_DATA = \ %D%/packages/patches/clang-14.0-libc-search-path.patch \ %D%/packages/patches/clang-15.0-libc-search-path.patch \ %D%/packages/patches/clang-16.0-libc-search-path.patch \ + %D%/packages/patches/clang-17.0-libc-search-path.patch \ %D%/packages/patches/clang-runtime-asan-build-fixes.patch \ %D%/packages/patches/clang-runtime-esan-build-fixes.patch \ %D%/packages/patches/clang-runtime-9-libsanitizer-mode-field.patch \ diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index ee2131b0dd..eb806b9cf0 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -591,12 +591,14 @@ (define-public (make-clang-toolchain clang libomp) (define %llvm-monorepo-hashes '(("14.0.6" . "14f8nlvnmdkp9a9a79wv67jbmafvabczhah8rwnqrgd5g3hfxxxx") ("15.0.7" . "12sggw15sxq1krh1mfk3c1f07h895jlxbcifpwk3pznh4m1rjfy2") - ("16.0.6" . "0jxmapg7shwkl88m4mqgfjv4ziqdmnppxhjz6vz51ycp2x4nmjky"))) + ("16.0.6" . "0jxmapg7shwkl88m4mqgfjv4ziqdmnppxhjz6vz51ycp2x4nmjky") + ("17.0.3" . "1fhrnsv87if7kbqmrsxy2r7ykx3gnr9lmbmvkhvycc91ii4ihybx"))) (define %llvm-patches '(("14.0.6" . ("clang-14.0-libc-search-path.patch")) ("15.0.7" . ("clang-15.0-libc-search-path.patch")) - ("16.0.6" . ("clang-16.0-libc-search-path.patch")))) + ("16.0.6" . ("clang-16.0-libc-search-path.patch")) + ("17.0.3" . ("clang-17.0-libc-search-path.patch")))) (define (llvm-monorepo version) (origin @@ -1486,6 +1488,12 @@ (define-public libomp-16 (define-public clang-toolchain-16 (make-clang-toolchain clang-16 libomp-16)) +(define-public llvm-17 + (package + (inherit llvm-15) + (version "17.0.3") + (source (llvm-monorepo version)))) + ;; Default LLVM and Clang version. (define-public libomp libomp-13) (define-public llvm llvm-13) diff --git a/gnu/packages/patches/clang-17.0-libc-search-path.patch b/gnu/packages/patches/clang-17.0-libc-search-path.patch new file mode 100644 index 0000000000..dd4d8cb998 --- /dev/null +++ b/gnu/packages/patches/clang-17.0-libc-search-path.patch @@ -0,0 +1,90 @@ +Clang attempts to guess file names based on the OS and distro (yes!), +but unfortunately, that doesn't work for us. + +This patch makes it easy to insert libc's $libdir so that Clang passes the +correct absolute file name of crt1.o etc. to 'ld'. It also disables all +the distro-specific stuff and removes the hard-coded FHS directory names +to make sure Clang also works on foreign distros. + +diff --git a/clang/lib/Driver/Distro.cpp b/clang/lib/Driver/Distro.cpp +index 6e0087565941..c0a3ba7d7702 100644 +--- a/clang/lib/Driver/Distro.cpp ++++ b/clang/lib/Driver/Distro.cpp +@@ -99,6 +99,10 @@ static Distro::DistroType DetectLsbRelease(llvm::vfs::FileSystem &VFS) { + } + + static Distro::DistroType DetectDistro(llvm::vfs::FileSystem &VFS) { ++ // The compiler should always behave the same, even when used via Guix on a ++ // foreign distro. ++ return Distro::UnknownDistro; ++ + Distro::DistroType Version = Distro::UnknownDistro; + + // Newer freedesktop.org's compilant systemd-based systems +diff --git a/clang/lib/Driver/ToolChains/Cuda.cpp b/clang/lib/Driver/ToolChains/Cuda.cpp +index 3a577650eb08..ca3373edc127 100644 +--- a/clang/lib/Driver/ToolChains/Cuda.cpp ++++ b/clang/lib/Driver/ToolChains/Cuda.cpp +@@ -128,6 +128,9 @@ CudaInstallationDetector::CudaInstallationDetector( + const Driver &D, const llvm::Triple &HostTriple, + const llvm::opt::ArgList &Args) + : D(D) { ++ // Don't look for CUDA in /usr. ++ return; ++ + struct Candidate { + std::string Path; + bool StrictChecking; +diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp +index 1ba222bf83b1..28766c5ab792 100644 +--- a/clang/lib/Driver/ToolChains/Linux.cpp ++++ b/clang/lib/Driver/ToolChains/Linux.cpp +@@ -220,6 +220,10 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) + + Generic_GCC::PushPPaths(PPaths); + ++ // Comment out the distro-specific tweaks so that they don't bite when ++ // using Guix on a foreign distro. ++#if 0 ++ + Distro Distro(D.getVFS(), Triple); + + if (Distro.IsAlpineLinux() || Triple.isAndroid()) { +@@ -280,6 +284,7 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) + + #ifdef ENABLE_LINKER_BUILD_ID + ExtraOpts.push_back("--build-id"); ++#endif + #endif + + // The selection of paths to try here is designed to match the patterns which +@@ -301,6 +306,7 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) + } + Generic_GCC::AddMultilibPaths(D, SysRoot, OSLibDir, MultiarchTriple, Paths); + ++#if 0 + addPathIfExists(D, concat(SysRoot, "/lib", MultiarchTriple), Paths); + addPathIfExists(D, concat(SysRoot, "/lib/..", OSLibDir), Paths); + +@@ -329,11 +335,21 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) + addPathIfExists(D, concat(SysRoot, "/", OSLibDir, ABIName), Paths); + addPathIfExists(D, concat(SysRoot, "/usr", OSLibDir, ABIName), Paths); + } ++#endif + + Generic_GCC::AddMultiarchPaths(D, SysRoot, OSLibDir, Paths); + ++#if 0 + addPathIfExists(D, concat(SysRoot, "/lib"), Paths); + addPathIfExists(D, concat(SysRoot, "/usr/lib"), Paths); ++#endif ++ ++ // Add libc's lib/ directory to the search path, so that crt1.o, crti.o, ++ // and friends can be found. ++ addPathIfExists(D, "@GLIBC_LIBDIR@", Paths); ++ ++ // Add GCC's lib/ directory so libstdc++.so can be found. ++ addPathIfExists(D, GCCInstallation.getParentLibPath(), Paths); + } + + ToolChain::RuntimeLibType Linux::GetDefaultRuntimeLibType() const { From patchwork Mon Oct 23 12:43:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 55168 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 C727E27BBE9; Mon, 23 Oct 2023 13:47:49 +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=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 BCA3627BBEE for ; Mon, 23 Oct 2023 13:47:46 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1quuL5-0003C8-T3; Mon, 23 Oct 2023 08:47:24 -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 1quuKM-0001fj-2E for guix-patches@gnu.org; Mon, 23 Oct 2023 08:46:41 -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 1quuKJ-0003Vd-Df for guix-patches@gnu.org; Mon, 23 Oct 2023 08:46:36 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1quuKm-0007kM-BY; Mon, 23 Oct 2023 08:47:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66701] [PATCH 10/14] gnu: Add clang-runtime-17. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: hako@ultrarare.space, guix-patches@gnu.org Resent-Date: Mon, 23 Oct 2023 12:47:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66701 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66701@debbugs.gnu.org Cc: Hilton Chain , Hilton Chain X-Debbugs-Original-Xcc: Hilton Chain Received: via spool by 66701-submit@debbugs.gnu.org id=B66701.169806521229685 (code B ref 66701); Mon, 23 Oct 2023 12:47:04 +0000 Received: (at 66701) by debbugs.gnu.org; 23 Oct 2023 12:46:52 +0000 Received: from localhost ([127.0.0.1]:49389 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quuKZ-0007ij-Tf for submit@debbugs.gnu.org; Mon, 23 Oct 2023 08:46:52 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:55198) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quuKY-0007ic-DL for 66701@debbugs.gnu.org; Mon, 23 Oct 2023 08:46:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1698065027; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5lkdw+8WrYTJyyDudjg00M/P6GmdlSsQm8Jl7yeMuK4=; b=3FVV3wVqVYmITt2PYSvr6pnJobCBWYVEk0VLb4Vnan7b6je+Mj/N5RSq0P1CdSJM9kwfpr wT0AhF3FHXqB3A4g9GkRNl8Fa76V8x+47v5tCRutZQt9TOR1poWH7w+G24CRspEEviF8DV E89d2dYO3+54cl7qxtUBwa8PnNPp7eVo3GS+kOT7b5y5ockDPnhDc2zsc21v/GUOnhhubP Hnr1/VB991pRL8oPpVCOyjrZ68agceBZ/t8lufs0/ihs/dwQDlSmad+6Joa/dktFUs9KeK BU2WCBPdbn//4RIKDbGu1+4ZQob3QM4E5PGCbzSWRaR6kX53QYtCNac2a6xp6A== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Date: Mon, 23 Oct 2023 20:43:54 +0800 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: -- 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: , Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain 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/llvm.scm (clang-runtime-17): New variable. Change-Id: I675475e9f4914843283966f5c622cdb214d11e34 --- gnu/packages/llvm.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index eb806b9cf0..06ecbf7e1b 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -1494,6 +1494,9 @@ (define-public llvm-17 (version "17.0.3") (source (llvm-monorepo version)))) +(define-public clang-runtime-17 + (clang-runtime-from-llvm llvm-17)) + ;; Default LLVM and Clang version. (define-public libomp libomp-13) (define-public llvm llvm-13) From patchwork Mon Oct 23 12:43:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 55166 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 5E0CF27BBE2; Mon, 23 Oct 2023 13:47:34 +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=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 9AD0F27BBE9 for ; Mon, 23 Oct 2023 13:47:33 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1quuL3-0002uQ-SN; Mon, 23 Oct 2023 08:47:21 -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 1quuKM-0001jD-Tn for guix-patches@gnu.org; Mon, 23 Oct 2023 08:46:47 -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 1quuKK-0003Vk-V6 for guix-patches@gnu.org; Mon, 23 Oct 2023 08:46:37 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1quuKm-0007kV-P7; Mon, 23 Oct 2023 08:47:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66701] [PATCH 11/14] gnu: Add clang-17. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: hako@ultrarare.space, guix-patches@gnu.org Resent-Date: Mon, 23 Oct 2023 12:47:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66701 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66701@debbugs.gnu.org Cc: Hilton Chain , Hilton Chain X-Debbugs-Original-Xcc: Hilton Chain Received: via spool by 66701-submit@debbugs.gnu.org id=B66701.169806521629707 (code B ref 66701); Mon, 23 Oct 2023 12:47:04 +0000 Received: (at 66701) by debbugs.gnu.org; 23 Oct 2023 12:46:56 +0000 Received: from localhost ([127.0.0.1]:49392 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quuKe-0007j5-7J for submit@debbugs.gnu.org; Mon, 23 Oct 2023 08:46:56 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:55202) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quuKc-0007iu-LM for 66701@debbugs.gnu.org; Mon, 23 Oct 2023 08:46:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1698065032; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1/5gFi7e2WC8dhlkoVFo/KHXSxM0lmTN/5Qh4oyPrrE=; b=c/OM78mgQP7Qc3kWu+532Qxb0PlDAbolpSqC1ClF+aeFcHOscZndSdk4PcJKKwOw9BdgfD 1iVDn5QV482I0DrliFsS+vTIKxbyO+ZLCvOfdFM6Tp8ic3Rfk1zQpLndD5loov/8KGjlw2 cbUNBBP+6kUZKhdB/FhtjIIWPMlZ6RYqtKb2rcGVut9pCVhBojK7jtFDYntVgT12UxLJrA m/KTA+L0awqW9mzDh1zp+wwGaVpu16HbEHWrmGFxqMCMrZi8BgZzpFhj5wMS+4JJca5NyD jWR8eExLhHUsC5jFRe3u+VDLUAia2wzRCn9+wfHCUEjW5aQgSrGk1tEITlKM9Q== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Date: Mon, 23 Oct 2023 20:43:55 +0800 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: -- 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: , Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain 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/llvm.scm (clang-from-llvm)[arguments]: Include test runner in CMakeLists.txt when version >= 17. (clang-17): New variable. Change-Id: Ia3cd8013d497b72522e95f6face5975bf79f93b3 --- gnu/packages/llvm.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 06ecbf7e1b..8dc87ad01b 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -358,6 +358,15 @@ (define* (clang-from-llvm llvm clang-runtime (("@GLIBC_LIBDIR@") (string-append libc "/lib")))))) #t))) + ,@(if (version>=? version "17") + '((add-after 'unpack 'include-test-runner + (lambda _ + (substitute* "CMakeLists.txt" + ((".*llvm_gtest" line) + (string-append + "add_subdirectory(${LLVM_THIRD_PARTY_DIR}/uni\ +ttest third-party/unittest)\n" line)))))) + '()) ;; Awkwardly, multiple phases added after the same phase, ;; e.g. unpack, get applied in the reverse order. In other ;; words, adding 'change-directory last means it occurs @@ -1497,6 +1506,18 @@ (define-public llvm-17 (define-public clang-runtime-17 (clang-runtime-from-llvm llvm-17)) +(define-public clang-17 + (clang-from-llvm + llvm-17 clang-runtime-17 + #:tools-extra + (origin + (method url-fetch) + (uri (llvm-uri "clang-tools-extra" + (package-version llvm-17))) + (sha256 + (base32 + "0an16xdc8rgrdf0dcq3sdg82ajyb00h4bff9n0gm7gqf48ds0da8"))))) + ;; Default LLVM and Clang version. (define-public libomp libomp-13) (define-public llvm llvm-13) From patchwork Mon Oct 23 12:43:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 55165 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 4757627BBEA; Mon, 23 Oct 2023 13:47:29 +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=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 F1B2E27BBE2 for ; Mon, 23 Oct 2023 13:47:26 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1quuL2-0002lM-FS; Mon, 23 Oct 2023 08:47:20 -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 1quuKM-0001jB-P9 for guix-patches@gnu.org; Mon, 23 Oct 2023 08:46:42 -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 1quuKK-0003Vh-BU for guix-patches@gnu.org; Mon, 23 Oct 2023 08:46:37 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1quuKn-0007kb-91; Mon, 23 Oct 2023 08:47:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66701] [PATCH 12/14] gnu: Add libomp-17. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: hako@ultrarare.space, guix-patches@gnu.org Resent-Date: Mon, 23 Oct 2023 12:47:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66701 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66701@debbugs.gnu.org Cc: Hilton Chain , Hilton Chain X-Debbugs-Original-Xcc: Hilton Chain Received: via spool by 66701-submit@debbugs.gnu.org id=B66701.169806522229736 (code B ref 66701); Mon, 23 Oct 2023 12:47:05 +0000 Received: (at 66701) by debbugs.gnu.org; 23 Oct 2023 12:47:02 +0000 Received: from localhost ([127.0.0.1]:49395 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quuKj-0007jV-KX for submit@debbugs.gnu.org; Mon, 23 Oct 2023 08:47:01 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:41140) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quuKi-0007jH-JO for 66701@debbugs.gnu.org; Mon, 23 Oct 2023 08:47:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1698065037; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tzJ+Axm4RRczPCIVTSzbwkJUo60LeQiECSeseq762UA=; b=wy3qusemtT983wmLml4AtfAIN+RDF1zHWkQdYXdNHDy7ksIdCwK5FbUg3YIex246Qc76Rx wqmmy2gtYuYkQ1vNE9igenQJyqM3Gez4j/P2xeI+KFNTbHjcMQslCwHluDUs9mB54hX3t9 V/4zNfeoijfVMY7KLlpQg3B/03gsn7P9J56bdJpeDXdTpSEEBZoQoq3Vi1uQKlwaRnjiZs qwk1/J71u9zRPjKnKUowNTuXMCvC893sfFNA5U0ry6a5dBsgyaqkeKhfeqEwOj8iCtH5bR H7qMSIPo/H/KIZZ0woQSFFHyVWNd7HlOG0y+nWvV8P9cE4zGPF6obrYfcILB1g== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Date: Mon, 23 Oct 2023 20:43:56 +0800 Message-ID: <54d0c9a14d8d8a062b9e7f7a46429d7b93cc40ab.1698063805.git.hako@ultrarare.space> In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: -- 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: , Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain 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/llvm.scm (libomp-17): New variable. Change-Id: I6ad09d8feff0053dfc811a741e00445dfecb311f --- gnu/packages/llvm.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 8dc87ad01b..1f37f42a17 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -1518,6 +1518,16 @@ (define-public clang-17 (base32 "0an16xdc8rgrdf0dcq3sdg82ajyb00h4bff9n0gm7gqf48ds0da8"))))) +(define-public libomp-17 + (package + (inherit libomp-15) + (version (package-version llvm-17)) + (source (llvm-monorepo version)) + (native-inputs + (modify-inputs (package-native-inputs libomp-15) + (replace "clang" clang-17) + (replace "llvm" llvm-17))))) + ;; Default LLVM and Clang version. (define-public libomp libomp-13) (define-public llvm llvm-13) From patchwork Mon Oct 23 12:43:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 55167 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 4A9B627BBE2; Mon, 23 Oct 2023 13:47:47 +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=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 6BCE327BBEA for ; Mon, 23 Oct 2023 13:47:46 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1quuLM-00041q-LM; Mon, 23 Oct 2023 08:47:40 -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 1quuLG-0003tX-08 for guix-patches@gnu.org; Mon, 23 Oct 2023 08:47:34 -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 1quuLF-0003q8-NS for guix-patches@gnu.org; Mon, 23 Oct 2023 08:47:33 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1quuLh-0007mi-L0; Mon, 23 Oct 2023 08:48:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66701] [PATCH 13/14] gnu: Add clang-toolchain-17. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: hako@ultrarare.space, guix-patches@gnu.org Resent-Date: Mon, 23 Oct 2023 12:48:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66701 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66701@debbugs.gnu.org Cc: Hilton Chain , Hilton Chain X-Debbugs-Original-Xcc: Hilton Chain Received: via spool by 66701-submit@debbugs.gnu.org id=B66701.169806523129834 (code B ref 66701); Mon, 23 Oct 2023 12:48:01 +0000 Received: (at 66701) by debbugs.gnu.org; 23 Oct 2023 12:47:11 +0000 Received: from localhost ([127.0.0.1]:49414 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quuKs-0007l8-So for submit@debbugs.gnu.org; Mon, 23 Oct 2023 08:47:11 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:34206) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quuKr-0007ky-6R for 66701@debbugs.gnu.org; Mon, 23 Oct 2023 08:47:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1698065044; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PI+0QIF/gkmL/hg4vpcdfj3ayAtwwfd9MKdmXNcMWXg=; b=PFknK5y15yCVmMHjp78dSGQOtsI3+pR7k60yU67XcEdehchtPzJkKoUjZ8AtbBN5wSDhyL zJN4yiwdJ03JsedxIueOAiTWxCCUbug3AYYQ4EkfTdI2mu+FtYeRPbAOuCRIHcsbbKFh3z nJlyUOkBTxm1uuz7b7h1dTE9qRSLhn5Ks3FTDfVRmF0SYuOnfW9GLfuF9vBF+I5hHMCXTS pOOTqMYnx4AVuLQbrCWM/XcwTeWRnXyWkjitWQUE2U8zNQv+3uF+RXsu2DJg70IaR4wVzu SyQraffduaexYXwp96mqBDaX3Oaf5MZ7nN7E9FaTzXs+1f+4rU+m9Q1S9RBEQA== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Date: Mon, 23 Oct 2023 20:43:57 +0800 Message-ID: <3e313afa60b31864c5ec78faaf9101f054c7a6af.1698063805.git.hako@ultrarare.space> In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: -- 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: , Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain 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/llvm.scm (clang-toolchain-17): New variable. Change-Id: Iefec981c84249db0d1c740c156835dfea9030f47 --- gnu/packages/llvm.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 1f37f42a17..795488abee 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -1528,6 +1528,9 @@ (define-public libomp-17 (replace "clang" clang-17) (replace "llvm" llvm-17))))) +(define-public clang-toolchain-17 + (make-clang-toolchain clang-17 libomp-17)) + ;; Default LLVM and Clang version. (define-public libomp libomp-13) (define-public llvm llvm-13) From patchwork Mon Oct 23 12:43:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 55170 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 239A327BBE9; Mon, 23 Oct 2023 13:47:50 +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=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 6F08027BBEB for ; Mon, 23 Oct 2023 13:47:46 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1quuLM-0003yo-LJ; Mon, 23 Oct 2023 08:47:40 -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 1quuLF-0003oZ-GN for guix-patches@gnu.org; Mon, 23 Oct 2023 08:47:33 -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 1quuLF-0003pr-6P for guix-patches@gnu.org; Mon, 23 Oct 2023 08:47:33 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1quuLi-0007mp-3E; Mon, 23 Oct 2023 08:48:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66701] [PATCH 14/14] gnu: Add lld-17. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: hako@ultrarare.space, guix-patches@gnu.org Resent-Date: Mon, 23 Oct 2023 12:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66701 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66701@debbugs.gnu.org Cc: Hilton Chain , Hilton Chain X-Debbugs-Original-Xcc: Hilton Chain Received: via spool by 66701-submit@debbugs.gnu.org id=B66701.169806523629856 (code B ref 66701); Mon, 23 Oct 2023 12:48:02 +0000 Received: (at 66701) by debbugs.gnu.org; 23 Oct 2023 12:47:16 +0000 Received: from localhost ([127.0.0.1]:49417 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quuKy-0007lU-4V for submit@debbugs.gnu.org; Mon, 23 Oct 2023 08:47:16 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:34220) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quuKw-0007lM-Rh for 66701@debbugs.gnu.org; Mon, 23 Oct 2023 08:47:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1698065051; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aCqVv31PhhiSmWeuatJBZG+pRrvqNtQZzy2TigpkugU=; b=CcuQQrxdQfIDglFDao2W76kQFP7xQwVwQfssEJLFB/1EvXAQX1bYG7lAh8qzMoiPTAs2uB gT60M3mixBASVkdkOVeIbBwrNs7olZ2m/xb11UofmI4d+XNepSn85+cb+5WmMnH3e1dc2D 56crtdZvg/sNHPIAarsfRi9MfhkpOo4bF4d/nhJU4N6g19+fY1wuMPRxi4GbWNikJYv4ri AAEiIUBo0C4jW6uMv24jwiQ9pR230O2979fgsjEq3P1ijsQms1oodI4VnGw0AZRTP00dLy v7TYrLgvoBOxF+dghc3UAcdoH6MEqEEiy1D4zmif1tTOWu29uiD2OYlH4thLVQ== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Date: Mon, 23 Oct 2023 20:43:58 +0800 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: -- 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: , Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain 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/llvm.scm (lld-17): New variable. Change-Id: Idbb84efc1c749179dfdb874390bfc1caf4e753d3 --- gnu/packages/llvm.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 795488abee..c3269ce013 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -1682,6 +1682,13 @@ (define-public lld-16 (source (llvm-monorepo version)) (inputs (list llvm-16)))) +(define-public lld-17 + (package + (inherit lld-15) + (version (package-version llvm-17)) + (source (llvm-monorepo version)) + (inputs (list llvm-17)))) + (define-public lld lld-14) (define* (make-lld-wrapper lld #:key lld-as-ld?)