diff options
| author | Glen Barber <gjb@FreeBSD.org> | 2016-01-25 14:13:28 +0000 |
|---|---|---|
| committer | Glen Barber <gjb@FreeBSD.org> | 2016-01-25 14:13:28 +0000 |
| commit | f9421853ade4550bd7c0b5956ba7324b8b9676a5 (patch) | |
| tree | 7a14f41a243865c2af9772e86149173b64f996db /libexec | |
| parent | f9371dca6065f2d700f9f61317cd5b65cb4ba856 (diff) | |
| parent | a9dc686c9a2ebce64452d2347a547aeb1500a92a (diff) | |
Notes
Diffstat (limited to 'libexec')
| -rw-r--r-- | libexec/rtld-elf/riscv/rtld_machdep.h | 2 | ||||
| -rw-r--r-- | libexec/rtld-elf/rtld.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/libexec/rtld-elf/riscv/rtld_machdep.h b/libexec/rtld-elf/riscv/rtld_machdep.h index aa370001b5cb3..660787f5d16a9 100644 --- a/libexec/rtld-elf/riscv/rtld_machdep.h +++ b/libexec/rtld-elf/riscv/rtld_machdep.h @@ -108,4 +108,6 @@ extern void *__tls_get_addr(tls_index* ti); #define RTLD_DEFAULT_STACK_PF_EXEC PF_X #define RTLD_DEFAULT_STACK_EXEC PROT_EXEC +#define md_abi_variant_hook(x) + #endif diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 06690ff22b1e1..863fe25f619a8 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -2016,7 +2016,7 @@ initlist_add_neededs(Needed_Entry *needed, Objlist *list) /* Process the current needed object. */ if (needed->obj != NULL) - initlist_add_objects(needed->obj, globallist_next(needed->obj), list); + initlist_add_objects(needed->obj, needed->obj, list); } /* @@ -2039,7 +2039,7 @@ initlist_add_objects(Obj_Entry *obj, Obj_Entry *tail, Objlist *list) /* Recursively process the successor objects. */ nobj = globallist_next(obj); - if (nobj != NULL && nobj != tail) + if (nobj != NULL && obj != tail) initlist_add_objects(nobj, tail, list); /* Recursively process the needed objects. */ @@ -3140,7 +3140,7 @@ dlopen_object(const char *name, int fd, Obj_Entry *refobj, int lo_flags, */ } else { /* Make list of init functions to call. */ - initlist_add_objects(obj, globallist_next(obj), &initlist); + initlist_add_objects(obj, obj, &initlist); } /* * Process all no_delete or global objects here, given |