From patchwork Thu Jun 22 09:19:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 51167 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 40F7527BBE2; Thu, 22 Jun 2023 10:24: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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id AAAB027BBEE for ; Thu, 22 Jun 2023 10:24:24 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qCGXt-0006fm-UW; Thu, 22 Jun 2023 05:24: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 1qCGXq-0006eh-W3 for guix-patches@gnu.org; Thu, 22 Jun 2023 05:24:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qCGXq-0004dk-Ne for guix-patches@gnu.org; Thu, 22 Jun 2023 05:24:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qCGXq-0001bN-K4 for guix-patches@gnu.org; Thu, 22 Jun 2023 05:24:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64218] [PATCH 5/7] gnu: ldc: Build with llvm-15. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 22 Jun 2023 09:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64218 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64218@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 64218-submit@debbugs.gnu.org id=B64218.16874257926067 (code B ref 64218); Thu, 22 Jun 2023 09:24:02 +0000 Received: (at 64218) by debbugs.gnu.org; 22 Jun 2023 09:23:12 +0000 Received: from localhost ([127.0.0.1]:34826 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qCGX1-0001Zl-5q for submit@debbugs.gnu.org; Thu, 22 Jun 2023 05:23:11 -0400 Received: from mail-wr1-f47.google.com ([209.85.221.47]:61910) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qCGWt-0001Xc-Db for 64218@debbugs.gnu.org; Thu, 22 Jun 2023 05:23:04 -0400 Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-31122c346f4so7907228f8f.3 for <64218@debbugs.gnu.org>; Thu, 22 Jun 2023 02:23:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687425778; x=1690017778; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=qGElGpoctSoyXKkyzTP6odLm66alMx9VXww6T4S6tbA=; b=qoEX+/6mKO+bi7FtNDhPZ4d6om3BPeZRFBBg9rwEN24b6sIZVUULkiA0D/FxspjA20 RNKYQGEYkBRWHn4Ot1RPPOjk6dpSziYAF0hCpcnb1sdkh37DRD0KYN4jAANxjJCQwCX7 uhVYMTriHEL+RhAUJYAy64nN5N8D8zKU6CivH+f/c3/UGQicWvSC3wgZIzFa58zPjqJM +I9Y10xQ8twuh0SThi9GX9eKM0/uvMfRqmIHFRQ8MytcTAiw7eM8OXqFFAahXogev7Ey 8AGUehAwqXHmycHA9CfC3E9NH1C5MUaUiZ7gmD5pbwDdXnd6NDRhHBw4DvGx0wZVQKOZ et+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687425778; x=1690017778; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=qGElGpoctSoyXKkyzTP6odLm66alMx9VXww6T4S6tbA=; b=cDDVaWJen8idwgyJR1sjF4AkXKyPC/uyJIhFXg6DXt22/Pt7dobHh1xgI3CjtVqfci e6ly0pFBHU1JCrMm6p6phwTsStiTIseD2XjBeQsHnV4A0e8tQUix3RxwCTBMA5KFnHTr uyDkGqwRwM3B/5MWMfiMSRHclVVlXzvop7liQmK2FqfUIarPsXNF1EbwatoSK9JymQJg TkmERQYbo6PtTy/rKR7ig8JlnY7yeZL0Fd+9K5Q6woT9wPW0pPjlQnmK31sy6XxACqzG a3CkGpCPm7MteTYJmJd9p4sO9AWwIlH/ZumcaWkhc2lZmifzJJIu+XS4TAkRpiuDIKz6 PvDQ== X-Gm-Message-State: AC+VfDyMEJW85w7BSE6Cyx/tpUxGOEx0mPlU+ShAU88d2JZStojiwHlz 6LmtqE730rj4jDphsa4i0q4eU8YhLrdqqA== X-Google-Smtp-Source: ACHHUZ4AbkAIcZCANDugR9XFSqvI0ZNORzzsSOe6ZXMmYTeMGvRzcPPFb4Ik7i3MohuIlOEOzgBbVg== X-Received: by 2002:adf:cd91:0:b0:312:74a9:825a with SMTP id q17-20020adfcd91000000b0031274a9825amr10104775wrj.62.1687425777599; Thu, 22 Jun 2023 02:22:57 -0700 (PDT) Received: from localhost ([188.120.129.124]) by smtp.gmail.com with ESMTPSA id d2-20020adfe842000000b0031274a184d5sm6568793wrn.109.2023.06.22.02.22.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jun 2023 02:22:57 -0700 (PDT) From: Efraim Flashner Date: Thu, 22 Jun 2023 12:19:12 +0300 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/check.scm (python-lit)[native-inputs]: Replace llvm-14 with llvm-15. * gnu/packages/dlang.scm (ldc-bootstrap)[arguments]: Adjust configure-flags to make use of llvm shared libraries. [native-inputs]: Replace lld-wrapper-14 with lld-wrapper-15, llvm-14 with llvm-15. (ldc)[arguments]: Inherit configure-flags from ldc-bootstrap. Update skipped tests. [native-inputs]: Replace clang-14 with clang-15. --- gnu/packages/check.scm | 2 +- gnu/packages/dlang.scm | 64 +++++++++++++++++++++++++++++++++--------- 2 files changed, 52 insertions(+), 14 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 82b4741212..4c1ba085c4 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2349,7 +2349,7 @@ (define-public python-lit (when tests? (invoke "python" "lit.py" "tests"))))))) (native-inputs - (list llvm-14)) + (list llvm-15)) (home-page "https://llvm.org/") (synopsis "LLVM Software Testing Tool") (description "@code{lit} is a portable tool for executing LLVM and Clang diff --git a/gnu/packages/dlang.scm b/gnu/packages/dlang.scm index 2b5b1235e4..3103e629d9 100644 --- a/gnu/packages/dlang.scm +++ b/gnu/packages/dlang.scm @@ -163,7 +163,9 @@ (define ldc-bootstrap #:tests? #f ;skip in the bootstrap #:build-type "Release" #:configure-flags - (list "-GNinja") + (list "-GNinja" + "-DLLVM_IS_SHARED=ON" + "-DBUILD_SHARED_LIBS=ON") #:make-flags ;used as build targets (list "all") #:phases @@ -190,8 +192,8 @@ (define ldc-bootstrap ("libedit" ,libedit) ("zlib" ,zlib))) (native-inputs - `(("lld-wrapper" ,(make-lld-wrapper lld-14 #:lld-as-ld? #t)) - ("llvm" ,llvm-14) + `(("lld-wrapper" ,(make-lld-wrapper lld-15 #:lld-as-ld? #t)) + ("llvm" ,llvm-15) ("ldc" ,gdmd) ("ninja" ,ninja) ("python-wrapper" ,python-wrapper) @@ -224,10 +226,6 @@ (define-public ldc '(list "all" ;; Also build the test runner binaries. "ldc2-unittest" "all-test-runners")) - ((#:configure-flags flags) - `(,@flags "-DBUILD_SHARED_LIBS=ON" - "-DLDC_LINK_MANUALLY=OFF" - "-DLDC_DYNAMIC_COMPILE=OFF")) ((#:phases phases) `(modify-phases ,phases (add-after 'unpack 'fix-compiler-rt-library-discovery @@ -314,13 +312,39 @@ (define-public ldc "instrument/xray_check_pipeline.d" "instrument/xray_link.d" "instrument/xray_simple_execution.d" + "sanitizers/fuzz_asan.d" + "sanitizers/fuzz_basic.d" + "sanitizers/fuzz_mixin.d" + "sanitizers/link_fuzzer.d" "sanitizers/msan_noerror.d" "sanitizers/msan_uninitialized.d" "dmd/runnable_cxx/cppa.d"))) (,(target-aarch64?) (for-each delete-file - '("dmd/runnable/ldc_cabi1.d" + '("PGO/allstatementtypes.d" + "PGO/branching_switch.d" + "PGO/break.d" + "PGO/exceptions.d" + "PGO/final_switch_release.d" + "PGO/functions.d" + "PGO/hash.d" + "PGO/hash_smallchange.d" + "PGO/irbased_indirect_calls.d" + "PGO/max_function_count.d" + "PGO/profile_rt_calls.d" + "PGO/reset_counters.d" + "PGO/singleobj.d" + "PGO/summary.d" + "PGO/unrolledloopstatement_gh3375.d" + "instrument/xray_link.d" + "instrument/xray_simple_execution.d" + "sanitizers/asan_dynalloc.d" + "sanitizers/asan_interface.d" + "sanitizers/asan_noerror.d" + "sanitizers/asan_stackoverflow.d" + "sanitizers/fuzz_asan.d" "sanitizers/fuzz_basic.d" + "sanitizers/lsan_memleak.d" "sanitizers/msan_noerror.d" "sanitizers/msan_uninitialized.d"))) (#t '()))))) @@ -341,9 +365,11 @@ (define-public ldc ;; finer-grained diagnostics (see: ;; https://raw.githubusercontent.com/ldc-developers/ ;; ldc/master/.azure-pipelines/3-posix-test.yml) - (display "running the ldc2 unit tests...\n") - (invoke "ctest" "--output-on-failure" "-j" job-count - "-R" "ldc2-unittest") + ;; This test segfaults on i686-linux. + (unless ,(target-x86-32?) + (display "running the ldc2 unit tests...\n") + (invoke "ctest" "--output-on-failure" "-j" job-count + "-R" "ldc2-unittest")) (display "running the lit test suite...\n") (invoke "ctest" "--output-on-failure" "-j" job-count "-R" "lit-tests") @@ -354,12 +380,24 @@ (define-public ldc (display "running the defaultlib unit tests and druntime \ integration tests...\n") (invoke "ctest" "--output-on-failure" "-j" job-count - "-E" "dmd-testsuite|lit-tests|ldc2-unittest"))))))))) + "-E" (string-join + (append + (list "dmd-testsuite" + "lit-tests" + "ldc2-unittest") + ;; from .cirrus.yaml + (if ,(target-aarch64?) + '("^core.thread.fiber(-shared)?$" + "^std.internal.math.gammafunction" + "^std.math.exponential(-shared)?$" + "^druntime-test-exceptions-debug$") + `())) + "|")))))))))) (native-inputs (append (delete "llvm" (alist-replace "ldc" (list ldc-bootstrap) (package-native-inputs ldc-bootstrap))) - `(("clang" ,clang-14) ;propagates llvm and clang-runtime + `(("clang" ,clang-15) ;propagates llvm and clang-runtime ("python-lit" ,python-lit)))))) (define-public dub