From nobody Wed Nov 24 23:56:22 2021 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 0A55B18ADAD5; Wed, 24 Nov 2021 23:56:24 +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 4HzyZt3Wmkz4Qwk; Wed, 24 Nov 2021 23:56:22 +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 1E20713783; Wed, 24 Nov 2021 23:56:22 +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 1AONuMO7022607; Wed, 24 Nov 2021 23:56:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AONuMIw022606; Wed, 24 Nov 2021 23:56:22 GMT (envelope-from git) Date: Wed, 24 Nov 2021 23:56:22 GMT Message-Id: <202111242356.1AONuMIw022606@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: f340188625d4 - main - rtld_paths.h: Provide _PATH_ELF32_HINTS string, unconditionally 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f340188625d4e0e4db850becb0a9b25448053e10 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1637798183; 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=eX1cjP/L/1tZaicjx6wHO18RgyGrBdgNrJfzoTKlwUo=; b=aO3Y3E5rFwUzljfdzLcZIUQ7g/NPakkJVc6DO8AqIp6aY05DZBNqnV8Iy+9cx5rZk0kw4/ kPuxAw6iMzKXLckpctKFEOIx0A7GKtRK6R69SSHjBTiRCFa4RlmHlFIvjLo1cLabQooZLf QQE/gSgMgurwuh6A8xF8L7TJ0o8ll0kiIvF6bqlY/W+CL5dQ30AGPoMvlr7S3H2t43TW0M YzNWuMEUvvROaFaPyOQtZmF3Dvc/SEmORY5bEPCwnM71tNPDNLoGb5xqv7ZXiEYwEVAUvO YW9VPRjopmAn7uaCuIUXJDELc58NYm+tCxHY9e5+AKvAzOSNwJrps46s+juXwg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1637798183; a=rsa-sha256; cv=none; b=qsRo1ZDV2isqguAVLU9HmSt2rs157vkyxaXHFKEtkgVazEALARLob7aICV+IheATxG/Ssn EmAuWs7UgIoQ6uscVMVDGzND9cgDW6CyDIbx6idOuSLuimjlHoaXCiPpbg92V2Ei5LDr3n /5YlL11lvDaqdZgHB6xHhYIXsTO7WkbgnbPfCukNbRMN5OrPEBrqcgGNmvIygbz6ynSxhn FNqIzD90/mXDAdLO/FjxAaefq7mPmfMCe0xzuB58zg6VVHsPhm0Uq0iHivRqAI1zQVoNRf ylIO8KZhwhtJfqmlt6Pb9J5Gwok1ykIw+lsbB2tha+ZZo5amoIqnf1a11A9Qcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f340188625d4e0e4db850becb0a9b25448053e10 commit f340188625d4e0e4db850becb0a9b25448053e10 Author: Konstantin Belousov AuthorDate: 2021-11-19 03:44:33 +0000 Commit: Konstantin Belousov CommitDate: 2021-11-24 23:55:03 +0000 rtld_paths.h: Provide _PATH_ELF32_HINTS string, unconditionally Reviewed by: emaste Tested by: jbeich Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D33058 --- 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"