summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2004-03-19 16:36:29 +0000
committerobrien <obrien@FreeBSD.org>2004-03-19 16:36:29 +0000
commit8f8e02cc5ef4173158a712baba9c00bf6f9d5946 (patch)
tree2cabf4f3feab354d520ffec41845f708c3c863fe /sys
parent334e1c11e73b6c6b1ccede32908e7068eb5eff53 (diff)
downloadFreeBSD-src-8f8e02cc5ef4173158a712baba9c00bf6f9d5946.zip
FreeBSD-src-8f8e02cc5ef4173158a712baba9c00bf6f9d5946.tar.gz
Depend on rev 1.40.
Submitted by: ru
Diffstat (limited to 'sys')
-rw-r--r--sys/conf/kern.pre.mk12
1 files changed, 10 insertions, 2 deletions
diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk
index b672482..c685ce6 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}
OpenPOWER on IntegriCloud