The branch main has been updated by kib:

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

commit f340188625d4e0e4db850becb0a9b25448053e10
Author:     Konstantin Belousov <[email protected]>
AuthorDate: 2021-11-19 03:44:33 +0000
Commit:     Konstantin Belousov <[email protected]>
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"

Reply via email to