From nobody Sun Jul 9 17:52:13 2023 X-Original-To: dev-commits-src-main@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 4QzZTg052Cz4mVbT; Sun, 9 Jul 2023 17:52:23 +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 4QzZTT29kyz3v8j; Sun, 9 Jul 2023 17:52:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925133; 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=PTVZsg2QDqnQWI2F/5IQTb1mRH30yVcDAGOT4kXBrts=; b=wr+j3hJ7gGIq5kXI35EEq1u+Ps5STZjQOQbnysSRMtw72tD/FIXhArpYmnMzvHzE1Uiv8p NXeO3PrAErYk5HdUhBRS0zRD2qzo+jDTo++kCojwjXNEdyUH4Z9k2o+fBVFYhZtrUTGJa6 FRxNiP0eUYjy7regrGIlHCuNfo18GPg1HrN46BaOkqkD01u7jx/oqhZE3E/7GxeEZUvK84 CZlcLgIxbcnoBlvY13cokwROkNlnD0ltaPLjmXIIk4MkDwY9vmuvZa1pk8ybQtHr/PCEp8 q16PvnHf19BSCwiJrtAAddL0pWwgOJtzXrNAS7JYyjmd5vqhhujstYv3BS9UEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925133; 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=PTVZsg2QDqnQWI2F/5IQTb1mRH30yVcDAGOT4kXBrts=; b=Sav1LfAiDWu5W+SL3dcuYCT248nVr+fL8IlIoW8KjJIUKmAFmcFwtQNjENNyKHmmVhivAe 9/I9R1UmY3Zb72e+74CWJBv4gs3Bdom2UslT0Mab2OzOfrA7UAbptgkMuPwDumEcK2iOer 4zE+yeBJtwWQ2Jzf29mDoI6h3Gw0T9pA2oTsl3gvC2xSiHu4bJiYu0gojoyMULW/qqssuD 2kBMqLtYB9tNOE2S4InLm8mxPvj1xxvXW2kdHA0CL8JNVVVEbIi7xALCgNUBLyUG2tOp9/ l+pSKiPz4JZBvNSq/aNzMsc+Bw9D7EYmQUSFdjd4bf2znPfGiKmIyrHSTl3pDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688925133; a=rsa-sha256; cv=none; b=HfhLe4GhW15vEoax9UnHFRKNSrNLfGNVLz8iyVpyOH5CrC5/zk7WNEq5mo5N3vXVY9cDCj 91sXSxF+TqcYyYsodCRK5naxS3BgHMBbRJVwCS5O8IMNO1GKGifq/cM2kAOOPEyI40jQ4e 3SsYkEFucahC2kow0IKkzFtSoewOwZxrUw+/7AreKkyf7KS6yZTqXZucku9M6JnhwcL5GI zD1d3QfPEzwSBVuVtFkTpYXnl2NATG9xWPXvxDGnPG2X8vXVHmBRHJ6BijCOT6GtUshHH7 S76084gvJCbmgdRqv1hAmae8rM4IyMfaYh3U7j1wFko1u+M1hemnSc87WaCwHw== 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 4QzZTT0z5jz1Bgt; Sun, 9 Jul 2023 17:52:13 +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 369HqDwT098870; Sun, 9 Jul 2023 17:52:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 369HqD5l098869; Sun, 9 Jul 2023 17:52:13 GMT (envelope-from git) Date: Sun, 9 Jul 2023 17:52:13 GMT Message-Id: <202307091752.369HqD5l098869@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: e17dd921a22e - main - ldd: Use __PATH_RTLD("32") over _COMPAT32_PATH_RTLD List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e17dd921a22e846b31d99c15344ad8d0171bc7d5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=e17dd921a22e846b31d99c15344ad8d0171bc7d5 commit e17dd921a22e846b31d99c15344ad8d0171bc7d5 Author: Jessica Clarke AuthorDate: 2023-07-09 17:50:24 +0000 Commit: Jessica Clarke CommitDate: 2023-07-09 17:50:24 +0000 ldd: Use __PATH_RTLD("32") over _COMPAT32_PATH_RTLD This will allow the latter to be removed, reducing the boilerplate needed for a new libcompat. Reviewed by: kib, brooks, jhb Differential Revision: https://reviews.freebsd.org/D40934 --- usr.bin/ldd/ldd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/ldd/ldd.c b/usr.bin/ldd/ldd.c index 4f5555e34610..148df2df9468 100644 --- a/usr.bin/ldd/ldd.c +++ b/usr.bin/ldd/ldd.c @@ -236,7 +236,7 @@ main(int argc, char *argv[]) rtld = _PATH_RTLD; #if __ELF_WORD_SIZE > 32 && defined(ELF32_SUPPORTED) if (type == TYPE_ELF32) - rtld = _COMPAT32_PATH_RTLD; + rtld = __PATH_RTLD("32"); #endif if (is_shlib == 0) { execl(rtld, rtld, "--",