Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 1 Dec 2021 01:08:23 GMT
From:      Konstantin Belousov <kib@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: a95dbfaa3d7c - stable/13 - rtld_paths.h: Provide _PATH_ELF32_HINTS string, unconditionally
Message-ID:  <202112010108.1B118Nve035722@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by kib:

URL: https://cgit.FreeBSD.org/src/commit/?id=a95dbfaa3d7c4b4eed89026487c0ad7a2e4f68a3

commit a95dbfaa3d7c4b4eed89026487c0ad7a2e4f68a3
Author:     Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2021-11-19 03:44:33 +0000
Commit:     Konstantin Belousov <kib@FreeBSD.org>
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"



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202112010108.1B118Nve035722>