From nobody Mon Dec 1 11:57:46 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 4dKj8C0Gn5z6HqbC for ; Mon, 01 Dec 2025 11:57:47 +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 4dKj8B57PCz3q90 for ; Mon, 01 Dec 2025 11:57:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764590266; 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=WBSWUCD+mplEjfKwT1BuMt4gH9rpXT54nYqKBU26tLc=; b=cFEMrNfYuqHTtKbdEv/f17MfITW7qSUSjH7BWezv1DNiX8ACXAfCHnVruSE9yYb8oVmZxo 9xXZzWoar1W/ApP99HVBl8qzYGevGkpOplI+Y+JM8Bm1JEahAh1tDRTJfkA8kJM/6troBr WSKvB0a593FzKMaEzuREfBuGOE6cqQFGnCBlAjEHXSmFWxMTs3GZ09KRoj09ogQABDasp2 oOji/F9EuBypsKxD0BsMLlKMSYZ26FBsKlP4T8Pm9Wcr4E7VpbBjRZsm+CVPEapeJoE7Gf JzNH3IZboA3rcQSA1ECOztXF+S+12ximWbR9TzOGuakrp9FLy7WmtHlwH3TcBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764590266; 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=WBSWUCD+mplEjfKwT1BuMt4gH9rpXT54nYqKBU26tLc=; b=ocjzuMqCRg+UU3YnXFdKbU4Kcg5l50QZTIncOBsfec8Rr6qyGQiKpqLw68II/BQgXuf19q 9egj6UkKLH1HMVxPXOtGrY0TwlsHHF5tMA+RhkqAWQL3VSQxuY7pTt/XaL+a4vPKkhD43j B1kHtH62WGDj90Sgayjmp88uSRSdv7YuLmul1oSRG4esF3lHbWv8I3iSsYuQUMQ/Mx1w4p 12EUHYXzE0aeRrMM1DpJfCU0/jWG+agSUXKFlKjkdv+JZTIoin1yH0I7R9FmP8rkyzamcm hnAX+01w0wIvLeHUoC6tMJVbhrJgkQPMFuL/0Fbvx3CPuJb+y/WzVyQk0bV/JA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764590266; a=rsa-sha256; cv=none; b=q75a8R+70WZAl0/2SbapFQhKYfRUHJ9wvFIGh6Fm1DhGnm3PIzj3246VEjTUzMtqFI+vDj OyQr/DOh6tiT/woOpzBHqrc5TIWl2VkuPslsiG9Rt0+IB7IkmfIkmDiHOLry3pn9LCLgOJ iccjsXPg48RYRe4+mUGzC9mCA7fIMhw3zHM1wMe8o99joM2DqPZBsYZ9U7ud4WfRJSGPYY 9EW4ODcf9+v3nmX3bpHlE3jEhEpIe5bcfc8fLJeayX3nJDnKHsT4Rl9jjXu1+tEXnk1MyH ftkndTF7iMzBwKf6DS3Lt7Ibq7NKlEksNkArzePVkVitP8UqMHcGx00xyk44iw== 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 4dKj8B49Yhz4NW for ; Mon, 01 Dec 2025 11:57:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b00c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 01 Dec 2025 11:57:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 9636482dd8af - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: 9636482dd8afcb426a658a98760bccf882196b4e Auto-Submitted: auto-generated Date: Mon, 01 Dec 2025 11:57:46 +0000 Message-Id: <692d82ba.b00c.39ea58b5@gitrepo.freebsd.org> The branch stable/15 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=9636482dd8afcb426a658a98760bccf882196b4e commit 9636482dd8afcb426a658a98760bccf882196b4e Author: Dimitry Andric AuthorDate: 2025-11-28 18:12:01 +0000 Commit: Dimitry Andric CommitDate: 2025-12-01 11:57:06 +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 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