From 483ec9af85f98f63a0f6d07cb559626a6aff1fac Mon Sep 17 00:00:00 2001 From: thorpej Date: Tue, 14 Sep 2004 22:12:06 +0000 Subject: [PATCH] Remove the COMPAT_AOUT LKM build infrastructure. The code is gone, now. --- sys/lkm/compat/Makefile | 4 +- sys/lkm/compat/aout/Makefile | 17 ------ sys/lkm/compat/aout/lkminit_emul.c | 94 ------------------------------ 3 files changed, 2 insertions(+), 113 deletions(-) delete mode 100644 sys/lkm/compat/aout/Makefile delete mode 100644 sys/lkm/compat/aout/lkminit_emul.c diff --git a/sys/lkm/compat/Makefile b/sys/lkm/compat/Makefile index bcaf70004d08..5dd3c2f2138d 100644 --- a/sys/lkm/compat/Makefile +++ b/sys/lkm/compat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2002/11/30 13:41:40 jdolecek Exp $ +# $NetBSD: Makefile,v 1.21 2004/09/14 22:12:06 thorpej Exp $ .if (${MACHINE_ARCH} == "sparc64") SUBDIR+= netbsd32 sunos32 svr4 svr4_32 @@ -22,7 +22,7 @@ SUBDIR+= hpux .endif .if (${MACHINE} == "i386") -SUBDIR+= aout ibcs2 +SUBDIR+= ibcs2 .endif .if (${MACHINE_ARCH} == "m68k") diff --git a/sys/lkm/compat/aout/Makefile b/sys/lkm/compat/aout/Makefile deleted file mode 100644 index f0eb6d0e1082..000000000000 --- a/sys/lkm/compat/aout/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# $NetBSD: Makefile,v 1.5 2001/12/12 11:44:44 lukem Exp $ - -.include "../Makefile.inc" - -.PATH: $S/compat/aout - -CPPFLAGS+= -DSYSVSEM -DSYSVMSG -DSYSVSHM -DCOMPAT_AOUT -CPPFLAGS+= -nostdinc -AFLAGS= -x assembler-with-cpp -traditional-cpp -D_LOCORE -D_KERNEL \ - -I. -I${S} - -KMOD= compat_aout - -SRCS= lkminit_emul.c -SRCS+= aout_exec.c aout_misc.c aout_syscalls.c aout_sysent.c - -.include diff --git a/sys/lkm/compat/aout/lkminit_emul.c b/sys/lkm/compat/aout/lkminit_emul.c deleted file mode 100644 index ebaaa8ccdb1b..000000000000 --- a/sys/lkm/compat/aout/lkminit_emul.c +++ /dev/null @@ -1,94 +0,0 @@ -/* $NetBSD: lkminit_emul.c,v 1.5 2001/12/08 00:37:07 thorpej Exp $ */ - -/*- - * Copyright (c) 1996 The NetBSD Foundation, Inc. - * All rights reserved. - * - * This code is derived from software contributed to The NetBSD Foundation - * by Michael Graff . - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#include -__KERNEL_RCSID(0, "$NetBSD: lkminit_emul.c,v 1.5 2001/12/08 00:37:07 thorpej Exp $"); - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/* - * This module is different to other compat modules - it adds the - * execsw[] entry as well. As the compat_aout is emulation more of - * executable format support, it's probably better to be placed here\ - * than under lkm/exec/. - */ - -extern const struct emul emul_netbsd_aout; - -int compat_aout_lkmentry __P((struct lkm_table *, int, int)); - -static struct execsw exec_netbsd_aout = - /* Native a.out */ - { sizeof(struct exec), - exec_aout_makecmds, - { NULL }, - &emul_netbsd_aout, - EXECSW_PRIO_FIRST, /* Note: this differs from exec_conf.c entry */ - 0, - copyargs, - NULL, - coredump_netbsd }; - -/* - * declare the executable format - */ -MOD_EXEC("compat_aout", -1, &exec_netbsd_aout, "aout"); - -/* - * entry point - */ -int -compat_aout_lkmentry(lkmtp, cmd, ver) - struct lkm_table *lkmtp; - int cmd; - int ver; -{ - - DISPATCH(lkmtp, cmd, ver, lkm_nofunc, lkm_nofunc, lkm_nofunc); -}