This Makefile is for FreeBSD, not 4.3 BSD-Reno. Moved $Id$.

Added STRIP=, DBSYM=, and LOAD_ADDRESS?=
Now use LOAD_ADDRESS for linking kernel and for dbsym, added strip -x to
cut kernel size.

Added machde.o: dependency, this will be needed in the future, and for
now it does not hurt anyone.

Cleaned out conf.o: dependency, mkdep does the right things.  Same for
param.c:

This is really a Merge in of NetBSD's Makefile.i386, here is the relevant
rlog info:
----------------------------
revision 1.27
date: 1993/08/27 23:58:20;  author: brezak;  state: Exp;  lines: +2 -2
Need LOAD_ADDRESS for depend pass.
----------------------------
revision 1.25
date: 1993/07/19 16:52:16;  author: mycroft;  state: Exp;  lines: +3 -3
Add ${DEBUG} to CFLAGS and -f to dbsym.
----------------------------
revision 1.22
date: 1993/07/18 10:08:22;  author: mycroft;  state: Exp;  lines: +5 -6
Change to work with new config stuff for specifying load address.
----------------------------
revision 1.20
date: 1993/07/18 09:47:40;  author: mycroft;  state: Exp;  lines: +6 -5
Use new -T option to dbsym.
----------------------------
revision 1.17
date: 1993/07/11 08:42:22;  author: cgd;  state: Exp;  lines: +2 -2
don't ignore errors from dbsym...  it might say that, e.g. there's
not enough symbol space!
----------------------------
revision 1.14
date: 1993/06/06 23:29:03;  author: cgd;  state: Exp;  lines: +2 -2
make conf.o actually depend on conf.c...
----------------------------
revision 1.8
date: 1993/04/29 03:27:39;  author: cgd;  state: Exp;  lines: +5 -10
use ed instead of ex.  the script to use is identical, and we might
want to switch back to using ex when our ex supports -.
----------------------------
revision 1.5
date: 1993/03/24 18:48:57;  author: cgd;  state: Exp;  lines: +1 -1
now use absolute path for dbsym
----------------------------

2 files changed, 40 insertions, 40 deletions

diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386
index c8ca62a..efa0e72 100644
--- a/sys/conf/Makefile.i386
+++ b/sys/conf/Makefile.i386
@@ -1,6 +1,8 @@
 # Copyright 1990 W. Jolitz
-# @(#)Makefile.i386	7.1 5/10/91
-# Makefile for 4.3 BSD-Reno
+#	from: @(#)Makefile.i386	7.1 5/10/91
+#	$Id$
+#
+# Makefile for FreeBSD
 #
 # This makefile is constructed from a machine description:
 #	config machineid
@@ -18,13 +20,12 @@
 # -DTRACE	compile in kernel tracing hooks
 # -DQUOTA	compile in file system quotas
 #
-#	$Id$
-#
-
 TOUCH=	touch -f -c
 LD=	/usr/bin/ld
 CC=	cc 
 CPP=	cpp
+STRIP=	strip
+DBSYM=	/usr/sbin/dbsym
 
 S=	../..
 I386=	../../i386
@@ -33,6 +34,7 @@ INCLUDES= -I. -I$S -I$S/sys
 COPTS=	${INCLUDES} ${IDENT} -DKERNEL -Di386 -DNPX
 ASFLAGS=
 CFLAGS=	-O ${DEBUG} ${COPTS}
+LOAD_ADDRESS?=	FE000000
 
 NORMAL_C= ${CC} -c ${CFLAGS} ${PROF} $<
 NORMAL_C_C= ${CC} -c ${CFLAGS} ${PROF} ${PARAM} $<
@@ -42,13 +44,16 @@ DRIVER_C_C= ${CC} -c ${CFLAGS} ${PROF} ${PARAM} $<
 SYSTEM_OBJS=locore.o ${OBJS} param.o ioconf.o conf.o
 SYSTEM_DEP=Makefile symbols.sort ${SYSTEM_OBJS}
 SYSTEM_LD_HEAD= 	@echo loading $@; rm -f $@
-SYSTEM_LD= @${LD} -z -T FE000000 -o $@ -X vers.o ${SYSTEM_OBJS}
+SYSTEM_LD= @${LD} -z -T ${LOAD_ADDRESS} -o $@ -X vers.o ${SYSTEM_OBJS}
 SYSTEM_LD_TAIL= @echo rearranging symbols; symorder symbols.sort $@; \
-		dbsym $@ 2>/dev/null || true; size $@; chmod 755 $@
+	${DBSYM} -fT ${LOAD_ADDRESS} $@; ${STRIP} -x $@; size $@; chmod 755 $@
 
