summaryrefslogtreecommitdiff
path: root/sys/arch/armish
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2007-11-25 11:23:34 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2007-11-25 11:23:34 +0000
commit81c82f0a9fedfa5bda0780e86db5a95a644b83dc (patch)
tree96e86ecc2edffc7e5499f96782d7c6f3fe3018ce /sys/arch/armish
parent7ac5456ddfe594fa299bc0055230df33e759a988 (diff)
Get rid of the kernel 'libcompat' framework, and instead use conf/files to
decide which files must be pulled into the kernel. Also conditionalize the pulling of those files based on the COMPAT_* options.
Diffstat (limited to 'sys/arch/armish')
-rw-r--r--sys/arch/armish/conf/Makefile.armish13
1 files changed, 2 insertions, 11 deletions
diff --git a/sys/arch/armish/conf/Makefile.armish b/sys/arch/armish/conf/Makefile.armish
index 4c3c5203bcf..002d5a65e23 100644
--- a/sys/arch/armish/conf/Makefile.armish
+++ b/sys/arch/armish/conf/Makefile.armish
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.armish,v 1.5 2007/07/30 16:23:33 thib Exp $
+# $OpenBSD: Makefile.armish,v 1.6 2007/11/25 11:23:33 deraadt Exp $
# $NetBSD: Makefile.i386,v 1.67 1996/05/11 16:12:11 mycroft Exp $
# Makefile for OpenBSD
@@ -69,14 +69,6 @@ LIBKERN= ${KERNLIB}
LIBKERN= ${KERNLIB_PROF}
.endif
-### find out what to use for libcompat
-.include "$S/compat/common/Makefile.inc"
-.ifndef PROF
-LIBCOMPAT= ${COMPATLIB}
-.else
-LIBCOMPAT= ${COMPATLIB_PROF}
-.endif
-
# compile rules: rules are named ${TYPE}_${SUFFIX}${CONFIG_DEP}
# where TYPE is NORMAL, DRIVER, or PROFILE; SUFFIX is the file suffix,
# capitalized (e.g. C for a .c file), and CONFIG_DEP is _C if the file
@@ -104,8 +96,7 @@ HOSTED_C= ${HOSTCC} ${HOSTED_CFLAGS} ${HOSTED_CPPFLAGS} -c $<
# ${SYSTEM_LD_HEAD}
# ${SYSTEM_LD} swapxxx.o
# ${SYSTEM_LD_TAIL}
-SYSTEM_OBJ= ${BOARDTYPE}_start.o locore.o \
- param.o ioconf.o ${OBJS} ${LIBKERN} ${LIBCOMPAT}
+SYSTEM_OBJ= ${BOARDTYPE}_start.o locore.o param.o ioconf.o ${OBJS} ${LIBKERN}
SYSTEM_DEP= Makefile ${SYSTEM_OBJ}
SYSTEM_LD_HEAD= rm -f $@
SYSTEM_LD_HEAD+=; \