diff options
Diffstat (limited to 'sys/arch/hp300')
| -rw-r--r-- | sys/arch/hp300/conf/Makefile.hp300 | 15 | ||||
| -rw-r--r-- | sys/arch/hp300/stand/libkern/Makefile | 25 |
2 files changed, 5 insertions, 35 deletions
diff --git a/sys/arch/hp300/conf/Makefile.hp300 b/sys/arch/hp300/conf/Makefile.hp300 index a4d766b8fab..802322b6a9a 100644 --- a/sys/arch/hp300/conf/Makefile.hp300 +++ b/sys/arch/hp300/conf/Makefile.hp300 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.hp300,v 1.41 2007/11/25 11:23:33 deraadt Exp $ +# $OpenBSD: Makefile.hp300,v 1.42 2007/11/25 18:25:28 deraadt Exp $ # $NetBSD: Makefile.hp300,v 1.54 1997/04/01 23:16:41 scottr Exp $ # Makefile for OpenBSD @@ -92,14 +92,6 @@ CPPFLAGS+= -DM68K_MMU_HP CPPFLAGS+= -DM68K_MMU_MOTOROLA .endif -### find out what to use for libkern -.include "$S/lib/libkern/Makefile.inc" -.ifndef PROF -LIBKERN= ${KERNLIB} -.else -LIBKERN= ${KERNLIB_PROF} -.endif - ### for the Motorola 68040 Floating Point Software Product .include "${M68K}/fpsp/Makefile.inc" @@ -122,7 +114,7 @@ HOSTED_C= ${HOSTCC} ${HOSTED_CFLAGS} ${HOSTED_CPPFLAGS} -c $< # ${SYSTEM_LD_HEAD} # ${SYSTEM_LD} swapxxx.o # ${SYSTEM_LD_TAIL} -SYSTEM_OBJ= locore.o param.o ioconf.o ${OBJS} ${FPSP} ${LIBKERN} +SYSTEM_OBJ= locore.o ${FPSP} param.o ioconf.o ${OBJS} SYSTEM_DEP= Makefile ${SYSTEM_OBJ} SYSTEM_LD_HEAD= @rm -f $@ SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \ @@ -155,6 +147,9 @@ param.c: $S/conf/param.c param.o: param.c Makefile ${NORMAL_C} +mcount.o: $S/lib/libkern/mcount.c Makefile + ${NORMAL_C_NOP} + ioconf.o: ioconf.c ${NORMAL_C} diff --git a/sys/arch/hp300/stand/libkern/Makefile b/sys/arch/hp300/stand/libkern/Makefile deleted file mode 100644 index 5de723b5440..00000000000 --- a/sys/arch/hp300/stand/libkern/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -# $OpenBSD: Makefile,v 1.7 2006/08/17 17:19:44 miod Exp $ - -LIB= kern - -.PATH: ${.CURDIR}/../../../../lib/libkern -.PATH: ${.CURDIR}/../../../../lib/libkern/arch/m68k - -.include "${.CURDIR}/../Makefile.inc" - -CFLAGS+=-I${.CURDIR}/../include \ - -I${.CURDIR}/../../../.. -I${.CURDIR}/../../../../lib/libkern - -AFLAGS= -x assembler-with-cpp -traditional-cpp -I${.CURDIR}/../include \ - -I${.CURDIR}/../../../.. -I${.CURDIR}/../../../../lib/libkern - -# kern routines -SRCS= __main.c ashrdi3.c divdi3.c qdivrem.c strlen.S strcmp.S \ - strncmp.S umoddi3.c - -NOPROFILE= -NOPIC= - -install: - -.include <bsd.lib.mk> |