The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=6a2d75d248579da823999514727b64d200057092
commit 6a2d75d248579da823999514727b64d200057092 Author: John Baldwin <[email protected]> AuthorDate: 2022-01-27 19:00:24 +0000 Commit: John Baldwin <[email protected]> CommitDate: 2022-01-27 19:00:24 +0000 rtld: Trim a few more MIPS #ifdefs. Reviewed by: imp, kib Sponsored by: The University of Cambridge, Google Inc. Differential Revision: https://reviews.freebsd.org/D34052 --- libexec/rtld-elf/rtld.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index e5ab2405a79c..f566fc97ad02 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -2356,10 +2356,7 @@ init_rtld(caddr_t mapbase, Elf_Auxinfo **aux_info) objtmp.dynamic = rtld_dynamic(&objtmp); digest_dynamic1(&objtmp, 1, &dyn_rpath, &dyn_soname, &dyn_runpath); assert(objtmp.needed == NULL); -#if !defined(__mips__) - /* MIPS has a bogus DT_TEXTREL. */ - assert(!objtmp.textrel); -#endif + assert(objtmp.textrel == NULL); /* * Temporarily put the dynamic linker entry into the object list, so * that symbols can be found. @@ -4736,11 +4733,9 @@ matched_symbol(SymLook *req, const Obj_Entry *obj, Sym_Match_Result *result, case STT_TLS: if (symp->st_shndx != SHN_UNDEF) break; -#ifndef __mips__ else if (((req->flags & SYMLOOK_IN_PLT) == 0) && (ELF_ST_TYPE(symp->st_info) == STT_FUNC)) break; -#endif /* fallthrough */ default: return (false);
