Hand-list the two-step assym.h -> .[Ss] -> .o dependencies. The

result: kernels built without 'make depend'-provided information
(ie. the .depend file) are more likely to have their *.[Ss] file
compilations track changes to *.h files.

The "*.o: assym.h" dependencies listed are gotten from reading the
.depend output --- from the biggest kernel possible (ie. GENERIC.MP).
When an architecture changes in a substantial way (new .[sS] files),
the list should be updated in the prettiest way possible.

This is not encouraging people to skip 'make depend'; other issues are
not resolved and may be solved later with a change guenther is working
on.  You can still screwed really easily, so continue running make
depend as config tells you.

Idea from a discussion with drahn
ok drahn, kettenis likes the idea too

27 files changed, 68 insertions, 76 deletions

diff --git a/sys/arch/alpha/conf/Makefile.alpha b/sys/arch/alpha/conf/Makefile.alpha
index 30601fa80a2..dccf69daae9 100644
--- a/sys/arch/alpha/conf/Makefile.alpha
+++ b/sys/arch/alpha/conf/Makefile.alpha
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.alpha,v 1.66 2010/05/25 02:35:01 deraadt Exp $
+#	$OpenBSD: Makefile.alpha,v 1.67 2010/05/25 15:04:59 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -146,7 +146,6 @@ db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.awk
 	rm -f db_structinfo.o
 
 locore.o: ${_machdir}/${_mach}/locore.s assym.h
-	${NORMAL_S}
 
 # The install target can be redefined by putting a
 # install-kernel-${MACHINE_NAME} target into /etc/mk.conf
diff --git a/sys/arch/amd64/conf/Makefile.amd64 b/sys/arch/amd64/conf/Makefile.amd64
index 531b57c8d11..494d2f8755b 100644
--- a/sys/arch/amd64/conf/Makefile.amd64
+++ b/sys/arch/amd64/conf/Makefile.amd64
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.amd64,v 1.39 2010/05/25 02:35:02 deraadt Exp $
+#	$OpenBSD: Makefile.amd64,v 1.40 2010/05/25 15:05:00 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -147,7 +147,7 @@ db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.awk
 	rm -f db_structinfo.o
 
 locore.o: ${_machdir}/${_mach}/locore.S assym.h
-	${NORMAL_S}
+mutex.o vector.o copy.o spl.o mptramp.o acpi_wakecode.o: assym.h
 
 # The install target can be redefined by putting a
 # install-kernel-${MACHINE_NAME} target into /etc/mk.conf
diff --git a/sys/arch/armish/conf/Makefile.armish b/sys/arch/armish/conf/Makefile.armish
index 07ba7d3ff34..787df15cbc6 100644
--- a/sys/arch/armish/conf/Makefile.armish
+++ b/sys/arch/armish/conf/Makefile.armish
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.armish,v 1.31 2010/05/25 02:35:02 deraadt Exp $
+#	$OpenBSD: Makefile.armish,v 1.32 2010/05/25 15:05:00 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -155,11 +155,10 @@ db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.awk
 	objdump -g db_structinfo.o | awk -f $S/ddb/parse_structinfo.awk > $@
 	rm -f db_structinfo.o
 
-${_mach}_start.o: ${_machdir}/${_mach}/${_mach}_start.S assym.h
-	${NORMAL_S}
-
+${_mach}_start.o: ${_machdir}/${_mach}/${_mach}_start.S
 locore.o: ${_archdir}/${_arch}/locore.S assym.h
-	${NORMAL_S}
+in_cksum_arm.o fiq_subr.o bcopyinout.o copystr.o sigcode.o: assym.h
+vectors.o cpuswitch.o exception.o bcopy_page.o irq_dispatch.o: assym.h
 
 # The install target can be redefined by putting a
 # install-kernel-${MACHINE_NAME} target into /etc/mk.conf
