diff options
| author | kib <kib@FreeBSD.org> | 2016-03-12 17:12:00 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2016-03-12 17:12:00 +0000 |
| commit | ec1f9b79e457080b7f42a5f3c20592807f824007 (patch) | |
| tree | 8c87ec261bc34b8a299e95074ef06f51bd9df904 /libexec/rtld-elf/sparc64 | |
| parent | e8f36718c8dbdeacf2fd9f7564f76499b4de341c (diff) | |
| download | FreeBSD-src-ec1f9b79e457080b7f42a5f3c20592807f824007.zip FreeBSD-src-ec1f9b79e457080b7f42a5f3c20592807f824007.tar.gz | |
MFC r257811 (by markj):
Include rtld itself when iterating over loaded ELF objects in
dl_iterate_phdr(3).
MFC r294373:
Do not call callbacks for dl_iterate_phdr(3) with the rtld bind and
phdr locks locked.
MFC r294470 (by kan):
Fix initlist_add_object invocation parameters.
MFC r294936 (by kan):
Do not unlock rtld_phdr_lock over callback invocations.
Diffstat (limited to 'libexec/rtld-elf/sparc64')
| -rw-r--r-- | libexec/rtld-elf/sparc64/reloc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libexec/rtld-elf/sparc64/reloc.c b/libexec/rtld-elf/sparc64/reloc.c index 738a847..242fb8e 100644 --- a/libexec/rtld-elf/sparc64/reloc.c +++ b/libexec/rtld-elf/sparc64/reloc.c @@ -266,8 +266,8 @@ do_copy_relocations(Obj_Entry *dstobj) ELF_R_SYM(rela->r_info)); req.flags = SYMLOOK_EARLY; - for (srcobj = dstobj->next; srcobj != NULL; - srcobj = srcobj->next) { + for (srcobj = globallist_next(dstobj); srcobj != NULL; + srcobj = globallist_next(srcobj)) { res = symlook_obj(&req, srcobj); if (res == 0) { srcsym = req.sym_out; |
