From nobody Mon Dec 1 11:58:00 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 4dKj8S32jwz6HqVg for ; Mon, 01 Dec 2025 11:58:00 +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 4dKj8S2DhVz3qPF for ; Mon, 01 Dec 2025 11:58:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764590280; 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=Ie0r8KYdOGU6Pw9Mk4ROXK/KoDsvIyHQBVODy740oG0=; b=Gn9ttlH3zu/81PqvO6MmRvpub8FI3vr2K72hkHS59tAZxmeM8fcOBirs5caXvG8UT4YHuW h/Lln76p4LQLPAKLLdaVRmS3kUj0geGJ6g6qHIIQn9EIZSYLnQvtEthUgXcEaFgbxvwsOL p7x62YaQIak2anbZM8pMVCKMtOHmdT4G8FFoAI1N5bkJd2yX6VPBXDmoYG+prXQR356C1Y HzZ+3urB7sQ5lZ8srjq+1S7QFxDpbB3hOCbTk/g4ZSQRWxV9vhEVqaTSiIDWYBs+0lbuR+ R5G7n/ibcRdq+Vkar1aCnQ7v1gF14ghl80RiQKscAc6xzaREjaFKSo0nBeVz7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764590280; 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=Ie0r8KYdOGU6Pw9Mk4ROXK/KoDsvIyHQBVODy740oG0=; b=V7HnCMjPcD4xH0Q/R8E+sPxyKYsKus4VKPbhLx0ARDpIjTE4qzLMPlQolQbBT61DYxobRq +tIE7g1NnAq3MLYm+NN7EsTgL5fGVsRdZVl4ad3Fu86f7vnbIFwAWZQfBEq6iAhGq4EGG2 0ap1/gghGvJFWJ2K0es56IffDBr1Dr1Tpt69FB9OWJDiG1MH4bq3P/98x0oXSn724U7ZDT /avn+i8G0Eyn/0Hnvev/W3475NLhVQk8edqMO3yw0zoh5bXGsnbQ9UsYb+yaW9e5lNiaxb 4D6TlUIusgwexywWddCyoo28a5rxNQ3xlqwYSRvtxF66BqFr/4JDAipUt/4ytQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764590280; a=rsa-sha256; cv=none; b=wlunq6O/s5Lwg5SIK4fxqmSE2aD6VnZK/5PReHkr9u7m744/5Zg7PbqgTXh1de7Iqm946z uWmlHmqKcrz3AbJE865Nvrfk28wR9tf1S+D2mOGGj+9w8lr3Cio+zc/8+7T08QWm6wcBAT 10FKBTo4hqedwOAT+nmkEAyrTWjq2O0ROrNHODmMnX3K+MSOvzHGpSm1g1yG+QmgeMdYhU f6ByXUeYTEbwOpjLKtzXtzvQvZTzHco3LI7LavOBA5lBaJghImy81VNpEMu+I2fzymQUh4 y9a+uofgoH3lC5S/xNA9iIZk787uEKJtgmNXwwy+Q/x5d2ZUEokyP55RXA18+Q== 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 4dKj8S1dP2z4L3 for ; Mon, 01 Dec 2025 11:58:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 92bb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 01 Dec 2025 11:58:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 1fbba4fbf0f8 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 1fbba4fbf0f88e551ca8d3bf759d29b0867ce03e Auto-Submitted: auto-generated Date: Mon, 01 Dec 2025 11:58:00 +0000 Message-Id: <692d82c8.92bb.292bd159@gitrepo.freebsd.org> The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=1fbba4fbf0f88e551ca8d3bf759d29b0867ce03e commit 1fbba4fbf0f88e551ca8d3bf759d29b0867ce03e Author: Dimitry Andric AuthorDate: 2025-11-28 18:12:01 +0000 Commit: Dimitry Andric CommitDate: 2025-12-01 11:57:11 +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