The branch main has been updated by jrtc27:

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

commit e17dd921a22e846b31d99c15344ad8d0171bc7d5
Author:     Jessica Clarke <[email protected]>
AuthorDate: 2023-07-09 17:50:24 +0000
Commit:     Jessica Clarke <[email protected]>
CommitDate: 2023-07-09 17:50:24 +0000

    ldd: Use __PATH_RTLD("32") over _COMPAT32_PATH_RTLD
    
    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/D40934
---
 usr.bin/ldd/ldd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr.bin/ldd/ldd.c b/usr.bin/ldd/ldd.c
index 4f5555e34610..148df2df9468 100644
--- a/usr.bin/ldd/ldd.c
+++ b/usr.bin/ldd/ldd.c
@@ -236,7 +236,7 @@ main(int argc, char *argv[])
                        rtld = _PATH_RTLD;
 #if __ELF_WORD_SIZE > 32 && defined(ELF32_SUPPORTED)
                        if (type == TYPE_ELF32)
-                               rtld = _COMPAT32_PATH_RTLD;
+                               rtld = __PATH_RTLD("32");
 #endif
                        if (is_shlib == 0) {
                                execl(rtld, rtld, "--",

Reply via email to