diff --git a/sys/arch/aviion/conf/Makefile.aviion b/sys/arch/aviion/conf/Makefile.aviion
index 425b9359f11..ed9a505ffff 100644
--- a/sys/arch/aviion/conf/Makefile.aviion
+++ b/sys/arch/aviion/conf/Makefile.aviion
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.aviion,v 1.25 2010/05/25 02:35:02 deraadt Exp $
+#	$OpenBSD: Makefile.aviion,v 1.26 2010/05/25 15:05:00 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -152,7 +152,7 @@ db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.awk
 	rm -f db_structinfo.o
 
 locore.o: ${_machdir}/${_mach}/locore.S assym.h
-	${NORMAL_S}
+eh_common.o m88100_fp.o mutex.o process.o subr.o: assym.h
 
 # The install target can be redefined by putting a
 # install-kernel-${MACHINE_NAME} target into /etc/mk.conf
diff --git a/sys/arch/beagle/conf/Makefile.beagle b/sys/arch/beagle/conf/Makefile.beagle
index 5671554cb20..a5649e71fa0 100644
--- a/sys/arch/beagle/conf/Makefile.beagle
+++ b/sys/arch/beagle/conf/Makefile.beagle
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.beagle,v 1.25 2010/05/25 02:35:02 deraadt Exp $
+#	$OpenBSD: Makefile.beagle,v 1.26 2010/05/25 15:05:00 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -151,11 +151,10 @@ db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.awk
 	objdump -g db_structinfo.o | awk -f $S/ddb/parse_structinfo.awk > $@
 	rm -f db_structinfo.o
 
-${_mach}_start.o: ${_machdir}/${_mach}/${_mach}_start.S assym.h
-	${NORMAL_S}
-
+${_mach}_start.o: ${_machdir}/${_mach}/${_mach}_start.S
 locore.o: ${_archdir}/${_arch}/locore.S assym.h
-	${NORMAL_S}
+in_cksum_arm.o fiq_subr.o bcopyinout.o copystr.o sigcode.o: assym.h
+vectors.o cpuswitch.o exception.o bcopy_page.o irq_dispatch.o: assym.h
 
 # The install target can be redefined by putting a
 # install-kernel-${MACHINE_NAME} target into /etc/mk.conf
diff --git a/sys/arch/gumstix/conf/Makefile.gumstix b/sys/arch/gumstix/conf/Makefile.gumstix
index c09111ee95d..56eab669289 100644
--- a/sys/arch/gumstix/conf/Makefile.gumstix
+++ b/sys/arch/gumstix/conf/Makefile.gumstix
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.gumstix,v 1.23 2010/05/25 02:35:02 deraadt Exp $
+#	$OpenBSD: Makefile.gumstix,v 1.24 2010/05/25 15:05:00 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -151,11 +151,10 @@ db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.awk
 	objdump -g db_structinfo.o | awk -f $S/ddb/parse_structinfo.awk > $@
 	rm -f db_structinfo.o
 
-${_mach}_start.o: ${_machdir}/${_mach}/${_mach}_start.S assym.h
-	${NORMAL_S}
-
+${_mach}_start.o: ${_machdir}/${_mach}/${_mach}_start.S
 locore.o: ${_archdir}/${_arch}/locore.S assym.h
-	${NORMAL_S}
+in_cksum_arm.o fiq_subr.o bcopyinout.o copystr.o sigcode.o: assym.h
+vectors.o cpuswitch.o exception.o bcopy_page.o irq_dispatch.o: assym.h
 
 # The install target can be redefined by putting a
 # install-kernel-${MACHINE_NAME} target into /etc/mk.conf
diff --git a/sys/arch/hp300/conf/Makefile.hp300 b/sys/arch/hp300/conf/Makefile.hp300
index 7cd4cd312c9..9fe2c7cf5f9 100644
--- a/sys/arch/hp300/conf/Makefile.hp300
+++ b/sys/arch/hp300/conf/Makefile.hp300
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.hp300,v 1.66 2010/05/25 02:35:02 deraadt Exp $
+#	$OpenBSD: Makefile.hp300,v 1.67 2010/05/25 15:05:01 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -107,7 +107,7 @@ NORMAL_S=	${CC} ${AFLAGS} ${CPPFLAGS} -c $<
 #	${SYSTEM_LD_HEAD}
 #	${SYSTEM_LD} swapxxx.o
 #	${SYSTEM_LD_TAIL}
