d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rtld: Trim a few more MIPS #ifdefs.

Browse Source 
Reviewed by:	imp, kib
Sponsored by:	The University of Cambridge, Google Inc.
Differential Revision:	https://reviews.freebsd.org/D34052
This commit is contained in:
John Baldwin 2022-01-27 11:00:24 -08:00
parent 3a502289d3
commit 6a2d75d248
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libexec/rtld-elf/rtld.c
View File

@ -2356,10 +2356,7 @@ init_rtld(caddr_t mapbase, Elf_Auxinfo **aux_info)
objtmp.dynamic = rtld_dynamic(&objtmp); objtmp.dynamic = rtld_dynamic(&objtmp);
digest_dynamic1(&objtmp, 1, &dyn_rpath, &dyn_soname, &dyn_runpath); digest_dynamic1(&objtmp, 1, &dyn_rpath, &dyn_soname, &dyn_runpath);
assert(objtmp.needed == NULL); assert(objtmp.needed == NULL);
#if !defined(__mips__) assert(objtmp.textrel == NULL);
/* MIPS has a bogus DT_TEXTREL. */
assert(!objtmp.textrel);
#endif
/* /*
* Temporarily put the dynamic linker entry into the object list, so * Temporarily put the dynamic linker entry into the object list, so
* that symbols can be found. * that symbols can be found.
@ -4736,11 +4733,9 @@ matched_symbol(SymLook *req, const Obj_Entry *obj, Sym_Match_Result *result,
case STT_TLS: case STT_TLS:
if (symp->st_shndx != SHN_UNDEF) if (symp->st_shndx != SHN_UNDEF)
break; break;
#ifndef __mips__
else if (((req->flags & SYMLOOK_IN_PLT) == 0) && else if (((req->flags & SYMLOOK_IN_PLT) == 0) &&
(ELF_ST_TYPE(symp->st_info) == STT_FUNC)) (ELF_ST_TYPE(symp->st_info) == STT_FUNC))
break; break;
#endif
/* fallthrough */ /* fallthrough */
default: default:
return (false); return (false);