From nobody Sun Jan 07 23:08:08 2024 X-Original-To: dev-commits-src-branches@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 4T7Xt03NDLz56F8J; Sun, 7 Jan 2024 23:08: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 4T7Xt01ytmz4PF8; Sun, 7 Jan 2024 23:08:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704668888; 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=tVYD6eT4a4tVehP5KmqfIKfvQuzQOFLp5C2Cf7n1qIk=; b=a88BMUyz3gjWmfm2wPgszCQhpknA1VriBcQixZ/b91W4gfUfvXAGQ8iR1iKeFvWQoUumqL T+QMURH/kc5y5aHDTwh1ew3qNn3oLVt8a75FC7axzhI/7MNyejBCz3PONLJprFP5j/fup0 t3BqJ/vk38eJz8y4pVfTZdQu/S4Z3sPR3CKpAciGKALSU0zWL5ifBzlQsQYvt3svCLQg5H O/0r8WcrD2TemrK43NdYB7bAqtF0n0gQiY5wbzdhW4pimvLfqsSiq59drFf/6tGlOiQGIG U+d/TypzL0ktMSVXt6EygQ3DJ4VtYTtUjaE7I3zNzYUCkESQliurImPsbIWn7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704668888; 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=tVYD6eT4a4tVehP5KmqfIKfvQuzQOFLp5C2Cf7n1qIk=; b=XChOvhTVnb5lLIGG5sTv9qG1QZZOCwwLqdegIsW+nRgbrMfVYx5+JJSZzIbTEqNMVQ7eAr bz4ozkIQy9nW9fw+k81r/3v9xsUhNpAxnuMd7jmcbmcUrJpxu4Lu4u/eB9zNkSxczUbx4M RogcfZjVpjEetPUMZdNhnJGHR6uaNxbvTUPNl39txiSujrxmzvJ8a3FSe/ig5Tv9l+CCT1 VLIckjtAS8viFR3fqL5vYhPL84jI6k+sAT2PLrZzYkPNRdwZLKtDRj5tTDe0TZ4ELscS9L +wM3xnXCG3IumGnEWEaHQ3VUTKh2Xj2SVwkC2hFeR40FEOpHT07UtQrLR0OCMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704668888; a=rsa-sha256; cv=none; b=xNl0J9lVnh3dZXdNt2Fq7SN14dqL4bH6QNB/GwbfhgKtSIYXYFEsJi8qtHdnoMQzVmS+UV 4tGK87A75GiyW+vbk5L2Li18j/nY0ErIuyHe9kEs2qbmVImYdPvVRDxn1RXhG04bWYl9sR UOp9zB2/h9kYIoVT6+pRPIozm+o80QhxiBeS9BLElkDOqCCSAeP/TapecJAjFzjkeJG92i mW0ao3lo49VqbO4kJ7sOAiZxZsrtddAwEc1ITLbHJyh8VUaTKen1YoTMxCQ7C3/x7A74DG 7b0s+OH6hfRT3JhEOgIAOvCaQCANy8qlSEXLGMTIErIijHfvBE3MoAzzLo+OqQ== 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 4T7Xt010m1zjrP; Sun, 7 Jan 2024 23:08: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 407N887l052994; Sun, 7 Jan 2024 23:08:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 407N88VM052991; Sun, 7 Jan 2024 23:08:08 GMT (envelope-from git) Date: Sun, 7 Jan 2024 23:08:08 GMT Message-Id: <202401072308.407N88VM052991@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: 29d1d72ad529 - stable/13 - llvm: Reduce overlinking with the minimal llvm List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 29d1d72ad5291b2c96f00ba744bdf3db5ec89153 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=29d1d72ad5291b2c96f00ba744bdf3db5ec89153 commit 29d1d72ad5291b2c96f00ba744bdf3db5ec89153 Author: Andrew Turner AuthorDate: 2023-11-09 13:00:51 +0000 Commit: Dimitry Andric CommitDate: 2024-01-07 23:04:33 +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 a66d27f7f1e2..acd50582f768 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+= ncursesw .endif LIBADD+= pthread -LIBADD+= z -LIBADD+= zstd .include