Module Name: src
Committed By: matt
Date: Sat Aug 15 23:39:35 UTC 2009
Modified Files:
src/sys/compat/common: compat_exec.c
src/sys/compat/linux/common: linux_exec.h linux_exec_aout.c
linux_uselib.c
src/sys/compat/netbsd32: netbsd32_exec.h
src/sys/compat/sunos: sunos_exec_aout.c
src/sys/compat/vax1k: vax1k_exec.h
Log Message:
Include <sys/exec_aout.h> explicitly instead of relying on <sys/exec.h> to
do it for you.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/compat/common/compat_exec.c
cvs rdiff -u -r1.45 -r1.46 src/sys/compat/linux/common/linux_exec.h
cvs rdiff -u -r1.65 -r1.66 src/sys/compat/linux/common/linux_exec_aout.c
cvs rdiff -u -r1.28 -r1.29 src/sys/compat/linux/common/linux_uselib.c
cvs rdiff -u -r1.29 -r1.30 src/sys/compat/netbsd32/netbsd32_exec.h
cvs rdiff -u -r1.17 -r1.18 src/sys/compat/sunos/sunos_exec_aout.c
cvs rdiff -u -r1.7 -r1.8 src/sys/compat/vax1k/vax1k_exec.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/common/compat_exec.c
diff -u src/sys/compat/common/compat_exec.c:1.16 src/sys/compat/common/compat_exec.c:1.17
--- src/sys/compat/common/compat_exec.c:1.16 Thu Aug 13 03:53:13 2009
+++ src/sys/compat/common/compat_exec.c Sat Aug 15 23:39:35 2009
@@ -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 @@
#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
Index: src/sys/compat/linux/common/linux_exec.h
diff -u src/sys/compat/linux/common/linux_exec.h:1.45 src/sys/compat/linux/common/linux_exec.h:1.46
--- src/sys/compat/linux/common/linux_exec.h:1.45 Wed Nov 19 18:36:03 2008
+++ src/sys/compat/linux/common/linux_exec.h Sat Aug 15 23:39:35 2009
@@ -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 @@
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
Index: src/sys/compat/linux/common/linux_exec_aout.c
diff -u src/sys/compat/linux/common/linux_exec_aout.c:1.65 src/sys/compat/linux/common/linux_exec_aout.c:1.66
--- src/sys/compat/linux/common/linux_exec_aout.c:1.65 Mon Apr 28 20:23:43 2008
+++ src/sys/compat/linux/common/linux_exec_aout.c Sat Aug 15 23:39:35 2009
@@ -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 @@
#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>
Index: src/sys/compat/linux/common/linux_uselib.c
diff -u src/sys/compat/linux/common/linux_uselib.c:1.28 src/sys/compat/linux/common/linux_uselib.c:1.29
--- src/sys/compat/linux/common/linux_uselib.c:1.28 Mon Jun 29 05:08:16 2009
+++ src/sys/compat/linux/common/linux_uselib.c Sat Aug 15 23:39:35 2009
@@ -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 @@
#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 @@
#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 @@
#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>
Index: src/sys/compat/netbsd32/netbsd32_exec.h
diff -u src/sys/compat/netbsd32/netbsd32_exec.h:1.29 src/sys/compat/netbsd32/netbsd32_exec.h:1.30
--- src/sys/compat/netbsd32/netbsd32_exec.h:1.29 Sun Mar 15 15:54:43 2009
+++ src/sys/compat/netbsd32/netbsd32_exec.h Sat Aug 15 23:39:35 2009
@@ -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.
Index: src/sys/compat/sunos/sunos_exec_aout.c
diff -u src/sys/compat/sunos/sunos_exec_aout.c:1.17 src/sys/compat/sunos/sunos_exec_aout.c:1.18
--- src/sys/compat/sunos/sunos_exec_aout.c:1.17 Sat Dec 8 18:36:23 2007
+++ src/sys/compat/sunos/sunos_exec_aout.c Sat Aug 15 23:39:35 2009
@@ -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 @@
#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>
Index: src/sys/compat/vax1k/vax1k_exec.h
diff -u src/sys/compat/vax1k/vax1k_exec.h:1.7 src/sys/compat/vax1k/vax1k_exec.h:1.8
--- src/sys/compat/vax1k/vax1k_exec.h:1.7 Mon Apr 28 20:23:46 2008
+++ src/sys/compat/vax1k/vax1k_exec.h Sat Aug 15 23:39:35 2009
@@ -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