-SYSTEM_OBJ=	locore.o ${FPSP} param.o ioconf.o ${OBJS}
+SYSTEM_OBJ=	locore.o param.o ioconf.o ${OBJS} ${FPSP}
 SYSTEM_DEP=	Makefile ${SYSTEM_OBJ}
 SYSTEM_LD_HEAD=	@rm -f $@
 SYSTEM_LD=	@echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
@@ -183,7 +183,7 @@ db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.awk
 	rm -f db_structinfo.o
 
 locore.o: ${_machdir}/${_mach}/locore.s assym.h
-	${NORMAL_S}
+copy.o copypage.o: assym.h
 
 # The install target can be redefined by putting a
 # install-kernel-${MACHINE_NAME} target into /etc/mk.conf
diff --git a/sys/arch/hppa/conf/Makefile.hppa b/sys/arch/hppa/conf/Makefile.hppa
index a8ed65e8bdf..c7d82853d9d 100644
--- a/sys/arch/hppa/conf/Makefile.hppa
+++ b/sys/arch/hppa/conf/Makefile.hppa
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.hppa,v 1.55 2010/05/25 02:35:02 deraadt Exp $
+#	$OpenBSD: Makefile.hppa,v 1.56 2010/05/25 15:05:01 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -167,7 +167,7 @@ db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.awk
 	rm -f db_structinfo.o
 
 locore.o: ${_machdir}/${_mach}/locore.S assym.h
-	${NORMAL_S}
+fpemu.o spcopy.o: assym.h
 
 # The install target can be redefined by putting a
 # install-kernel-${MACHINE_NAME} target into /etc/mk.conf
diff --git a/sys/arch/hppa64/conf/Makefile.hppa64 b/sys/arch/hppa64/conf/Makefile.hppa64
index 838fa3e2795..d749f339672 100644
--- a/sys/arch/hppa64/conf/Makefile.hppa64
+++ b/sys/arch/hppa64/conf/Makefile.hppa64
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.hppa64,v 1.29 2010/05/25 02:35:02 deraadt Exp $
+#	$OpenBSD: Makefile.hppa64,v 1.30 2010/05/25 15:05:01 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -147,7 +147,7 @@ db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.awk
 	rm -f db_structinfo.o
 
 locore.o: ${_machdir}/${_mach}/locore.S assym.h
-	${NORMAL_S}
+spcopy.o: assym.h
 
 # The install target can be redefined by putting a
 # install-kernel-${MACHINE_NAME} target into /etc/mk.conf
diff --git a/sys/arch/i386/conf/Makefile.i386 b/sys/arch/i386/conf/Makefile.i386
index 6fe3f08d904..a71dc052b16 100644
--- a/sys/arch/i386/conf/Makefile.i386
+++ b/sys/arch/i386/conf/Makefile.i386
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.i386,v 1.72 2010/05/25 02:35:02 deraadt Exp $
+#	$OpenBSD: Makefile.i386,v 1.73 2010/05/25 15:05:01 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -152,7 +152,7 @@ db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.awk
 	rm -f db_structinfo.o
 
 locore.o: ${_machdir}/${_mach}/locore.s assym.h
-	${NORMAL_S}
+in_cksum.o mptramp.o kvm86call.o acpi_wakecode.o: assym.h
 
 # The install target can be redefined by putting a
 # install-kernel-${MACHINE_NAME} target into /etc/mk.conf
diff --git a/sys/arch/landisk/conf/Makefile.landisk b/sys/arch/landisk/conf/Makefile.landisk
index 9fdbea21575..1e0cf72bcd2 100644
--- a/sys/arch/landisk/conf/Makefile.landisk
+++ b/sys/arch/landisk/conf/Makefile.landisk
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.landisk,v 1.32 2010/05/25 02:35:02 deraadt Exp $
+#	$OpenBSD: Makefile.landisk,v 1.33 2010/05/25 15:05:01 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -146,7 +146,7 @@ db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.awk
 	rm -f db_structinfo.o
 
 locore.o: ${_machdir}/${_mach}/locore.S assym.h
-	${NORMAL_S}
+locore_subr.o vectors.o in_cksum.o: assym.h
 
 # The install target can be redefined by putting a
 # install-kernel-${MACHINE_NAME} target into /etc/mk.conf
