From nobody Sun Jan 07 17:50:08 2024 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 4T7Pq439zWz55XND; Sun, 7 Jan 2024 17:50:08 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T7Pq42gLWz4Lfq; Sun, 7 Jan 2024 17:50:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704649808; 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=5f1MpEXJUnN0TZRHffgbhN/5xuPO6QFS9Xt/GLp+byA=; b=gPfUFbJs72wKS7c9KgoNC7siyXS9b8HfjEhL4acPu2bf7EChcPK+HcXeXEYjEU/RKUtpPs Dl2Jo6OyE6Sm8hqppLfLt609Ofz/yzeo+5ViUuFr+7cAD3varIP1U87qhDwfTppAmY9IA0 SDRKkTUkncpjvnH0Xs5t+zJM7zdP3mAKjZSQgbBeNfwMq+lX22VCHleSWHR68HssiOhNcg swxrqCsWH5LzXuM2VHFRgdKF9gj4aKfRiBTGmNLos0rCTLg3h8fOAgQboI4/0X+WP+kdEu ZaiTtUsFKPL3TSzH3XjzzsVuXpSE4qd51vC6i6CiydS9LMZ1cq6vpnsCJcNBww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704649808; 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=5f1MpEXJUnN0TZRHffgbhN/5xuPO6QFS9Xt/GLp+byA=; b=eBgi2otgarDUxF1Gse690xcgfKmSbKXyqDZFUH5RWcvuE8SGSYM2bdXuY6Q5BJ1lIzEewN AmuUxK8JvHc6WF27dMLG4ueCO4X/WNd7b1O5tzapHnFZOe87U1NK9dz/lKpBqWW6y+NMnX syqI+sDAjMhD35N9IQ4W249tBcaN8EbxldqeVR39omN9f8FXv9OyRYePds9MclC7Ew8+uV 7wd01hOQFEn8YR4E1kr9V7GWYy/4IxtqzD95T0cRSEEf/n+wl8izQG8X5QuIUOntOSUSmr 1ZFzc5boR0csarOPFUlDC7imGVUmO8ZPk0hY9Ts7J+zo6Hm/DrfRQ/3j9+PoRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704649808; a=rsa-sha256; cv=none; b=Maaia3stvrYN+3XZtpEqs+tbFpGo63J0/s1RrdsQ323+nXxFhLM17QX/9fgDIsXVXqimYz Lch3rcg7LG+osAYMuAsEalEZlq+DQYCj6plCXSe85qxdLgIHufmB0r/TFc+xGJ4j3P76dK ZXaa1ZyAMu05nbfaMiAZpg6RccRipcv2RzOlCLpByELATIk2h8oALYPazpd3Ut9JkwPk0H 3kKEDMfcPmGbQudb4qH81p9G1Vblal+VGbcuEB1ziEbKcMjl80RHbqwTLxV/Hla52GWWVE yF1XCEw5jxwW2P0FBxeUQlPUZNzEbMPCk4/42N6OD4/f8p6nKhZYrKgL6/gPWA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T7Pq41lV3zZK0; Sun, 7 Jan 2024 17:50:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 407Ho8Ho016440; Sun, 7 Jan 2024 17:50:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 407Ho8Sg016435; Sun, 7 Jan 2024 17:50:08 GMT (envelope-from git) Date: Sun, 7 Jan 2024 17:50:08 GMT Message-Id: <202401071750.407Ho8Sg016435@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 2f3b605b2e15 - stable/14 - llvm: Reduce overlinking with the minimal llvm 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 2f3b605b2e159522ecab77fd518e8139aaf581e9 Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=2f3b605b2e159522ecab77fd518e8139aaf581e9 commit 2f3b605b2e159522ecab77fd518e8139aaf581e9 Author: Andrew Turner AuthorDate: 2023-11-09 13:00:51 +0000 Commit: Dimitry Andric CommitDate: 2024-01-07 17:46:15 +0000 llvm: Reduce overlinking with the minimal llvm We only need to link against libz and libzstd when linking against the fill libllvm, libllvmminimal doesn't use either library. Move adding libz and libzstd to the list of libraries to link against to where we decide to use the full libllvm. Reported by: Cristian Marussi Reported by: Colin S. Gordon Reviewed by: dim Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D42528 (cherry picked from commit 83771b1914e182c6324839e05ff82ee6f4a87c98) --- usr.bin/clang/clang.prog.mk | 4 ++-- usr.bin/clang/llvm.prog.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.bin/clang/clang.prog.mk b/usr.bin/clang/clang.prog.mk index c15b846c5aa8..cf48f02359e9 100644 --- a/usr.bin/clang/clang.prog.mk +++ b/usr.bin/clang/clang.prog.mk @@ -14,6 +14,8 @@ LIBDEPS+= llvmminimal .else LIBDEPS+= clang LIBDEPS+= llvm +LIBADD+= z +LIBADD+= zstd .endif .for lib in ${LIBDEPS} @@ -28,7 +30,5 @@ LIBADD+= execinfo LIBADD+= ncursesw .endif LIBADD+= pthread -LIBADD+= z -LIBADD+= zstd .include diff --git a/usr.bin/clang/llvm.prog.mk b/usr.bin/clang/llvm.prog.mk index 87f804063c86..0c102730999f 100644 --- a/usr.bin/clang/llvm.prog.mk +++ b/usr.bin/clang/llvm.prog.mk @@ -12,6 +12,8 @@ CFLAGS+= -I${OBJTOP}/lib/clang/libllvm LIBDEPS+= llvmminimal .else LIBDEPS+= llvm +LIBADD+= z +LIBADD+= zstd .endif .for lib in ${LIBDEPS} @@ -26,7 +28,5 @@ LIBADD+= execinfo LIBADD+= tinfow .endif LIBADD+= pthread -LIBADD+= z -LIBADD+= zstd .include