From patchwork Thu Mar 3 16:07:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 37596 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 CE11927BBEA; Thu, 3 Mar 2022 16:26:32 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, 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 3E35627BBE9 for ; Thu, 3 Mar 2022 16:26:32 +0000 (GMT) Received: from localhost ([::1]:54880 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nPoHe-0001OO-La for patchwork@mira.cbaines.net; Thu, 03 Mar 2022 11:26:31 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33440) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nPo0l-0006y2-VX for guix-patches@gnu.org; Thu, 03 Mar 2022 11:09:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:49613) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nPo0k-00086r-OZ for guix-patches@gnu.org; Thu, 03 Mar 2022 11:09:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nPo0k-0000WA-Jx for guix-patches@gnu.org; Thu, 03 Mar 2022 11:09:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54239] [PATCH 2/5] gnu: Add cross-clang. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 03 Mar 2022 16:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54239 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54239@debbugs.gnu.org Received: via spool by 54239-submit@debbugs.gnu.org id=B54239.16463236871887 (code B ref 54239); Thu, 03 Mar 2022 16:09:02 +0000 Received: (at 54239) by debbugs.gnu.org; 3 Mar 2022 16:08:07 +0000 Received: from localhost ([127.0.0.1]:43499 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPnzq-0000UH-U4 for submit@debbugs.gnu.org; Thu, 03 Mar 2022 11:08:07 -0500 Received: from lepiller.eu ([89.234.186.109]:57046) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPnzo-0000Tf-Vb for 54239@debbugs.gnu.org; Thu, 03 Mar 2022 11:08:05 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 3f778e49 for <54239@debbugs.gnu.org>; Thu, 3 Mar 2022 16:08:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=LL98cMsYp37N6reHNAZN2FRGc 8/iRP1UvJQxQ/xjN0M=; b=fDTAJW3oFQRCxWRK8Ky9bsOYpNbfQCQ03VZ2+5Tk9 b4UvYg+yO9pWgSZV/WA62xA3POvQ0GCu4sCJ2Ux7EbUrQmdYuL/D2+WiL16tRckJ ozUAnGqby5S779PQU7Gt6OUOA0ksxT/0IA9lGAoXfX3o4GppJwcbfnvqgJO07VW8 6A1lrWkXV46SOCtnO2dN4mFEgvmGIcO4dUQyi3VfsRWTEDPQjB5KBT3XsNEnKvnw nslPwhk5WVAyBn3mIHQk+oEaqSn8lK/c3wYeFB/up9LUSzHKCU3ixwMwjJ3Yv+/+ hiyaN3vzlhEMzwY45CZdnccaE0HYqSHgIKql5cCYGsGfw== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id da5e0cd9 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <54239@debbugs.gnu.org>; Thu, 3 Mar 2022 16:08:01 +0000 (UTC) From: Julien Lepiller Date: Thu, 3 Mar 2022 17:07:44 +0100 Message-Id: X-Mailer: git-send-email 2.34.0 In-Reply-To: <499e5dba47ef40df93a8b33fbb8e41cc2354e7a1.1646322873.git.julien@lepiller.eu> References: <499e5dba47ef40df93a8b33fbb8e41cc2354e7a1.1646322873.git.julien@lepiller.eu> 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/llvm.scm (cross-clang): New variable. --- gnu/packages/llvm.scm | 125 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 124 insertions(+), 1 deletion(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index d6e9846699..c02f8e5c7a 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -54,6 +54,7 @@ (define-module (gnu packages llvm) #:use-module (guix build-system trivial) #:use-module (gnu packages) #:use-module (gnu packages base) + #:use-module (gnu packages cross-base) #:use-module (gnu packages gcc) #:use-module (gnu packages bootstrap) ;glibc-dynamic-linker #:use-module (gnu packages check) ;python-lit @@ -75,7 +76,8 @@ (define-module (gnu packages llvm) #:use-module (ice-9 match) #:export (make-lld-wrapper system->llvm-target - cross-llvm)) + cross-llvm + cross-clang)) (define* (system->llvm-target #:optional (system (or (and=> (%current-target-system) @@ -1023,6 +1025,127 @@ (define-public clang-runtime clang-runtime-13) (define-public clang clang-13) (define-public clang-toolchain clang-toolchain-13) +(define* (cross-clang target + #:optional + (libc (cross-libc target)) + (xgcc (cross-gcc target + #:xbinutils (cross-binutils target) + #:libc (cross-libc target))) + (clang clang)) + "Return a cross-clang compiler for target." + (package + (inherit clang) + (version (package-version clang)) + ;; Support the same variables as clang, even in cross-compilation context. + ;; Clang does not make a difference between native and cross-compilation. + (search-paths + (append + (list + (search-path-specification + (variable "CROSS_LIBRARY_PATH") + (files '("lib" "lib64")))) + (package-native-search-paths clang))) + (native-search-paths '()) + (arguments + (substitute-keyword-arguments (package-arguments clang) + ((#:configure-flags _) + `(list "-DCLANG_INCLUDE_TESTS=True" + (string-append "-DGCC_INSTALL_PREFIX=" + (assoc-ref %build-inputs "cross-gcc-lib")) + (string-append "-DC_INCLUDE_DIRS=" + (assoc-ref %build-inputs "target-libc") + "/include"))) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'add-missing-libdir + (lambda _ + ;; cross-gcc installs its libraries in /lib instead of + ;; lib. + (substitute* "lib/Driver/ToolChain.cpp" + (("\"-L\"\\) \\+ LibPath\\)\\);") + ,(string-append "\"-L\") + LibPath)); + CmdArgs.push_back(Args.MakeArgString(StringRef(\"-L\") + " + "StringRef(GCC_INSTALL_PREFIX) + StringRef(\"/" + target "/lib\"))); + CmdArgs.push_back(Args.MakeArgString(StringRef(\"-rpath=\") + " + "StringRef(GCC_INSTALL_PREFIX) + StringRef(\"/" + target "/lib\")));"))))) + (add-after 'unpack 'support-cross-library-path + (lambda _ + ;; LIBRARY_PATH is only supported for native builds, but we still + ;; need it (or CROSS_LIBRARY_PATH to be precise) when + ;; cross-compiling + (substitute* "lib/Driver/ToolChains/CommonArgs.cpp" + (("LIBRARY_PATH\"") + "LIBRARY_PATH\"); + } else { + addDirectoryList(Args, CmdArgs, \"-L\", \"CROSS_LIBRARY_PATH\"")))) + (replace 'set-glibc-file-names + (lambda* (#:key inputs #:allow-other-keys) + (let ((libc (assoc-ref inputs "target-libc")) + (compiler-rt (assoc-ref inputs "clang-runtime")) + (gcc (assoc-ref inputs "cross-gcc"))) + (setenv "LIBRARY_PATH" + (string-append + (assoc-ref inputs "libc") "/lib:" (getenv "LIBRARY_PATH"))) + ,@(cond + ((version>=? version "6.0") + `(;; Link to libclang_rt files from clang-runtime. + (substitute* "lib/Driver/ToolChain.cpp" + (("getDriver\\(\\)\\.ResourceDir") + (string-append "\"" compiler-rt "\""))) + + ;; Make "LibDir" refer to /lib so that it + ;; uses the right dynamic linker file name. + (substitute* "lib/Driver/ToolChains/Linux.cpp" + (("(^[[:blank:]]+LibDir = ).*" _ declaration) + (string-append declaration "\"" libc "/lib\";\n")) + + ;; Make clang look for libstdc++ in the right + ;; location. + (("LibStdCXXIncludePathCandidates\\[\\] = \\{") + (string-append + "LibStdCXXIncludePathCandidates[] = { \"" gcc + "/include/c++\",")) + + ;; Make sure libc's libdir is on the search path, to + ;; allow crt1.o & co. to be found. + (("@GLIBC_LIBDIR@") + (string-append libc "/lib"))))) + (else + `((substitute* "lib/Driver/Tools.cpp" + ;; Patch the 'getLinuxDynamicLinker' function so that + ;; it uses the right dynamic linker file name. + (("/lib64/ld-linux-x86-64.so.2") + (string-append libc ,(glibc-dynamic-linker)))) + + ;; Link to libclang_rt files from clang-runtime. + ;; This substitution needed slight adjustment in 3.8. + ,@(if (version>=? version "3.8") + '((substitute* "lib/Driver/Tools.cpp" + (("TC\\.getDriver\\(\\)\\.ResourceDir") + (string-append "\"" compiler-rt "\"")))) + '((substitute* "lib/Driver/ToolChain.cpp" + (("getDriver\\(\\)\\.ResourceDir") + (string-append "\"" compiler-rt "\""))))) + + ;; Make sure libc's libdir is on the search path, to + ;; allow crt1.o & co. to be found. + (substitute* "lib/Driver/ToolChains.cpp" + (("@GLIBC_LIBDIR@") + (string-append libc "/lib"))))))))))))) + (inputs + `(("target-libc" ,libc) + ("cross-gcc-lib" ,xgcc "lib") + ("cross-gcc" ,xgcc) + ,@(package-inputs clang))) + (propagated-inputs + (modify-inputs (package-propagated-inputs clang) + (replace "llvm" + (cross-llvm + (car (assoc-ref (package-propagated-inputs clang) "llvm")) + target)))))) + (define-public llvm-for-rocm (package ;; Actually based on LLVM 13 as of v4.3, but llvm-12 works just fine.