diff options
| author | sl108498 <none@none> | 2007-07-12 10:32:13 -0700 |
|---|---|---|
| committer | sl108498 <none@none> | 2007-07-12 10:32:13 -0700 |
| commit | 07678296a66d425e65d218730836cc0162649ce4 (patch) | |
| tree | 027b130ada7de97b249284412d6088bab62a708a /usr/src/uts/common/sys/exec.h | |
| parent | 5878c602b2d040000355d54d766aac95446139a9 (diff) | |
| download | illumos-joyent-07678296a66d425e65d218730836cc0162649ce4.tar.gz | |
6572719 ld.so on sparc and amd64 should be brand aware
6577995 brandz should provide a brand aux vector to point to a brand specific linker.
Diffstat (limited to 'usr/src/uts/common/sys/exec.h')
| -rw-r--r-- | usr/src/uts/common/sys/exec.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr/src/uts/common/sys/exec.h b/usr/src/uts/common/sys/exec.h index a7ebf7dbb0..268dd6f1ed 100644 --- a/usr/src/uts/common/sys/exec.h +++ b/usr/src/uts/common/sys/exec.h @@ -107,7 +107,7 @@ typedef struct uarg { vnode_t *ex_vp; char *emulator; char *brandname; - char *auxp_brand_phdr; /* addr of brand phdr auxv on user stack */ + char *auxp_brand; /* address of first brand auxv on user stack */ } uarg_t; /* @@ -238,15 +238,15 @@ extern void exec_set_sp(size_t); extern int elfexec(vnode_t *, execa_t *, uarg_t *, intpdata_t *, int, long *, int, caddr_t, cred_t *, int); extern int mapexec_brand(vnode_t *, uarg_t *, Ehdr *, Addr *, - intptr_t *, caddr_t, int *, caddr_t *, caddr_t *, size_t *); + intptr_t *, caddr_t, int *, caddr_t *, caddr_t *, size_t *, uintptr_t *); #endif /* !_ELF32_COMPAT */ #if defined(_LP64) extern int elf32exec(vnode_t *, execa_t *, uarg_t *, intpdata_t *, int, long *, int, caddr_t, cred_t *, int); extern int mapexec32_brand(vnode_t *, uarg_t *, Elf32_Ehdr *, Elf32_Addr *, - intptr_t *, caddr_t, int *, caddr_t *, caddr_t *, size_t *); -#endif /* _LP64 */ + intptr_t *, caddr_t, int *, caddr_t *, caddr_t *, size_t *, uintptr_t *); +#endif /* _LP64 */ /* * Utility functions for exec module core routines: |