diff --git a/sys/arch/loongson/conf/Makefile.loongson b/sys/arch/loongson/conf/Makefile.loongson
index e8b6c5f448e..de92e1c7504 100644
--- a/sys/arch/loongson/conf/Makefile.loongson
+++ b/sys/arch/loongson/conf/Makefile.loongson
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.loongson,v 1.22 2010/05/25 02:35:02 deraadt Exp $
+#	$OpenBSD: Makefile.loongson,v 1.23 2010/05/25 15:05:01 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -157,7 +157,8 @@ db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.awk
 	rm -f db_structinfo.o
 
 locore.o: ${_machdir}/${_mach}/locore.S assym.h
-	${NORMAL_S}
+cache_loongson2.o context.o cp0access.o exception.o: assym.h
+fp.o lcore_access.o lcore_float.o tlbhandler.o lcore_ddb.o pmon32.o: assym.h
 
 # The install target can be redefined by putting a
 # install-kernel-${MACHINE_NAME} target into /etc/mk.conf
diff --git a/sys/arch/luna88k/conf/Makefile.luna88k b/sys/arch/luna88k/conf/Makefile.luna88k
index 075d8bc1c8e..647dfe81dea 100644
--- a/sys/arch/luna88k/conf/Makefile.luna88k
+++ b/sys/arch/luna88k/conf/Makefile.luna88k
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.luna88k,v 1.32 2010/05/25 02:35:02 deraadt Exp $
+#	$OpenBSD: Makefile.luna88k,v 1.33 2010/05/25 15:05:01 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -150,7 +150,7 @@ db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.awk
 	rm -f db_structinfo.o
 
 locore.o: ${_machdir}/${_mach}/locore.S assym.h
-	${NORMAL_S}
+eh_common.o m88100_fp.o mutex.o process.o subr.o: assym.h
 
 # The install target can be redefined by putting a
 # install-kernel-${MACHINE_NAME} target into /etc/mk.conf
diff --git a/sys/arch/mac68k/conf/Makefile.mac68k b/sys/arch/mac68k/conf/Makefile.mac68k
index f03c212afeb..6c35be40c28 100644
--- a/sys/arch/mac68k/conf/Makefile.mac68k
+++ b/sys/arch/mac68k/conf/Makefile.mac68k
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.mac68k,v 1.63 2010/05/25 02:35:02 deraadt Exp $
+#	$OpenBSD: Makefile.mac68k,v 1.64 2010/05/25 15:05:01 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -72,7 +72,7 @@ NORMAL_S=	${CC} ${AFLAGS} ${CPPFLAGS} -c $<
 #	${SYSTEM_LD_HEAD}
 #	${SYSTEM_LD} swapxxx.o
 #	${SYSTEM_LD_TAIL}
-SYSTEM_OBJ=	locore.o ${FPSP} param.o ioconf.o ${OBJS}
+SYSTEM_OBJ=	locore.o param.o ioconf.o ${OBJS} ${FPSP}
 SYSTEM_DEP=	Makefile ${SYSTEM_OBJ}
 SYSTEM_LD_HEAD=	@rm -f $@
 SYSTEM_LD=	@echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
@@ -148,7 +148,7 @@ db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.awk
 	rm -f db_structinfo.o
 
 locore.o: ${_machdir}/${_mach}/locore.s assym.h
-	${NORMAL_S}
+copy.o copypage.o: assym.h
 
 # The install target can be redefined by putting a
 # install-kernel-${MACHINE_NAME} target into /etc/mk.conf
diff --git a/sys/arch/macppc/conf/Makefile.macppc b/sys/arch/macppc/conf/Makefile.macppc
index 2266a25180a..762ae38ea0d 100644
--- a/sys/arch/macppc/conf/Makefile.macppc
+++ b/sys/arch/macppc/conf/Makefile.macppc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.macppc,v 1.52 2010/05/25 02:35:02 deraadt Exp $
+#	$OpenBSD: Makefile.macppc,v 1.53 2010/05/25 15:05:01 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -146,7 +146,7 @@ db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.awk
 	rm -f db_structinfo.o
 
 locore.o: ${_machdir}/${_mach}/locore.S assym.h
