Module Name: src
Committed By: matt
Date: Wed Aug 12 23:29:20 UTC 2009
Modified Files:
src/sys/arch/algor/include: Makefile
src/sys/arch/arc/include: Makefile
src/sys/arch/cobalt/include: Makefile
src/sys/arch/evbmips/include: Makefile
src/sys/arch/hpcmips/include: Makefile
src/sys/arch/mips/mips: cpu_exec.c
src/sys/arch/mipsco/include: Makefile
src/sys/arch/newsmips/conf: GENERIC WAPIKO
src/sys/arch/newsmips/include: Makefile
src/sys/arch/pmax/include: Makefile
src/sys/arch/sbmips/include: Makefile
src/sys/arch/sgimips/include: Makefile
Removed Files:
src/sys/arch/algor/include: aout_machdep.h bsd-aout.h
src/sys/arch/arc/include: aout_machdep.h bsd-aout.h
src/sys/arch/cobalt/include: aout_machdep.h bsd-aout.h
src/sys/arch/evbmips/include: aout_machdep.h
src/sys/arch/hpcmips/include: aout_machdep.h bsd-aout.h
src/sys/arch/mips/include: aout_machdep.h bsd-aout.h
src/sys/arch/mipsco/include: aout_machdep.h bsd-aout.h
src/sys/arch/newsmips/include: aout_machdep.h bsd-aout.h
src/sys/arch/pmax/include: aout_machdep.h bsd-aout.h
src/sys/arch/sbmips/include: aout_machdep.h bsd-aout.h
src/sys/arch/sgimips/include: aout_machdep.h bsd-aout.h
Log Message:
Nuke a.out support for MIPS.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/algor/include/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/arch/algor/include/aout_machdep.h \
src/sys/arch/algor/include/bsd-aout.h
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/arc/include/Makefile
cvs rdiff -u -r1.5 -r0 src/sys/arch/arc/include/aout_machdep.h \
src/sys/arch/arc/include/bsd-aout.h
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/cobalt/include/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/arch/cobalt/include/aout_machdep.h \
src/sys/arch/cobalt/include/bsd-aout.h
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbmips/include/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/arch/evbmips/include/aout_machdep.h
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/hpcmips/include/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/sys/arch/hpcmips/include/aout_machdep.h \
src/sys/arch/hpcmips/include/bsd-aout.h
cvs rdiff -u -r1.8 -r0 src/sys/arch/mips/include/aout_machdep.h
cvs rdiff -u -r1.5 -r0 src/sys/arch/mips/include/bsd-aout.h
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/mips/mips/cpu_exec.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/mipsco/include/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/arch/mipsco/include/aout_machdep.h
cvs rdiff -u -r1.2 -r0 src/sys/arch/mipsco/include/bsd-aout.h
cvs rdiff -u -r1.107 -r1.108 src/sys/arch/newsmips/conf/GENERIC
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/newsmips/conf/WAPIKO
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/newsmips/include/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/arch/newsmips/include/aout_machdep.h
cvs rdiff -u -r1.2 -r0 src/sys/arch/newsmips/include/bsd-aout.h
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/pmax/include/Makefile
cvs rdiff -u -r1.7 -r0 src/sys/arch/pmax/include/aout_machdep.h
cvs rdiff -u -r1.4 -r0 src/sys/arch/pmax/include/bsd-aout.h
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/sbmips/include/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/arch/sbmips/include/aout_machdep.h \
src/sys/arch/sbmips/include/bsd-aout.h
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/sgimips/include/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/arch/sgimips/include/aout_machdep.h \
src/sys/arch/sgimips/include/bsd-aout.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/arch/algor/include/Makefile
diff -u src/sys/arch/algor/include/Makefile:1.11 src/sys/arch/algor/include/Makefile:1.12
--- src/sys/arch/algor/include/Makefile:1.11 Fri Feb 9 21:55:00 2007
+++ src/sys/arch/algor/include/Makefile Wed Aug 12 23:29:18 2009
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2007/02/09 21:55:00 ad Exp $
+# $NetBSD: Makefile,v 1.12 2009/08/12 23:29:18 matt Exp $
INCSDIR=/usr/include/algor
-INCS= ansi.h aout_machdep.h asm.h autoconf.h \
- bswap.h bsd-aout.h bus.h \
+INCS= ansi.h asm.h autoconf.h \
+ bswap.h bus.h \
cdefs.h cpu.h \
disklabel.h \
ecoff_machdep.h elf_machdep.h endian.h endian_machdep.h \
Index: src/sys/arch/arc/include/Makefile
diff -u src/sys/arch/arc/include/Makefile:1.29 src/sys/arch/arc/include/Makefile:1.30
--- src/sys/arch/arc/include/Makefile:1.29 Fri Feb 9 21:55:02 2007
+++ src/sys/arch/arc/include/Makefile Wed Aug 12 23:29:18 2009
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.29 2007/02/09 21:55:02 ad Exp $
+# $NetBSD: Makefile,v 1.30 2009/08/12 23:29:18 matt Exp $
INCSDIR= /usr/include/arc
# Header files which are needed from userland.
-INCS= ansi.h aout_machdep.h asm.h \
- bswap.h bsd-aout.h \
+INCS= ansi.h asm.h \
+ bswap.h \
cdefs.h cpu.h \
disklabel.h \
ecoff_machdep.h elf_machdep.h endian.h endian_machdep.h \
Index: src/sys/arch/cobalt/include/Makefile
diff -u src/sys/arch/cobalt/include/Makefile:1.18 src/sys/arch/cobalt/include/Makefile:1.19
--- src/sys/arch/cobalt/include/Makefile:1.18 Sat Mar 22 18:32:20 2008
+++ src/sys/arch/cobalt/include/Makefile Wed Aug 12 23:29:18 2009
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2008/03/22 18:32:20 tsutsui Exp $
+# $NetBSD: Makefile,v 1.19 2009/08/12 23:29:18 matt Exp $
INCSDIR= /usr/include/cobalt
-INCS= ansi.h aout_machdep.h asm.h autoconf.h \
- bsd-aout.h bswap.h \
+INCS= ansi.h asm.h autoconf.h \
+ bswap.h \
cdefs.h cpu.h \
disklabel.h \
ecoff_machdep.h elf_machdep.h endian.h endian_machdep.h \
Index: src/sys/arch/evbmips/include/Makefile
diff -u src/sys/arch/evbmips/include/Makefile:1.11 src/sys/arch/evbmips/include/Makefile:1.12
--- src/sys/arch/evbmips/include/Makefile:1.11 Fri Feb 9 21:55:03 2007
+++ src/sys/arch/evbmips/include/Makefile Wed Aug 12 23:29:19 2009
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2007/02/09 21:55:03 ad Exp $
+# $NetBSD: Makefile,v 1.12 2009/08/12 23:29:19 matt Exp $
INCSDIR=/usr/include/evbmips
-INCS= ansi.h aout_machdep.h asm.h \
+INCS= ansi.h asm.h \
bswap.h bus.h \
cdefs.h cpu.h \
disklabel.h \
Index: src/sys/arch/hpcmips/include/Makefile
diff -u src/sys/arch/hpcmips/include/Makefile:1.20 src/sys/arch/hpcmips/include/Makefile:1.21
--- src/sys/arch/hpcmips/include/Makefile:1.20 Fri Feb 9 21:55:04 2007
+++ src/sys/arch/hpcmips/include/Makefile Wed Aug 12 23:29:19 2009
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2007/02/09 21:55:04 ad Exp $
+# $NetBSD: Makefile,v 1.21 2009/08/12 23:29:19 matt Exp $
INCSDIR= /usr/include/hpcmips
-INCS= ansi.h aout_machdep.h apmvar.h asm.h autoconf.h \
- bootinfo.h bsd-aout.h bswap.h bus.h \
+INCS= ansi.h apmvar.h asm.h autoconf.h \
+ bootinfo.h bswap.h bus.h \
cdefs.h cpu.h \
disklabel.h \
ecoff_machdep.h elf_machdep.h endian.h endian_machdep.h \
Index: src/sys/arch/mips/mips/cpu_exec.c
diff -u src/sys/arch/mips/mips/cpu_exec.c:1.55 src/sys/arch/mips/mips/cpu_exec.c:1.56
--- src/sys/arch/mips/mips/cpu_exec.c:1.55 Sun Mar 29 01:02:49 2009
+++ src/sys/arch/mips/mips/cpu_exec.c Wed Aug 12 23:29:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_exec.c,v 1.55 2009/03/29 01:02:49 mrg Exp $ */
+/* $NetBSD: cpu_exec.c,v 1.56 2009/08/12 23:29:19 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu_exec.c,v 1.55 2009/03/29 01:02:49 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_exec.c,v 1.56 2009/08/12 23:29:19 matt Exp $");
#include "opt_compat_netbsd.h"
#include "opt_compat_ultrix.h"
@@ -55,65 +55,11 @@
#include <sys/exec_ecoff.h>
#endif
#include <sys/exec_elf.h> /* mandatory */
-#include <mips/bsd-aout.h>
#include <machine/reg.h>
#include <mips/regnum.h> /* symbolic register indices */
int mips_elf_makecmds(struct lwp *, struct exec_package *);
-
-/*
- * cpu_exec_aout_makecmds():
- * cpu-dependent a.out format hook for execve().
- *
- * Determine of the given exec package refers to something which we
- * understand and, if so, set up the vmcmds for it.
- *
- */
-int
-cpu_exec_aout_makecmds(struct lwp *l, struct exec_package *epp)
-{
- int error;
-
- /* If COMPAT_09 is defined, allow loading of old-style 4.4bsd a.out
- executables. */
- struct bsd_aouthdr *hdr = (struct bsd_aouthdr *)epp->ep_hdr;
-
- /* Only handle paged files (laziness). */
- if (hdr->a_magic != BSD_ZMAGIC)
- {
- /* If that failed, try old NetBSD-1.1 elf format */
- error = mips_elf_makecmds (l, epp);
- return error;
- }
-
- error = vn_marktext(epp->ep_vp);
- if (error)
- return (error);
-
- epp->ep_taddr = 0x1000;
- epp->ep_entry = hdr->a_entry;
- epp->ep_tsize = hdr->a_text;
- epp->ep_daddr = epp->ep_taddr + hdr->a_text;
- epp->ep_dsize = hdr->a_data + hdr->a_bss;
-
- /* set up command for text segment */
- NEW_VMCMD(&epp->ep_vmcmds, vmcmd_map_pagedvn, hdr->a_text,
- epp->ep_taddr, epp->ep_vp, 0, VM_PROT_READ|VM_PROT_EXECUTE);
-
- /* set up command for data segment */
- NEW_VMCMD(&epp->ep_vmcmds, vmcmd_map_pagedvn, hdr->a_data,
- epp->ep_daddr, epp->ep_vp, hdr->a_text,
- VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE);
-
- /* set up command for bss segment */
- NEW_VMCMD(&epp->ep_vmcmds, vmcmd_map_zero, hdr->a_bss,
- epp->ep_daddr + hdr->a_data, NULLVP, 0,
- VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE);
-
- return (*epp->ep_esch->es_setup_stack)(l, epp);
-}
-
#ifdef EXEC_ECOFF
void
cpu_exec_ecoff_setregs(struct lwp *l, struct exec_package *epp, u_long stack)
Index: src/sys/arch/mipsco/include/Makefile
diff -u src/sys/arch/mipsco/include/Makefile:1.18 src/sys/arch/mipsco/include/Makefile:1.19
--- src/sys/arch/mipsco/include/Makefile:1.18 Fri Feb 9 21:55:06 2007
+++ src/sys/arch/mipsco/include/Makefile Wed Aug 12 23:29:19 2009
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2007/02/09 21:55:06 ad Exp $
+# $NetBSD: Makefile,v 1.19 2009/08/12 23:29:19 matt Exp $
INCSDIR= /usr/include/mipsco
-INCS= ansi.h aout_machdep.h asm.h autoconf.h \
- bsd-aout.h bswap.h bus.h \
+INCS= ansi.h asm.h autoconf.h \
+ bswap.h bus.h \
cdefs.h cpu.h \
disklabel.h \
ecoff_machdep.h elf.h elf_machdep.h endian.h endian_machdep.h \
Index: src/sys/arch/newsmips/conf/GENERIC
diff -u src/sys/arch/newsmips/conf/GENERIC:1.107 src/sys/arch/newsmips/conf/GENERIC:1.108
--- src/sys/arch/newsmips/conf/GENERIC:1.107 Sat Jan 24 05:06:06 2009
+++ src/sys/arch/newsmips/conf/GENERIC Wed Aug 12 23:29:19 2009
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.107 2009/01/24 05:06:06 mrg Exp $
+# $NetBSD: GENERIC,v 1.108 2009/08/12 23:29:19 matt Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.107 $"
+#ident "GENERIC-$Revision: 1.108 $"
maxusers 16
@@ -69,7 +69,6 @@
options COMPAT_40 # NetBSD 4.0 binary compatibility
options COMPAT_50 # NetBSD 5.0 compatibility.
#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended.
-#options EXEC_AOUT # exec a.out binaries
#options EXEC_ECOFF # exec ecoff binaries
options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
Index: src/sys/arch/newsmips/conf/WAPIKO
diff -u src/sys/arch/newsmips/conf/WAPIKO:1.38 src/sys/arch/newsmips/conf/WAPIKO:1.39
--- src/sys/arch/newsmips/conf/WAPIKO:1.38 Wed Oct 17 19:55:54 2007
+++ src/sys/arch/newsmips/conf/WAPIKO Wed Aug 12 23:29:19 2009
@@ -1,7 +1,7 @@
#
# NEWS3400 config file
#
-# $NetBSD: WAPIKO,v 1.38 2007/10/17 19:55:54 garbled Exp $
+# $NetBSD: WAPIKO,v 1.39 2009/08/12 23:29:19 matt Exp $
#
include "arch/newsmips/conf/std.newsmips"
@@ -38,7 +38,6 @@
options COMPAT_20 # NetBSD 2.0 binary compatibility
options COMPAT_30 # NetBSD 3.0 binary compatibility
options COMPAT_40 # NetBSD 4.0 binary compatibility
-#options EXEC_AOUT # exec a.out binaries
#options EXEC_ECOFF # exec ecoff binaries
options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
Index: src/sys/arch/newsmips/include/Makefile
diff -u src/sys/arch/newsmips/include/Makefile:1.32 src/sys/arch/newsmips/include/Makefile:1.33
--- src/sys/arch/newsmips/include/Makefile:1.32 Sun Feb 18 02:45:31 2007
+++ src/sys/arch/newsmips/include/Makefile Wed Aug 12 23:29:20 2009
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.32 2007/02/18 02:45:31 tsutsui Exp $
+# $NetBSD: Makefile,v 1.33 2009/08/12 23:29:20 matt Exp $
INCSDIR= /usr/include/newsmips
-INCS= adrsmap.h ansi.h asm.h aout_machdep.h autoconf.h \
- bswap.h bsd-aout.h \
+INCS= adrsmap.h ansi.h asm.h autoconf.h \
+ bswap.h \
cdefs.h cpu.h \
disklabel.h \
ecoff_machdep.h elf_machdep.h endian.h endian_machdep.h \
Index: src/sys/arch/pmax/include/Makefile
diff -u src/sys/arch/pmax/include/Makefile:1.33 src/sys/arch/pmax/include/Makefile:1.34
--- src/sys/arch/pmax/include/Makefile:1.33 Sun Feb 18 16:18:25 2007
+++ src/sys/arch/pmax/include/Makefile Wed Aug 12 23:29:20 2009
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.33 2007/02/18 16:18:25 ad Exp $
+# $NetBSD: Makefile,v 1.34 2009/08/12 23:29:20 matt Exp $
INCSDIR= /usr/include/pmax
-INCS= ansi.h aout_machdep.h asm.h autoconf.h \
- bswap.h bsd-aout.h bus.h \
+INCS= ansi.h asm.h autoconf.h \
+ bswap.h bus.h \
cdefs.h cpu.h \
disklabel.h \
ecoff_machdep.h elf_machdep.h endian.h endian_machdep.h \
Index: src/sys/arch/sbmips/include/Makefile
diff -u src/sys/arch/sbmips/include/Makefile:1.10 src/sys/arch/sbmips/include/Makefile:1.11
--- src/sys/arch/sbmips/include/Makefile:1.10 Sun Feb 18 16:24:31 2007
+++ src/sys/arch/sbmips/include/Makefile Wed Aug 12 23:29:20 2009
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.10 2007/02/18 16:24:31 ad Exp $
+# $NetBSD: Makefile,v 1.11 2009/08/12 23:29:20 matt Exp $
INCSDIR= /usr/include/sbmips
# XXXcgd need local: bus.h pci_machdep.h
# XXXcgd need export: intr.h
-INCS= ansi.h aout_machdep.h asm.h \
- bsd-aout.h bswap.h \
+INCS= ansi.h asm.h \
+ bswap.h \
cdefs.h cpu.h \
disklabel.h \
ecoff_machdep.h elf_machdep.h endian.h endian_machdep.h \
Index: src/sys/arch/sgimips/include/Makefile
diff -u src/sys/arch/sgimips/include/Makefile:1.19 src/sys/arch/sgimips/include/Makefile:1.20
--- src/sys/arch/sgimips/include/Makefile:1.19 Tue Nov 25 09:47:40 2008
+++ src/sys/arch/sgimips/include/Makefile Wed Aug 12 23:29:20 2009
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2008/11/25 09:47:40 he Exp $
+# $NetBSD: Makefile,v 1.20 2009/08/12 23:29:20 matt Exp $
INCSDIR= /usr/include/sgimips
-INCS= asm.h ansi.h aout_machdep.h autoconf.h \
- bsd-aout.h bswap.h \
+INCS= asm.h ansi.h autoconf.h \
+ bswap.h \
cdefs.h cpu.h \
disklabel.h \
ecoff_machdep.h elf_machdep.h endian.h endian_machdep.h \
