Add ${EXTRA_OBJ} so that pre-compiled .o's can be linked into the kernel.

This commit is contained in:
matt 2003-02-05 18:07:46 +00:00
parent a314df3d18
commit 62efa61d00
2 changed files with 7 additions and 5 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.kern.inc,v 1.31 2002/12/10 19:33:11 atatat Exp $
# $NetBSD: Makefile.kern.inc,v 1.32 2003/02/05 18:07:46 matt Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@ -141,8 +141,8 @@ ${_cfile:T:R}.o: ${_cfile}
SYSTEM_OBJ?= ${MD_OBJS} ${MI_OBJS} ${OBJS} ${LIBCOMPAT} ${LIBKERN}
SYSTEM_DEP?= Makefile ${SYSTEM_OBJ} .gdbinit
SYSTEM_LD_HEAD?= @rm -f $@
SYSTEM_LD?= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ} vers.o
SYSTEM_LD?= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' '$${EXTRA_OBJ}' vers.o; \
${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ} ${EXTRA_OBJ} vers.o
SYSTEM_LD_TAIL?= @${SIZE} $@; chmod 755 $@
TEXTADDR?= ${LOADADDRESS} # backwards compatibility

View File

@ -1,4 +1,4 @@
# $NetBSD: files,v 1.595 2003/02/04 01:21:03 thorpej Exp $
# $NetBSD: files,v 1.596 2003/02/05 18:07:46 matt Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
@ -375,7 +375,9 @@ file dev/ic/isp_target.c isp
# LSILogic Fusion-MPT I/O Processor SCSI/FC Controllers
#
device lfmiop: scsi
device lfmiop { port=-1 }
device lfmport: scsi
attach lfmport at lfmiop
file dev/ic/lfmiop.c lfmiop
# Symbios/NCR 53c710 SCSI controllers