-	${NORMAL_S}
+mutex.o: assym.h
 
 # The install target can be redefined by putting a
 # install-kernel-${MACHINE_NAME} target into /etc/mk.conf
diff --git a/sys/arch/moko/conf/Makefile.moko b/sys/arch/moko/conf/Makefile.moko
index 04c9890d332..480c00e240d 100644
--- a/sys/arch/moko/conf/Makefile.moko
+++ b/sys/arch/moko/conf/Makefile.moko
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.moko,v 1.23 2010/05/25 02:35:02 deraadt Exp $
+#	$OpenBSD: Makefile.moko,v 1.24 2010/05/25 15:05:01 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -151,11 +151,10 @@ db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.awk
 	objdump -g db_structinfo.o | awk -f $S/ddb/parse_structinfo.awk > $@
 	rm -f db_structinfo.o
 
-${_mach}_start.o: ${_machdir}/${_mach}/${_mach}_start.S assym.h
-	${NORMAL_S}
-
+${_mach}_start.o: ${_machdir}/${_mach}/${_mach}_start.S
 locore.o: ${_archdir}/${_arch}/locore.S assym.h
-	${NORMAL_S}
+in_cksum_arm.o fiq_subr.o bcopyinout.o copystr.o sigcode.o: assym.h
+vectors.o cpuswitch.o exception.o bcopy_page.o irq_dispatch.o: assym.h
 
 # The install target can be redefined by putting a
 # install-kernel-${MACHINE_NAME} target into /etc/mk.conf
diff --git a/sys/arch/mvme68k/conf/Makefile.mvme68k b/sys/arch/mvme68k/conf/Makefile.mvme68k
index 508bfc8e0e9..fafa4f202c8 100644
--- a/sys/arch/mvme68k/conf/Makefile.mvme68k
+++ b/sys/arch/mvme68k/conf/Makefile.mvme68k
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.mvme68k,v 1.54 2010/05/25 02:35:02 deraadt Exp $
+#	$OpenBSD: Makefile.mvme68k,v 1.55 2010/05/25 15:05:01 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -149,7 +149,7 @@ db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.awk
 	rm -f db_structinfo.o
 
 locore.o: ${_machdir}/${_mach}/locore.s assym.h
-	${NORMAL_S}
+copy.o copypage.o: assym.h
 
 # The install target can be redefined by putting a
 # install-kernel-${MACHINE_NAME} target into /etc/mk.conf
diff --git a/sys/arch/mvme88k/conf/Makefile.mvme88k b/sys/arch/mvme88k/conf/Makefile.mvme88k
index 5cc5d74bac9..c8910486baa 100644
--- a/sys/arch/mvme88k/conf/Makefile.mvme88k
+++ b/sys/arch/mvme88k/conf/Makefile.mvme88k
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.mvme88k,v 1.62 2010/05/25 02:35:02 deraadt Exp $
+#	$OpenBSD: Makefile.mvme88k,v 1.63 2010/05/25 15:05:01 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -147,7 +147,7 @@ db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.awk
 	rm -f db_structinfo.o
 
 locore.o: ${_machdir}/${_mach}/locore.S assym.h
-	${NORMAL_S}
+eh_common.o m88100_fp.o mutex.o process.o subr.o: assym.h
 
 # The install target can be redefined by putting a
 # install-kernel-${MACHINE_NAME} target into /etc/mk.conf
diff --git a/sys/arch/mvmeppc/conf/Makefile.mvmeppc b/sys/arch/mvmeppc/conf/Makefile.mvmeppc
index 0ee3ead406b..d54c13a15f7 100644
--- a/sys/arch/mvmeppc/conf/Makefile.mvmeppc
+++ b/sys/arch/mvmeppc/conf/Makefile.mvmeppc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.mvmeppc,v 1.49 2010/05/25 02:35:02 deraadt Exp $
+#	$OpenBSD: Makefile.mvmeppc,v 1.50 2010/05/25 15:05:01 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -146,7 +146,7 @@ db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.awk
 	rm -f db_structinfo.o
 
 locore.o: ${_machdir}/${_mach}/locore.S assym.h
