git: c530d34de89e - stable/14 - rtld: Remove a stale #ifdef PIC
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 09 Oct 2026 00:20:51 UTC
The branch stable/14 has been updated by jhb:
URL: https://cgit.FreeBSD.org/src/commit/?id=c530d34de89ef0c6a87dfb7529053ce332429484
commit c530d34de89ef0c6a87dfb7529053ce332429484
Author: John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2026-08-13 17:02:17 +0000
Commit: John Baldwin <jhb@FreeBSD.org>
CommitDate: 2026-10-08 18:48:37 +0000
rtld: Remove a stale #ifdef PIC
rtld has always been built PIC since commit
7ca8e6a67068e8357e251bd3ea86253c8a751d59. The stale #ifdef might
confuse a reader by thinking rtld can be built as non-PIC.
Reviewed by: kib
Sponsored by: AFRL, DARPA
Differential Revision: https://reviews.freebsd.org/D58623
(cherry picked from commit ec8985a1003326eff53cb6b594000b7cbb2114c5)
---
libexec/rtld-elf/rtld.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c
index 8ac6a73a962c..0ca99495b14c 100644
--- a/libexec/rtld-elf/rtld.c
+++ b/libexec/rtld-elf/rtld.c
@@ -2441,9 +2441,7 @@ init_rtld(caddr_t mapbase, Elf_Auxinfo **aux_info)
objtmp.path = NULL;
objtmp.rtld = true;
objtmp.mapbase = mapbase;
-#ifdef PIC
objtmp.relocbase = mapbase;
-#endif
objtmp.dynamic = rtld_dynamic(&objtmp);
digest_dynamic1(&objtmp, 1, &dyn_rpath, &dyn_soname, &dyn_runpath);