+# (XXX) ok, this is weird.  but we've got a working ed, and a broken ex, and
+# the script is identical for either... -- cgd
+#
 GPROF.EX=	/usr/src/lib/csu.i386/gprof.ex
 PROFILE_C=	${CC} -S -c ${CFLAGS} $< ; \
-		ex - $*.s < ${GPROF.EX} ; \
+		ed - $*.s < ${GPROF.EX} ; \
 		${AS} -o $@ $*.s ; \
 		rm -f $*.s
 
@@ -79,6 +84,9 @@ locore.o: assym.s ${I386}/i386/locore.s machine/trap.h machine/psl.h \
 	${CPP} -I. -DLOCORE ${COPTS} ${I386}/i386/locore.s | \
 		${AS} ${ASFLAGS} -o locore.o
 
+machdep.o: ${I386}/i386/machdep.c Makefile
+	${CC} -c ${CFLAGS} -DLOAD_ADDRESS=0x${LOAD_ADDRESS} ${PROF} $<
+
 # the following is necessary because autoconf.o depends on #if GENERIC
 autoconf.o: Makefile
 
@@ -103,7 +111,7 @@ genassym:
 		 ${I386}/i386/genassym.c -o genassym
 
 depend: assym.s param.c
-	sh /usr/bin/mkdep ${COPTS} ${CFILES} ioconf.c param.c ${I386}/i386/conf.c
+	sh /usr/bin/mkdep -DLOAD_ADDRESS=0x${LOAD_ADDRESS} ${COPTS} ${CFILES} ioconf.c param.c ${I386}/i386/conf.c
 	sh /usr/bin/mkdep -a -p ${INCLUDES} ${IDENT} ${PARAM} ${I386}/i386/genassym.c
 
 links:
@@ -121,25 +129,17 @@ ioconf.o: ioconf.c $S/sys/param.h machine/pte.h $S/sys/buf.h \
     ${I386}/isa/isa_device.h ${I386}/isa/isa.h ${I386}/isa/icu.h
 	${CC} -c ${CFLAGS} ioconf.c
 
-conf.o: $S/sys/param.h $S/sys/systm.h $S/sys/buf.h $S/sys/ioctl.h \
-	$S/sys/tty.h $S/sys/conf.h \
-	bpfilter.h cd.h ch.h com.h dcfclk.h fd.h lpa.h \
-	lpt.h pty.h sd.h speaker.h st.h wd.h wt.h \
-	${I386}/i386/conf.c
+conf.o: ${I386}/i386/conf.c
 	${CC} -traditional -c ${CFLAGS} ${I386}/i386/conf.c
 
-param.c: $S/conf/param.c \
-	$S/sys/param.h $S/sys/systm.h $S/sys/socket.h $S/sys/proc.h \
-	$S/sys/vnode.h $S/sys/file.h $S/sys/callout.h $S/sys/clist.h \
-	$S/sys/mbuf.h $S/ufs/quota.h $S/sys/kernel.h machine/vmparam.h \
-	$S/sys/shm.h
+param.c: $S/conf/param.c
 	-rm -f param.c
 	cp $S/conf/param.c .
 
 param.o: param.c Makefile
 	${CC} -c ${CFLAGS} ${PARAM} param.c
 
-vers.o: ${SYSTEM_DEP}
+vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP}
 	sh $S/conf/newvers.sh ${KERN_IDENT} ${IDENT}
 	${CC} ${CFLAGS} -c vers.c
 
diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc
index c8ca62a..efa0e72 100644
--- a/sys/conf/Makefile.powerpc
+++ b/sys/conf/Makefile.powerpc
@@ -1,6 +1,8 @@
 # Copyright 1990 W. Jolitz
-# @(#)Makefile.i386	7.1 5/10/91
-# Makefile for 4.3 BSD-Reno
+#	from: @(#)Makefile.i386	7.1 5/10/91
+#	$Id$
+#
+# Makefile for FreeBSD
 #
 # This makefile is constructed from a machine description:
 #	config machineid
@@ -18,13 +20,12 @@
 # -DTRACE	compile in kernel tracing hooks
 # -DQUOTA	compile in file system quotas
 #
-#	$Id$
-#
-
 TOUCH=	touch -f -c
 LD=	/usr/bin/ld
 CC=	cc 
 CPP=	cpp
+STRIP=	strip
+DBSYM=	/usr/sbin/dbsym
 
 S=	../..
 I386=	../../i386
@@ -33,6 +34,7 @@ INCLUDES= -I. -I$S -I$S/sys
 COPTS=	${INCLUDES} ${IDENT} -DKERNEL -Di386 -DNPX
 ASFLAGS=
 CFLAGS=	-O ${DEBUG} ${COPTS}