-	${NORMAL_S}
+mutex.o: assym.h
 
 # The install target can be redefined by putting a
 # install-kernel-${MACHINE_NAME} target into /etc/mk.conf
diff --git a/sys/arch/palm/conf/Makefile.palm b/sys/arch/palm/conf/Makefile.palm
index 3c231d277bb..4597e460dc0 100644
--- a/sys/arch/palm/conf/Makefile.palm
+++ b/sys/arch/palm/conf/Makefile.palm
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.palm,v 1.20 2010/05/25 02:35:03 deraadt Exp $
+#	$OpenBSD: Makefile.palm,v 1.21 2010/05/25 15:05:01 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -151,11 +151,10 @@ db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.awk
 	objdump -g db_structinfo.o | awk -f $S/ddb/parse_structinfo.awk > $@
 	rm -f db_structinfo.o
 
-${_mach}_start.o: ${_machdir}/${_mach}/${_mach}_start.S assym.h
-	${NORMAL_S}
-
+${_mach}_start.o: ${_machdir}/${_mach}/${_mach}_start.S
 locore.o: ${_archdir}/${_arch}/locore.S assym.h
-	${NORMAL_S}
+in_cksum_arm.o fiq_subr.o bcopyinout.o copystr.o sigcode.o: assym.h
+vectors.o cpuswitch.o exception.o bcopy_page.o irq_dispatch.o: assym.h
 
 # The install target can be redefined by putting a
 # install-kernel-${MACHINE_NAME} target into /etc/mk.conf
diff --git a/sys/arch/sgi/conf/Makefile.sgi b/sys/arch/sgi/conf/Makefile.sgi
index 10738c27690..c2d1c9f656b 100644
--- a/sys/arch/sgi/conf/Makefile.sgi
+++ b/sys/arch/sgi/conf/Makefile.sgi
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.sgi,v 1.44 2010/05/25 02:35:03 deraadt Exp $
+#	$OpenBSD: Makefile.sgi,v 1.45 2010/05/25 15:05:01 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -157,7 +157,8 @@ db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.awk
 	rm -f db_structinfo.o
 
 locore.o: ${_machdir}/${_mach}/locore.S assym.h
-	${NORMAL_S}
+cache_r10k.o context.o cp0access.o exception.o fp.o: assym.h
+lcore_access.o lcore_float.o tlbhandler.o lcore_ddb.o: assym.h
 
 # The install target can be redefined by putting a
 # install-kernel-${MACHINE_NAME} target into /etc/mk.conf
diff --git a/sys/arch/socppc/conf/Makefile.socppc b/sys/arch/socppc/conf/Makefile.socppc
index 4703c10f1a6..759ad2c5216 100644
--- a/sys/arch/socppc/conf/Makefile.socppc
+++ b/sys/arch/socppc/conf/Makefile.socppc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.socppc,v 1.23 2010/05/25 02:35:03 deraadt Exp $
+#	$OpenBSD: Makefile.socppc,v 1.24 2010/05/25 15:05:01 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -146,7 +146,7 @@ db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.awk
 	rm -f db_structinfo.o
 
 locore.o: ${_machdir}/${_mach}/locore.S assym.h
-	${NORMAL_S}
+mutex.o: assym.h
 
 # The install target can be redefined by putting a
 # install-kernel-${MACHINE_NAME} target into /etc/mk.conf
diff --git a/sys/arch/solbourne/conf/Makefile.solbourne b/sys/arch/solbourne/conf/Makefile.solbourne
index 771fa770bc7..8bf3bebe9c4 100644
--- a/sys/arch/solbourne/conf/Makefile.solbourne
+++ b/sys/arch/solbourne/conf/Makefile.solbourne
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.solbourne,v 1.26 2010/05/25 14:33:26 deraadt Exp $
+#	$OpenBSD: Makefile.solbourne,v 1.27 2010/05/25 15:05:01 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -146,7 +146,6 @@ db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.awk
 	rm -f db_structinfo.o
 
 locore.o: ${_machdir}/${_mach}/locore.s assym.h
-	${NORMAL_S}
 
 # The install target can be redefined by putting a
 # install-kernel-${MACHINE_NAME} target into /etc/mk.conf
