From 6acebfe40f1dadabacd1d1d6bbac9426f3a9d9c0 Mon Sep 17 00:00:00 2001
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Fri, 19 Mar 2004 16:36:29 +0000
Subject: [PATCH] Depend on rev 1.40.

Submitted by:	ru
---
 sys/conf/kern.pre.mk | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk
index b672482bade1..c685ce667e3a 100644
--- a/sys/conf/kern.pre.mk
+++ b/sys/conf/kern.pre.mk
@@ -18,10 +18,12 @@ SIZE?=		size
 
 .if ${CC} == "icc"
 COPTFLAGS?=-O
-.elif ${MACHINE_ARCH} == "amd64"
-COPTFLAGS?=-O2 -fno-strict-aliasing -frename-registers -pipe
 .else
+. if ${MACHINE_ARCH} == "amd64"
+COPTFLAGS?=-O2 -frename-registers -pipe
+. else
 COPTFLAGS?=-O -pipe
+. endif
 . if ${COPTFLAGS:M-O[23s]} != ""
 COPTFLAGS+= -fno-strict-aliasing
 . endif
@@ -110,6 +112,12 @@ NORMAL_LINT=	${LINT} ${LINTFLAGS} ${CFLAGS:M-[DIU]*} ${.IMPSRC}
 
 GEN_CFILES= $S/$M/$M/genassym.c
 SYSTEM_CFILES= config.c env.c hints.c majors.c vnode_if.c
+.if ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "x86_64"
+LOCORE=locore.S
+.else
+LOCORE=locore.s
+.endif
+SYSTEM_SFILES= $S/$M/$M/${LOCORE}
 SYSTEM_DEP= Makefile ${SYSTEM_OBJS}
 SYSTEM_OBJS= locore.o ${MDOBJS} ${OBJS}
 SYSTEM_OBJS+= ${SYSTEM_CFILES:.c=.o}