From nobody Sun Jul 09 17:52:11 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 4QzZTm5LWxz4mW1b; 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 4QzZTS1lHcz3v8g; Sun, 9 Jul 2023 17:52:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925132; 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=qwT+A1qAokLSRrfFfnRykXGlLpUQfZ/+eeHDe/FC/FQ=; b=McpxmrgNs95XuK93Y2oP6Bfrp7sbjjdDBfkJ2Cc7BWfa5JWp6CYW+W8df+R9Gm9Fs+ptXZ co2fJ+tR3lnHnm4HTGc70DpUswfAlfDhkFWsda/kClrotSFjruVMUu1gC0X/8CYeyjSmZJ kr5ZR1R3hQ0CZmeDrZMfWMIWKhFNaFhTyjFo/HMgfGLWfP+sRfJ610lCFYALuWE3Siqr49 adXgv1OkCDvQ7ABrvzglpcx0x5F20W1QMTXsRVyFbNRVApLOQU9BlroWP/VPpckZhE3XhZ 3IoloPaeLfIz9tuzisVFus3mB9wdhi2OjoNXBb+TbIunfzIRyrjylISdcJ7QYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925132; 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=qwT+A1qAokLSRrfFfnRykXGlLpUQfZ/+eeHDe/FC/FQ=; b=WsDSXqrhbXm+uAPyrXkIE/k6pZSvKoHtVnTAipAdm9rLlFMX1z3zAnaJk+fZRn5DVuxzi0 sUTpFP1oyG7XbnsGzA+xeJ+J+VaaA6dvxeFSO56vFIcfmd+8UZdCV0eQ4juvE4EFpWhal/ HSqccjEtvqN9zj24pTIPm5OLORLIiAfEIiOfyUzS94cGzs+QPvJhAhz1OIftZiuJo1zn3l T1cV0cFWlY1416E6BD8EcWiLP5+rA8ehmoKlArgyPURqIIQojKk/NJyaJXhPRQSUSREe0g RMQKPRU21KPfLs0XrXvdOyeHeNV8sX5U/yF2ohcGhUexA1Z4IKzF8+YQYY8XmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688925132; a=rsa-sha256; cv=none; b=dwaRKn5zJsy44UJWQ9HZ5LZ++sZNcrRD4/iWEci1fQ+3teqCWXoTE62jwgSjOB5SOMSKTF 9jAefHvsidrus2zUoBORYQbf2j/C2VtxJHjKJJaoiOfJ9lALwoEdG5oDpitkimz4muCMie CXwwX4ijHdftclWF9rs1j7S0V63sbwQAPNV150Nh4SuhdM6o44qf67dKwa0SY0Y45nln5+ uwks8Ko0suIA1quErAI37+2LnTqdVpmwNMcXcwCHvyEK4bh+dN06/Aw+1KnXp3hkR0iyNJ wvKHmpiLFI7/zi/uH+4dgjpKR6mrH61Q59EVhFmT3+eswCE/DVb/RifniD9fCg== 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 4QzZTS0s7Tz1C2F; Sun, 9 Jul 2023 17:52:12 +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 369HqBiE098849; Sun, 9 Jul 2023 17:52:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 369HqBwf098848; Sun, 9 Jul 2023 17:52:11 GMT (envelope-from git) Date: Sun, 9 Jul 2023 17:52:11 GMT Message-Id: <202307091752.369HqBwf098848@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: 1e635e87e3e2 - main - ldconfig: Use __PATH_ELF_HINTS("32") over _PATH_ELF32_HINTS 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: 1e635e87e3e2e1b5cdf2cbfe9a2a2900c60810a6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=1e635e87e3e2e1b5cdf2cbfe9a2a2900c60810a6 commit 1e635e87e3e2e1b5cdf2cbfe9a2a2900c60810a6 Author: Jessica Clarke AuthorDate: 2023-07-09 17:50:15 +0000 Commit: Jessica Clarke CommitDate: 2023-07-09 17:50:15 +0000 ldconfig: Use __PATH_ELF_HINTS("32") over _PATH_ELF32_HINTS 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/D40933 --- sbin/ldconfig/ldconfig.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/ldconfig/ldconfig.c b/sbin/ldconfig/ldconfig.c index 47e26ad8367c..2f5cdbd6505e 100644 --- a/sbin/ldconfig/ldconfig.c +++ b/sbin/ldconfig/ldconfig.c @@ -77,7 +77,7 @@ main(int argc, char **argv) } if (is_32) - hints_file = _PATH_ELF32_HINTS; + hints_file = __PATH_ELF_HINTS("32"); else hints_file = _PATH_ELF_HINTS; while((c = getopt(argc, argv, "Rf:imrsv")) != -1) {