From ba37958b34031a8bb775b512097884253f723bd6 Mon Sep 17 00:00:00 2001
From: Jake Burkholder <jake@FreeBSD.org>
Date: Wed, 31 Jul 2002 14:59:05 +0000
Subject: [PATCH] Moved the rule for locore.o from kern.post.mk to
 Makefile.$ARCH.

---
 sys/conf/Makefile.alpha   | 3 +++
 sys/conf/Makefile.amd64   | 3 +++
 sys/conf/Makefile.i386    | 3 +++
 sys/conf/Makefile.ia64    | 3 +++
 sys/conf/Makefile.pc98    | 3 +++
 sys/conf/Makefile.powerpc | 3 +++
 sys/conf/Makefile.sparc64 | 3 +++
 sys/conf/kern.post.mk     | 3 ---
 8 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/sys/conf/Makefile.alpha b/sys/conf/Makefile.alpha
index df48d84770fb..1929b4d7e239 100644
--- a/sys/conf/Makefile.alpha
+++ b/sys/conf/Makefile.alpha
@@ -90,6 +90,9 @@ __reml.S: $S/$M/$M/divrem.m4
 	@(echo "define(NAME,\`__reml')define(OP,\`rem')define(S,\`true')"; \
 	 echo "define(WORDSIZE,32)"; cat ${.ALLSRC}) | m4 > ${.TARGET}
 
+locore.o: $S/$M/$M/locore.s assym.s
+	${NORMAL_S}
+
 %RULES
 
 .include "$S/conf/kern.post.mk"
diff --git a/sys/conf/Makefile.amd64 b/sys/conf/Makefile.amd64
index 77bbc37ca45b..59b57ef1ab78 100644
--- a/sys/conf/Makefile.amd64
+++ b/sys/conf/Makefile.amd64
@@ -45,6 +45,9 @@ MKMODULESENV+= MACHINE=x86_64
 
 %CLEAN
 
+locore.o: $S/$M/$M/locore.s assym.s
+	${NORMAL_S}
+
 %RULES
 
 .include "$S/conf/kern.post.mk"
diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386
index 62e871c3c478..c6ff5db6df52 100644
--- a/sys/conf/Makefile.i386
+++ b/sys/conf/Makefile.i386
@@ -44,6 +44,9 @@ MKMODULESENV+= MACHINE=i386
 
 %CLEAN
 
+locore.o: $S/$M/$M/locore.s assym.s
+	${NORMAL_S}
+
 %RULES
 
 .include "$S/conf/kern.post.mk"
diff --git a/sys/conf/Makefile.ia64 b/sys/conf/Makefile.ia64
index a127e654f625..3c092ac7f16b 100644
--- a/sys/conf/Makefile.ia64
+++ b/sys/conf/Makefile.ia64
@@ -46,6 +46,9 @@ ASM_CFLAGS= -x assembler-with-cpp -Wa,-x -DLOCORE ${CFLAGS}
 
 %CLEAN
 
+locore.o: $S/$M/$M/locore.s assym.s
+	${NORMAL_S}
+
 %RULES
 
 .include "$S/conf/kern.post.mk"
diff --git a/sys/conf/Makefile.pc98 b/sys/conf/Makefile.pc98
index 0e5d57ac0aee..440d85b0b3a9 100644
--- a/sys/conf/Makefile.pc98
+++ b/sys/conf/Makefile.pc98
@@ -45,6 +45,9 @@ MKMODULESENV+=	MACHINE=pc98
 
 %CLEAN
 
+locore.o: $S/$M/$M/locore.s assym.s
+	${NORMAL_S}
+
 %RULES
 
 .include "$S/conf/kern.post.mk"
diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc
index 1a253e0ab052..ec3b588d0cf3 100644
--- a/sys/conf/Makefile.powerpc
+++ b/sys/conf/Makefile.powerpc
@@ -54,6 +54,9 @@ COPTS+= -msoft-float
 
 %CLEAN
 
+locore.o: $S/$M/$M/locore.s assym.s
+	${NORMAL_S}
+
 %RULES
 
 .include "$S/conf/kern.post.mk"
diff --git a/sys/conf/Makefile.sparc64 b/sys/conf/Makefile.sparc64
index 2980fd7bc85e..0411fd3be20b 100644
--- a/sys/conf/Makefile.sparc64
+++ b/sys/conf/Makefile.sparc64
@@ -63,6 +63,9 @@ SYSTEM_OBJS= locore.o exception.o vnode_if.o ${OBJS} hints.o env.o config.o hack
 exception.o: $S/$M/$M/exception.s assym.s
 	${NORMAL_S}
 
+locore.o: $S/$M/$M/locore.s assym.s
+	${NORMAL_S}
+
 %RULES
 
 .include "$S/conf/kern.post.mk"
diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk
index ac331d3b3172..40b17aa52cd4 100644
--- a/sys/conf/kern.post.mk
+++ b/sys/conf/kern.post.mk
@@ -60,9 +60,6 @@ kernel-clobber:
 lint: ${CFILES}
 	${LINT} ${LINTKERNFLAGS} ${CFLAGS:M-[DILU]*} ${.ALLSRC}
 
-locore.o: $S/$M/$M/locore.s assym.s
-	${NORMAL_S}
-
 # This is a hack.  BFD "optimizes" away dynamic mode if there are no
 # dynamic references.  We could probably do a '-Bforcedynamic' mode like
 # in the a.out ld.  For now, this works.