diff options
author | Philip Guenther <guenther@cvs.openbsd.org> | 2021-12-06 21:21:11 +0000 |
---|---|---|
committer | Philip Guenther <guenther@cvs.openbsd.org> | 2021-12-06 21:21:11 +0000 |
commit | ed1f034646de8b63902d7eb0950649af516b355e (patch) | |
tree | d652b668a58d37edd43954424143b99b09d01917 /sys/arch | |
parent | 3d3dcbb0080453227767dbe1c602e902c657f6dd (diff) |
Start to delete emulation support: since we're Just ELF, make
copyargs() return 0/1 and merge elf_copyargs() into it. Rename
ep_emul_arg and ep_emul_argp to have clearer meaning and type and
eliminate ep_emul_argsize as no longer necessary. Make sure
ep_auxinfo (nee ep_emul_argp) is initialized as powerpc64 always
uses it in setregs().
ok semarie@ deraadt@ kettenis@
Diffstat (limited to 'sys/arch')
-rw-r--r-- | sys/arch/powerpc64/powerpc64/machdep.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/arch/powerpc64/powerpc64/machdep.c b/sys/arch/powerpc64/powerpc64/machdep.c index 9629cb0eda0..36929b11d7b 100644 --- a/sys/arch/powerpc64/powerpc64/machdep.c +++ b/sys/arch/powerpc64/powerpc64/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.70 2021/10/06 15:46:03 claudio Exp $ */ +/* $OpenBSD: machdep.c,v 1.71 2021/12/06 21:21:10 guenther Exp $ */ /* * Copyright (c) 2020 Mark Kettenis <kettenis@openbsd.org> @@ -900,7 +900,7 @@ setregs(struct proc *p, struct exec_package *pack, u_long stack, frame->fixreg[3] = retval[0] = arginfo.ps_nargvstr; frame->fixreg[4] = retval[1] = (register_t)arginfo.ps_argvstr; frame->fixreg[5] = (register_t)arginfo.ps_envstr; - frame->fixreg[6] = (register_t)pack->ep_emul_argp; + frame->fixreg[6] = (register_t)pack->ep_auxinfo; frame->fixreg[12] = pack->ep_entry; frame->srr0 = pack->ep_entry; frame->srr1 = PSL_USER; |