Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Include <sys/exec_aout.h> explicitly instead of relying on <sys/exec.h> to

Browse Source 
do it for you.
This commit is contained in:
matt 2009-08-15 23:39:35 +00:00
parent 59ede5ae24
commit 7bb407d6e3
7 changed files with 35 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/compat/common/compat_exec.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: compat_exec.c,v 1.16 2009/08/13 03:53:13 matt Exp $ */
/* $NetBSD: compat_exec.c,v 1.17 2009/08/15 23:39:35 matt Exp $ */
/*
* Copyright (c) 1993, 1994 Christopher G. Demetriou
@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: compat_exec.c,v 1.16 2009/08/13 03:53:13 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: compat_exec.c,v 1.17 2009/08/15 23:39:35 matt Exp $");
#ifdef _KERNEL_OPT
#include "opt_execfmt.h"
@ -45,6 +45,8 @@ __KERNEL_RCSID(0, "$NetBSD: compat_exec.c,v 1.16 2009/08/13 03:53:13 matt Exp $"
#include <sys/resourcevar.h>
#ifdef EXEC_AOUT
#include <sys/exec_aout.h>
/*
* exec_aout_prep_oldzmagic():
* Prepare the vmcmds to build a vmspace for an old ZMAGIC

8
sys/compat/linux/common/linux_exec.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: linux_exec.h,v 1.45 2008/11/19 18:36:03 ad Exp $ */
/* $NetBSD: linux_exec.h,v 1.46 2009/08/15 23:39:35 matt Exp $ */
/*-
* Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
@ -32,6 +32,10 @@
#ifndef _LINUX_EXEC_H
#define _LINUX_EXEC_H
#if defined(EXEC_AOUT)
#include <sys/exec_aout.h>
#endif
#if defined(EXEC_ELF32) || defined(EXEC_ELF64)
#include <sys/exec_elf.h>
#endif
@ -125,9 +129,11 @@ extern struct emul emul_linux;
int linux_sysctl(int *, u_int, void *, size_t *, void *, size_t,
struct lwp *);
void linux_setregs(struct lwp *, struct exec_package *, u_long);
#ifdef EXEC_AOUT
int exec_linux_aout_makecmds(struct lwp *, struct exec_package *);
int linux_aout_copyargs(struct lwp *, struct exec_package *,
struct ps_strings *, char **, void *);
#endif
void linux_trapsignal(struct lwp *, ksiginfo_t *);
int linux_usertrap(struct lwp *, vaddr_t, void *);
#ifdef LINUX_NPTL

9
sys/compat/linux/common/linux_exec_aout.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: linux_exec_aout.c,v 1.65 2008/04/28 20:23:43 martin Exp $ */
/* $NetBSD: linux_exec_aout.c,v 1.66 2009/08/15 23:39:35 matt Exp $ */
/*-
* Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
@ -34,7 +34,11 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: linux_exec_aout.c,v 1.65 2008/04/28 20:23:43 martin Exp $");
__KERNEL_RCSID(0, "$NetBSD: linux_exec_aout.c,v 1.66 2009/08/15 23:39:35 matt Exp $");
#ifdef _KERNEL_OPT
#include "opt_execfmt.h"
#endif
#include <sys/param.h>
#include <sys/systm.h>
@ -45,7 +49,6 @@ __KERNEL_RCSID(0, "$NetBSD: linux_exec_aout.c,v 1.65 2008/04/28 20:23:43 martin
#include <sys/vnode.h>
#include <sys/mount.h>
#include <sys/exec.h>
#include <sys/exec_elf.h>
#include <sys/mman.h>
#include <sys/syscallargs.h>

15
sys/compat/linux/common/linux_uselib.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: linux_uselib.c,v 1.28 2009/06/29 05:08:16 dholland Exp $ */
/* $NetBSD: linux_uselib.c,v 1.29 2009/08/15 23:39:35 matt Exp $ */
/*-
* Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: linux_uselib.c,v 1.28 2009/06/29 05:08:16 dholland Exp $");
__KERNEL_RCSID(0, "$NetBSD: linux_uselib.c,v 1.29 2009/08/15 23:39:35 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -41,7 +41,6 @@ __KERNEL_RCSID(0, "$NetBSD: linux_uselib.c,v 1.28 2009/06/29 05:08:16 dholland E
#include <sys/vnode.h>
#include <sys/mount.h>
#include <sys/exec.h>
#include <sys/exec_elf.h>
#include <sys/mman.h>
#include <sys/syscallargs.h>
@ -49,6 +48,11 @@ __KERNEL_RCSID(0, "$NetBSD: linux_uselib.c,v 1.28 2009/06/29 05:08:16 dholland E
#include <sys/cpu.h>
#include <machine/reg.h>
#ifndef EXEC_AOUT
/* define EXEC_AOUT to get prototype from linux_syscall.h */
#define EXEC_AOUT
#endif
#include <compat/linux/common/linux_types.h>
#include <compat/linux/common/linux_signal.h>
#include <compat/linux/common/linux_util.h>
@ -57,11 +61,6 @@ __KERNEL_RCSID(0, "$NetBSD: linux_uselib.c,v 1.28 2009/06/29 05:08:16 dholland E
#include <compat/linux/common/linux_ipc.h>
#include <compat/linux/common/linux_sem.h>
#ifndef EXEC_AOUT
/* define EXEC_AOUT to get prototype from linux_syscall.h */
#define EXEC_AOUT
#endif
#include <compat/linux/linux_syscallargs.h>
#include <compat/linux/linux_syscall.h>

6
sys/compat/netbsd32/netbsd32_exec.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: netbsd32_exec.h,v 1.29 2009/03/15 15:54:43 cegger Exp $ */
/* $NetBSD: netbsd32_exec.h,v 1.30 2009/08/15 23:39:35 matt Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@ -31,6 +31,10 @@
#include <compat/netbsd32/netbsd32.h>
#ifdef EXEC_AOUT
#include <sys/exec_aout.h>
#endif
/* from <sys/exec_aout.h> */
/*
* Header prepended to each a.out file.

5
sys/compat/sunos/sunos_exec_aout.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: sunos_exec_aout.c,v 1.17 2007/12/08 18:36:23 dsl Exp $ */
/* $NetBSD: sunos_exec_aout.c,v 1.18 2009/08/15 23:39:35 matt Exp $ */
/*
* Copyright (c) 1993 Theo de Raadt
@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: sunos_exec_aout.c,v 1.17 2007/12/08 18:36:23 dsl Exp $");
__KERNEL_RCSID(0, "$NetBSD: sunos_exec_aout.c,v 1.18 2009/08/15 23:39:35 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -42,6 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: sunos_exec_aout.c,v 1.17 2007/12/08 18:36:23 dsl Exp
#include <sys/vnode.h>
#include <sys/file.h>
#include <sys/exec.h>
#include <sys/exec_aout.h>
#include <sys/resourcevar.h>
#include <sys/wait.h>

4
sys/compat/vax1k/vax1k_exec.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: vax1k_exec.h,v 1.7 2008/04/28 20:23:46 martin Exp $ */
/* $NetBSD: vax1k_exec.h,v 1.8 2009/08/15 23:39:35 matt Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -32,6 +32,8 @@
#ifndef _VAX1K_EXEC_H_
#define _VAX1K_EXEC_H_
#include <sys/exec_aout.h>
#define VAX1K_LDPGSZ 1024
#define VAX1K_USRTEXT VAX1K_LDPGSZ