From nobody Fri Nov 28 18:14:24 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 4dJ1f83LVmz6J0Dd for ; Fri, 28 Nov 2025 18:14:24 +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 4dJ1f821cjz3L8K for ; Fri, 28 Nov 2025 18:14:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764353664; 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=XUZML/hfpp6gGLdo/0qNwhJxTHMBHPhCIu4NLEoczsY=; b=eKy1CRnIt9mTHHRu6N0hE9Ei//1zOjC3tFANqy7nBQPg2s/pO1xpH82mPZF1ZCf2EoYipw oMR0rcvvcHaO0chdG+J/x/Of129J9ddtqHjoeFoDQtIpZ3IngPpZJjQvUSsfMkNJrg4gMR DbWYvvdkTCqRCGpAHQ2qWQkn/L40v2wxqGOwtSURBxH6rPH68DoW6LlBHj5/vRDzLNcqtq hZ9miZwgl3owTIxNNHuDjcBgSBDKXY3t9yulUZQDc756jpL+xGaDSPwl2ge7b+JiCmtuhR yJuMCcuQcMKEMUN+gBZoHiTCurTeivmvzND2VmXF11SntcStZacEFjUTYFlxvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764353664; 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=XUZML/hfpp6gGLdo/0qNwhJxTHMBHPhCIu4NLEoczsY=; b=i4crAaJJM907s3+825glwqHSYxZBUlgkokxbRKvLV4d8T5EbH/S+EzwxJajF+lyU0WBu6B QeDPZWbXKGDnAM9xBO3wmKER9XCc/PEIwgTPlHXSarh3/B5zFTJnwQjuQURjnU0op1b1GX D00VVA9UGKEhF7YctpR07rKuvSVx2MrsPPpGv92Y8ZxFOnSHodOv/qgUGf1mEKM23FqaMn KaZvEPIG5cQ1K8uDtccnNtagY45UWHqZRYG/P3GjQxv4GC9mL4h0DMyC3dJbUxEEtCCoIf 6NVdMS38X9x+DunJgygdfCN3B/N/5wHxQxu68zAKSDFPm9fwtg6hB05yZBtBMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764353664; a=rsa-sha256; cv=none; b=eeEyinzHwakGuHrSKyABxIFNfz4oCvNWuppaCQTMOBJDnc6HCpnqcbocF8ij/d21AJh++n cXTAPoUlBtOCSzsHSuyEPat9vbywUimNbSSFX6kxJV0HZv1b6iq0yRgTCAbQXIWqN0lvzQ T4mLzBP7XluwR69o1ifodNJ7V0Kqiqw/JbJXmj+IWKz5hUhDU5nPVcRNoGMT4rJf8bLTVW Qbuc+oqHccXOgKCe/wHLtAwIWcxTf0LO8IljavzkgW74nnm84Ga9ClvSWOZ2T06amA5C4t LCGi4+tihAZ2GnDqxbP4zGeyAx9Kw8qavbRT5GkiX+ib4I50s8nTKASTIvhfxw== 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 4dJ1f81Wghz1CC7 for ; Fri, 28 Nov 2025 18:14:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id e5ab by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 28 Nov 2025 18:14:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 9978553d0199 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 9978553d0199e7ec0bdd1c44fc7f6c7b0c11e43b Auto-Submitted: auto-generated Date: Fri, 28 Nov 2025 18:14:24 +0000 Message-Id: <6929e680.e5ab.5cd0ed49@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=9978553d0199e7ec0bdd1c44fc7f6c7b0c11e43b commit 9978553d0199e7ec0bdd1c44fc7f6c7b0c11e43b Author: Dimitry Andric AuthorDate: 2025-11-28 18:12:01 +0000 Commit: Dimitry Andric CommitDate: 2025-11-28 18:14:15 +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 --- lib/clang/libllvm/Makefile | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/lib/clang/libllvm/Makefile b/lib/clang/libllvm/Makefile index e634a72b4f90..810eac08d8d5 100644 --- a/lib/clang/libllvm/Makefile +++ b/lib/clang/libllvm/Makefile @@ -1245,16 +1245,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