From nobody Wed Dec 01 01:08:23 2021 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 4A82818AE37C; Wed, 1 Dec 2021 01:08:25 +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 4J3gvD22ydz3swr; Wed, 1 Dec 2021 01:08:24 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 04D46208A6; Wed, 1 Dec 2021 01:08:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1B118NZE035723; Wed, 1 Dec 2021 01:08:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B118Nve035722; Wed, 1 Dec 2021 01:08:23 GMT (envelope-from git) Date: Wed, 1 Dec 2021 01:08:23 GMT Message-Id: <202112010108.1B118Nve035722@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: a95dbfaa3d7c - stable/13 - rtld_paths.h: Provide _PATH_ELF32_HINTS string, unconditionally 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a95dbfaa3d7c4b4eed89026487c0ad7a2e4f68a3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638320904; 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=grnE+rXFvTlmULhOjiMNBf+KP1hF1ibZ/NHt0XOAQnQ=; b=TlFlsB/sVo/WJ7eODjddQO9TN+ZmkuPKSRbCK89wDfUCfC7wTeV6fZDuRlx6J3bK58iLc+ 0x+kGl2eoAql7TUSZSt8VySn28gbc5hP5ub+UnMzUSZgWMTYKLt94Lw40Ov0kfgZaDepAP dNql6xCP5RdY9l836Og4+TiMeS2PeZvc1JmR8WrR1SQd9KKKj+T8/a1sE1RUBKfAnuciGS FVXdFiFBUCXSWMSlXfoC1xvL1VZAGMY6bkNQIWUm642ZMpay6ZEf84trUCCCwAahzWWP6T 87nsPzieq0RjJd3cvnyGJdITIxR7vVrzvo9ZSgkzjGU6gFVvAkgyXpFru2LI0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638320904; a=rsa-sha256; cv=none; b=h+3g44xvM2319i6DqFnBMsF18WQcPV3867zQ5AcLUJU9NtKpPi/E5mea+njqplvtpimvhv mffWRy7UOoYIV54B9xFBHiv2mtwiOU85/OBWtmFUVuiqMDQSNVaXO6355IUVBKDt9gm0oe jKDdc0rGZV/iNBgno1ZWczebxJsnQHBS2+9wDp3fQmYmt9vY1dwxXyH9kyAxHX1SKm+C1a Wmd+5W3MYsNduQQ1V6rcDRKCuSuIzHjIa82q8QHuQBVFUl+Wa/UwBUPog2130p9jcrErxc Um48u7sWv0Z6PLulqnkHzEwZF+9WaaZ5E1BK/V/ffabYKlwSd/znLPZN/o6OFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a95dbfaa3d7c4b4eed89026487c0ad7a2e4f68a3 commit a95dbfaa3d7c4b4eed89026487c0ad7a2e4f68a3 Author: Konstantin Belousov AuthorDate: 2021-11-19 03:44:33 +0000 Commit: Konstantin Belousov CommitDate: 2021-12-01 01:07:19 +0000 rtld_paths.h: Provide _PATH_ELF32_HINTS string, unconditionally (cherry picked from commit f340188625d4e0e4db850becb0a9b25448053e10) --- libexec/rtld-elf/rtld_paths.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libexec/rtld-elf/rtld_paths.h b/libexec/rtld-elf/rtld_paths.h index 4ce423ce6dbb..6ead517e8feb 100644 --- a/libexec/rtld-elf/rtld_paths.h +++ b/libexec/rtld-elf/rtld_paths.h @@ -35,8 +35,12 @@ #define _COMPAT32_BASENAME_RTLD "ld-elf32.so.1" #endif +#ifndef _PATH_ELF32_HINTS +#define _PATH_ELF32_HINTS "/var/run/ld-elf32.so.hints" +#endif + #ifdef COMPAT_32BIT -#define _PATH_ELF_HINTS "/var/run/ld-elf32.so.hints" +#define _PATH_ELF_HINTS _PATH_ELF32_HINTS #define _PATH_LIBMAP_CONF "/etc/libmap32.conf" #define _BASENAME_RTLD _COMPAT32_BASENAME_RTLD #define STANDARD_LIBRARY_PATH "/lib32:/usr/lib32"