diff --git a/sys/arch/sparc/conf/Makefile.sparc b/sys/arch/sparc/conf/Makefile.sparc
index f8739ad97d0..72a57677732 100644
--- a/sys/arch/sparc/conf/Makefile.sparc
+++ b/sys/arch/sparc/conf/Makefile.sparc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.sparc,v 1.62 2010/05/25 02:35:03 deraadt Exp $
+#	$OpenBSD: Makefile.sparc,v 1.63 2010/05/25 15:05:02 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -149,7 +149,7 @@ db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.awk
 	rm -f db_structinfo.o
 
 locore.o: ${_machdir}/${_mach}/locore.s assym.h
-	${NORMAL_S}
+bsd_fdintr.o amd7930intr.o: assym.h
 
 # The install target can be redefined by putting a
 # install-kernel-${MACHINE_NAME} target into /etc/mk.conf
diff --git a/sys/arch/sparc64/conf/Makefile.sparc64 b/sys/arch/sparc64/conf/Makefile.sparc64
index e2641a778d9..003370348c2 100644
--- a/sys/arch/sparc64/conf/Makefile.sparc64
+++ b/sys/arch/sparc64/conf/Makefile.sparc64
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.sparc64,v 1.49 2010/05/25 02:35:03 deraadt Exp $
+#	$OpenBSD: Makefile.sparc64,v 1.50 2010/05/25 15:05:02 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -146,7 +146,7 @@ db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.awk
 	rm -f db_structinfo.o
 
 locore.o: ${_machdir}/${_mach}/locore.s assym.h
-	${NORMAL_S}
+hvcall.o in_cksum.o mutex.o: assym.h
 
 # The install target can be redefined by putting a
 # install-kernel-${MACHINE_NAME} target into /etc/mk.conf
diff --git a/sys/arch/vax/conf/Makefile.vax b/sys/arch/vax/conf/Makefile.vax
index 2682ce37b75..fb80eec4a34 100644
--- a/sys/arch/vax/conf/Makefile.vax
+++ b/sys/arch/vax/conf/Makefile.vax
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.vax,v 1.52 2010/05/25 02:35:03 deraadt Exp $
+#	$OpenBSD: Makefile.vax,v 1.53 2010/05/25 15:05:02 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -146,10 +146,8 @@ db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.awk
 	rm -f db_structinfo.o
 
 intvec.o: ${_machdir}/${_mach}/intvec.s assym.h
-	${NORMAL_S}
-
 subr.o: ${_machdir}/${_mach}/subr.s assym.h
-	${NORMAL_S}
+unimpl_emul.o: assym.h
 
 # The install target can be redefined by putting a
 # install-kernel-${MACHINE_NAME} target into /etc/mk.conf
diff --git a/sys/arch/zaurus/conf/Makefile.zaurus b/sys/arch/zaurus/conf/Makefile.zaurus
index 740b71f511b..ae364d6e530 100644
--- a/sys/arch/zaurus/conf/Makefile.zaurus
+++ b/sys/arch/zaurus/conf/Makefile.zaurus
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.zaurus,v 1.33 2010/05/25 02:35:03 deraadt Exp $
+#	$OpenBSD: Makefile.zaurus,v 1.34 2010/05/25 15:05:02 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -151,11 +151,10 @@ db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.awk
 	objdump -g db_structinfo.o | awk -f $S/ddb/parse_structinfo.awk > $@
 	rm -f db_structinfo.o
 
-${_mach}_start.o: ${_machdir}/${_mach}/${_mach}_start.S assym.h
-	${NORMAL_S}
-
+${_mach}_start.o: ${_machdir}/${_mach}/${_mach}_start.S
 locore.o: ${_archdir}/${_arch}/locore.S assym.h
-	${NORMAL_S}
+in_cksum_arm.o fiq_subr.o bcopyinout.o copystr.o sigcode.o: assym.h
+vectors.o cpuswitch.o exception.o bcopy_page.o irq_dispatch.o: assym.h
 
 # The install target can be redefined by putting a
 # install-kernel-${MACHINE_NAME} target into /etc/mk.conf