use _{NLIST,KERN}_DO_{AOUT,ELF,ECOFF} to select binary types

diff --git a/sys/compat/common/compat_exec.c b/sys/compat/common/compat_exec.c
index 7e87f83..2ce8bc7 100644 (file)
--- a/sys/compat/common/compat_exec.c
+++ b/sys/compat/common/compat_exec.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: compat_exec.c,v 1.2 1996/08/02 20:34:40 niklas Exp $  */
+/*     $OpenBSD: compat_exec.c,v 1.3 1996/12/23 02:56:47 deraadt Exp $ */
 /*     $NetBSD: compat_exec.c,v 1.1 1996/05/18 15:52:21 christos Exp $ */
 
 /*
@@ -93,7 +93,7 @@ exec_aout_prep_oldzmagic(p, epp)
            epp->ep_daddr + execp->a_data, NULLVP, 0,
            VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE);
 
-       return exec_aout_setup_stack(p, epp);
+       return exec_setup_stack(p, epp);
 }
 
 
@@ -137,7 +137,7 @@ exec_aout_prep_oldnmagic(p, epp)
                NEW_VMCMD(&epp->ep_vmcmds, vmcmd_map_zero, bsize, baddr,
                    NULLVP, 0, VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE);
 
-       return exec_aout_setup_stack(p, epp);
+       return exec_setup_stack(p, epp);
 }
 
 
@@ -186,5 +186,5 @@ exec_aout_prep_oldomagic(p, epp)
         */
        dsize = epp->ep_dsize + execp->a_text - roundup(execp->a_text, NBPG);
        epp->ep_dsize = (dsize > 0) ? dsize : 0;
-       return exec_aout_setup_stack(p, epp);
+       return exec_setup_stack(p, epp);
 }

diff --git a/sys/compat/hpux/hpux_exec.c b/sys/compat/hpux/hpux_exec.c
index 0bb9dea..82b2219 100644 (file)
--- a/sys/compat/hpux/hpux_exec.c
+++ b/sys/compat/hpux/hpux_exec.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: hpux_exec.c,v 1.5 1996/08/31 09:24:01 pefo Exp $      */
+/*     $OpenBSD: hpux_exec.c,v 1.6 1996/12/23 02:56:48 deraadt Exp $   */
 /*     $NetBSD: hpux_exec.c,v 1.3 1996/01/06 12:44:13 thorpej Exp $    */
 
 /*
@@ -161,7 +161,7 @@ exec_hpux_prep_nmagic(p, epp)
                NEW_VMCMD(&epp->ep_vmcmds, vmcmd_map_zero, bsize, baddr,
                    NULLVP, 0, VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE);
 
-       return (exec_aout_setup_stack(p, epp));
+       return (exec_setup_stack(p, epp));
 }
 
 static int
@@ -227,7 +227,7 @@ exec_hpux_prep_zmagic(p, epp)
                NEW_VMCMD(&epp->ep_vmcmds, vmcmd_map_zero, bsize, baddr,
                    NULLVP, 0, VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE);
 
-       return (exec_aout_setup_stack(p, epp));
+       return (exec_setup_stack(p, epp));
 }
 
 /*
@@ -270,7 +270,7 @@ exec_hpux_prep_omagic(p, epp)
         */
        dsize = epp->ep_dsize + execp->ha_text - roundup(execp->ha_text, NBPG);
        epp->ep_dsize = (dsize > 0) ? dsize : 0;
-       return (exec_aout_setup_stack(p, epp));
+       return (exec_setup_stack(p, epp));
 }
 
 /*

diff --git a/sys/compat/linux/linux_exec.c b/sys/compat/linux/linux_exec.c
index 41b9f02..37c868c 100644 (file)
--- a/sys/compat/linux/linux_exec.c
+++ b/sys/compat/linux/linux_exec.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: linux_exec.c,v 1.3 1996/08/31 09:24:02 pefo Exp $     */
+/*     $OpenBSD: linux_exec.c,v 1.4 1996/12/23 02:56:49 deraadt Exp $  */
 /*     $NetBSD: linux_exec.c,v 1.13 1996/04/05 00:01:10 christos Exp $ */
 
 /*
@@ -233,7 +233,7 @@ exec_linux_aout_prep_zmagic(p, epp)
            epp->ep_daddr + execp->a_data, NULLVP, 0,
            VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE);
 
-       return exec_aout_setup_stack(p, epp);
+       return exec_setup_stack(p, epp);
 }
 
 /*
@@ -272,7 +272,7 @@ exec_linux_aout_prep_nmagic(p, epp)
                NEW_VMCMD(&epp->ep_vmcmds, vmcmd_map_zero, bsize, baddr,
                    NULLVP, 0, VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE);
 
-       return exec_aout_setup_stack(p, epp);
+       return exec_setup_stack(p, epp);
 }
 
 /*
@@ -316,7 +316,7 @@ exec_linux_aout_prep_omagic(p, epp)
         */
        dsize = epp->ep_dsize + execp->a_text - roundup(execp->a_text, NBPG);
        epp->ep_dsize = (dsize > 0) ? dsize : 0;
-       return exec_aout_setup_stack(p, epp);
+       return exec_setup_stack(p, epp);
 }
 
 int
@@ -362,7 +362,7 @@ exec_linux_aout_prep_qmagic(p, epp)
            epp->ep_daddr + execp->a_data, NULLVP, 0,
            VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE);
 
-       return exec_aout_setup_stack(p, epp);
+       return exec_setup_stack(p, epp);
 }
 
 int

diff --git a/sys/compat/sunos/sunos_exec.c b/sys/compat/sunos/sunos_exec.c
index 4c3c192..2492865 100644 (file)
--- a/sys/compat/sunos/sunos_exec.c
+++ b/sys/compat/sunos/sunos_exec.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: sunos_exec.c,v 1.6 1996/08/31 09:24:04 pefo Exp $     */
+/*     $OpenBSD: sunos_exec.c,v 1.7 1996/12/23 02:56:50 deraadt Exp $  */
 /*     $NetBSD: sunos_exec.c,v 1.11 1996/05/05 12:01:47 briggs Exp $   */
 
 /*
@@ -196,7 +196,7 @@ sunos_exec_aout_prep_zmagic(p, epp)
            epp->ep_daddr + execp->a_data, NULLVP, 0,
            VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE);
 
-       return exec_aout_setup_stack(p, epp);
+       return exec_setup_stack(p, epp);
 }
 
 /*
@@ -233,7 +233,7 @@ sunos_exec_aout_prep_nmagic(p, epp)
                NEW_VMCMD(&epp->ep_vmcmds, vmcmd_map_zero, bsize, baddr,
                    NULLVP, 0, VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE);
 
-       return exec_aout_setup_stack(p, epp);
+       return exec_setup_stack(p, epp);
 }
 
 /*
@@ -265,6 +265,6 @@ sunos_exec_aout_prep_omagic(p, epp)
                NEW_VMCMD(&epp->ep_vmcmds, vmcmd_map_zero, bsize, baddr,
                    NULLVP, 0, VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE);
 
-       return exec_aout_setup_stack(p, epp);
+       return exec_setup_stack(p, epp);
 }
 #endif /* !sparc */