From nobody Mon Dec 1 11:58:11 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dKj8g4xhMz6HqbM for ; Mon, 01 Dec 2025 11:58:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dKj8g1gNFz3qZ6 for ; Mon, 01 Dec 2025 11:58:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764590291; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6rl2E4jiStLgBreRX9VlEkFQhs0FEABnXFkgYopN2g4=; b=K/XQaoqM6n41RFxGxnTiBrpWQTOyPYCukhmGTCzYG0jCfmASG2Pl+g8x0UC2MqAwUDEPFo t6jnGpDl1ovRgm9EJ1w93D2iIEFOeisvP+NZ15FJtWYOcTLSBkug+MJl45lBMjmEyT7Nic j0LQUXOBPz3Vpmlo+ve1IWr8c/Xz5UTO/lqc88QBTx8NMahpadSIiYgiHPW3iJgBBdymkJ vfQVgA0yRscqu/JSTEyY1XRIzgbLQZnbj8mY2FXcYVi5/0sj10Vj6VYbOvP7XjZVv9MNkn j5ZHBH252j0p4AfSBnluc0L64RvsS7RK1HRGu/jOLh+b3UeQvYCtD9mSYAv6nA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764590291; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6rl2E4jiStLgBreRX9VlEkFQhs0FEABnXFkgYopN2g4=; b=Q/xsCAX7TT6FiqIo+xinaCCKJ4VgQlut892hzNzT536rRao/+pCIp9vtX7lMn6VrVzVqPS Lf6ffTAYy79GVTGwD1X5KoZxYZyG8IK9LGJzGJjOpevkySlFc17msXMsgTwcKF3I+S3Lle hFb57Hw1UszxcgHhUJKbnI8DnJibz8y9Ozmjm/1dgMdJ3vmxHlK+8HOINV6yL4CfZIDPGa s6nA1Yzt57te5ynwGTYx3AZPdKFko1IJiYP+hLZVQfRp/4+9/t+SHJ2RmudhijJWrxZ0RF QLT3b/t41RsoEWeB9ww1IiW/HWuO/hsmxfUXPqxeXwqOfaxGi4cNwbrOmubeUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764590291; a=rsa-sha256; cv=none; b=sGxztFf0qgLs35xSSA7fCeOjPKaHt5GC95o0xvHLgGV0XnRDAylwSqusXlkRzHbBYRJvtx t7H+yhiItFdEhIPBl2VBn0yCTuMJt1bg0F6YVy7zopswPNhBbMfla0RTZ1eGIh5AiPAZV/ mxDVKaN/BW7wW7TZHVeCHZrLtMMT9+VG8MD/j729p/w/JeBFZ9iDZXFfzjpBJBrZ2VA3V+ H3bzGbXNbvKYjlAhGLozcoj8Hnf90wnRKiBdFlt3HtdeFki1Hof5BbcTDtv8JqRUGJ80zj mbc6wWuaGWuEoMk4PlKMka/uyCMcmPsQlDnX+RSl3ApQzvF/Jk88DJz8GlWC5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dKj8g1HTtz4ZQ for ; Mon, 01 Dec 2025 11:58:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b010 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 01 Dec 2025 11:58:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: f4ff747cb709 - stable/13 - Remove TableGen objects from libllvm, fixing bad option registrations List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f4ff747cb709efeed3c1867060a81ae3ee72d474 Auto-Submitted: auto-generated Date: Mon, 01 Dec 2025 11:58:11 +0000 Message-Id: <692d82d3.b010.4963715a@gitrepo.freebsd.org> The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=f4ff747cb709efeed3c1867060a81ae3ee72d474 commit f4ff747cb709efeed3c1867060a81ae3ee72d474 Author: Dimitry Andric AuthorDate: 2025-11-28 18:12:01 +0000 Commit: Dimitry Andric CommitDate: 2025-12-01 11:57:17 +0000 Remove TableGen objects from libllvm, fixing bad option registrations In 986e05bc2a18 I revamped the build for all the llvm subprojects. Among others I added objects under contrib/llvm-project/llvm/lib/TableGen, but I missed that upstream explicitly removes these when building the shared llvm library: https://github.com/llvm/llvm-project/blob/llvmorg-19.1.7/llvm/tools/llvm-shlib/CMakeLists.txt#L23 In 2e47f35be5dc I converted libllvm to a shared library. From that point onwards, some of the global command line option objects registered in llvm/lib/TableGen/Main.cpp conflict with similar objects in tools like llvm-cov, llvm-as, etc. This results in an error when running these tools: "CommandLine Error: Option 'o' registered more than once!", followed by a fatal exit. Fix this by removing the TableGen objects from libllvm. Note that we no longer install any of the tblgen binaries, these are only used during buildworld, and then in a statically linked form. PR: 291233 MFC after: 3 days (cherry picked from commit 9978553d0199e7ec0bdd1c44fc7f6c7b0c11e43b) --- lib/clang/libllvm/Makefile | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/lib/clang/libllvm/Makefile b/lib/clang/libllvm/Makefile index cb16d39961ae..2060f5f52c91 100644 --- a/lib/clang/libllvm/Makefile +++ b/lib/clang/libllvm/Makefile @@ -1246,16 +1246,6 @@ SRCS_MIN+= Support/regexec.c SRCS_MIN+= Support/regfree.c SRCS_MIN+= Support/regstrlcpy.c SRCS_MIN+= Support/xxhash.cpp -SRCS_MIN+= TableGen/DetailedRecordsBackend.cpp -SRCS_MIN+= TableGen/Error.cpp -SRCS_MIN+= TableGen/JSONBackend.cpp -SRCS_MIN+= TableGen/Main.cpp -SRCS_MIN+= TableGen/Record.cpp -SRCS_MIN+= TableGen/SetTheory.cpp -SRCS_MIN+= TableGen/StringMatcher.cpp -SRCS_MIN+= TableGen/TGLexer.cpp -SRCS_MIN+= TableGen/TGParser.cpp -SRCS_MIN+= TableGen/TableGenBackend.cpp .if ${MK_LLVM_TARGET_AARCH64} != "no" SRCS_MIN+= Target/AArch64/AArch64A53Fix835769.cpp SRCS_MIN+= Target/AArch64/AArch64A57FPLoadBalancing.cpp