Module Name: src
Committed By: pgoyette
Date: Sun Aug 16 17:12:48 UTC 2009
Modified Files:
src/distrib/utils/sysinst: aout2elf.c
src/include: a.out.h
src/sys/arch/amd64/amd64: netbsd32_machdep.c
Log Message:
Repair more fallout from the exec_aout.h change.
No guarantee that these are the "right" things to do, but they do allow
building of port-amd64 again.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/distrib/utils/sysinst/aout2elf.c
cvs rdiff -u -r1.19 -r1.20 src/include/a.out.h
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/amd64/amd64/netbsd32_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/aout2elf.c
diff -u src/distrib/utils/sysinst/aout2elf.c:1.13 src/distrib/utils/sysinst/aout2elf.c:1.14
--- src/distrib/utils/sysinst/aout2elf.c:1.13 Tue Jul 18 12:05:03 2006
+++ src/distrib/utils/sysinst/aout2elf.c Sun Aug 16 17:12:48 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: aout2elf.c,v 1.13 2006/07/18 12:05:03 jnemeth Exp $
+/* $NetBSD: aout2elf.c,v 1.14 2009/08/16 17:12:48 pgoyette Exp $
*
* Copyright 1997 Piermont Information Systems Inc.
* All rights reserved.
@@ -39,6 +39,7 @@
#include <sys/param.h>
#include <sys/exec.h>
+#include <sys/exec_aout.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
Index: src/include/a.out.h
diff -u src/include/a.out.h:1.19 src/include/a.out.h:1.20
--- src/include/a.out.h:1.19 Wed Dec 10 12:06:25 2003
+++ src/include/a.out.h Sun Aug 16 17:12:47 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: a.out.h,v 1.19 2003/12/10 12:06:25 agc Exp $ */
+/* $NetBSD: a.out.h,v 1.20 2009/08/16 17:12:47 pgoyette Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -60,7 +60,7 @@
#ifndef _AOUT_H_
#define _AOUT_H_
-#include <sys/exec.h>
+#include <sys/exec_aout.h>
#define _AOUT_INCLUDE_
#include <nlist.h>
Index: src/sys/arch/amd64/amd64/netbsd32_machdep.c
diff -u src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.57 src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.58
--- src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.57 Thu Dec 18 15:42:33 2008
+++ src/sys/arch/amd64/amd64/netbsd32_machdep.c Sun Aug 16 17:12:47 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_machdep.c,v 1.57 2008/12/18 15:42:33 cegger Exp $ */
+/* $NetBSD: netbsd32_machdep.c,v 1.58 2009/08/16 17:12:47 pgoyette Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.57 2008/12/18 15:42:33 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.58 2009/08/16 17:12:47 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -48,6 +48,7 @@
#include <sys/param.h>
#include <sys/exec.h>
+#include <sys/exec_aout.h>
#include <sys/kmem.h>
#include <sys/proc.h>
#include <sys/signalvar.h>