+LOAD_ADDRESS?=	FE000000
 
 NORMAL_C= ${CC} -c ${CFLAGS} ${PROF} $<
 NORMAL_C_C= ${CC} -c ${CFLAGS} ${PROF} ${PARAM} $<
@@ -42,13 +44,16 @@ DRIVER_C_C= ${CC} -c ${CFLAGS} ${PROF} ${PARAM} $<
 SYSTEM_OBJS=locore.o ${OBJS} param.o ioconf.o conf.o
 SYSTEM_DEP=Makefile symbols.sort ${SYSTEM_OBJS}
 SYSTEM_LD_HEAD= 	@echo loading $@; rm -f $@
-SYSTEM_LD= @${LD} -z -T FE000000 -o $@ -X vers.o ${SYSTEM_OBJS}
+SYSTEM_LD= @${LD} -z -T ${LOAD_ADDRESS} -o $@ -X vers.o ${SYSTEM_OBJS}
 SYSTEM_LD_TAIL= @echo rearranging symbols; symorder symbols.sort $@; \
-		dbsym $@ 2>/dev/null || true; size $@; chmod 755 $@
+	${DBSYM} -fT ${LOAD_ADDRESS} $@; ${STRIP} -x $@; size $@; chmod 755 $@
 
+# (XXX) ok, this is weird.  but we've got a working ed, and a broken ex, and
+# the script is identical for either... -- cgd
+#
 GPROF.EX=	/usr/src/lib/csu.i386/gprof.ex
 PROFILE_C=	${CC} -S -c ${CFLAGS} $< ; \
-		ex - $*.s < ${GPROF.EX} ; \
+		ed - $*.s < ${GPROF.EX} ; \
 		${AS} -o $@ $*.s ; \
 		rm -f $*.s
 
@@ -79,6 +84,9 @@ locore.o: assym.s ${I386}/i386/locore.s machine/trap.h machine/psl.h \
 	${CPP} -I. -DLOCORE ${COPTS} ${I386}/i386/locore.s | \
 		${AS} ${ASFLAGS} -o locore.o
 
+machdep.o: ${I386}/i386/machdep.c Makefile
+	${CC} -c ${CFLAGS} -DLOAD_ADDRESS=0x${LOAD_ADDRESS} ${PROF} $<
+
 # the following is necessary because autoconf.o depends on #if GENERIC
 autoconf.o: Makefile
 
@@ -103,7 +111,7 @@ genassym:
 		 ${I386}/i386/genassym.c -o genassym
 
 depend: assym.s param.c
-	sh /usr/bin/mkdep ${COPTS} ${CFILES} ioconf.c param.c ${I386}/i386/conf.c
+	sh /usr/bin/mkdep -DLOAD_ADDRESS=0x${LOAD_ADDRESS} ${COPTS} ${CFILES} ioconf.c param.c ${I386}/i386/conf.c
 	sh /usr/bin/mkdep -a -p ${INCLUDES} ${IDENT} ${PARAM} ${I386}/i386/genassym.c
 
 links:
@@ -121,25 +129,17 @@ ioconf.o: ioconf.c $S/sys/param.h machine/pte.h $S/sys/buf.h \
     ${I386}/isa/isa_device.h ${I386}/isa/isa.h ${I386}/isa/icu.h
 	${CC} -c ${CFLAGS} ioconf.c
 
-conf.o: $S/sys/param.h $S/sys/systm.h $S/sys/buf.h $S/sys/ioctl.h \
-	$S/sys/tty.h $S/sys/conf.h \
-	bpfilter.h cd.h ch.h com.h dcfclk.h fd.h lpa.h \
-	lpt.h pty.h sd.h speaker.h st.h wd.h wt.h \
-	${I386}/i386/conf.c
+conf.o: ${I386}/i386/conf.c
 	${CC} -traditional -c ${CFLAGS} ${I386}/i386/conf.c
 
-param.c: $S/conf/param.c \
-	$S/sys/param.h $S/sys/systm.h $S/sys/socket.h $S/sys/proc.h \
-	$S/sys/vnode.h $S/sys/file.h $S/sys/callout.h $S/sys/clist.h \
-	$S/sys/mbuf.h $S/ufs/quota.h $S/sys/kernel.h machine/vmparam.h \
-	$S/sys/shm.h
+param.c: $S/conf/param.c
 	-rm -f param.c
 	cp $S/conf/param.c .
 
 param.o: param.c Makefile
 	${CC} -c ${CFLAGS} ${PARAM} param.c
 
-vers.o: ${SYSTEM_DEP}
+vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP}
 	sh $S/conf/newvers.sh ${KERN_IDENT} ${IDENT}
 	${CC} ${CFLAGS} -c vers.c