summaryrefslogtreecommitdiffstats
path: root/sys/conf
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2010-08-23 22:24:11 +0000
committerimp <imp@FreeBSD.org>2010-08-23 22:24:11 +0000
commitc3a399c4ba4528500fec8cd412c88c10c7f637f5 (patch)
tree3fedc9e4d65d62c819fe8818c625211ebbd8ef26 /sys/conf
parenta1a6e5ff56d4b37557fc8a042de19bfc7560dc8e (diff)
downloadFreeBSD-src-c3a399c4ba4528500fec8cd412c88c10c7f637f5.zip
FreeBSD-src-c3a399c4ba4528500fec8cd412c88c10c7f637f5.tar.gz
MFtbemd:
Prefer MACHNE_CPUARCH to MACHINE_ARCH in most contexts where you want to test of all the CPUs of a given family conform.
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/kern.post.mk4
-rw-r--r--sys/conf/kern.pre.mk2
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk
index f759f27..c7e6281 100644
--- a/sys/conf/kern.post.mk
+++ b/sys/conf/kern.post.mk
@@ -84,8 +84,8 @@ gdbinit:
grep -v '# XXX' ${S}/../tools/debugscripts/dot.gdbinit | \
sed "s:MODPATH:${.OBJDIR}/modules:" > .gdbinit
cp ${S}/../tools/debugscripts/gdbinit.kernel ${.CURDIR}
-.if exists(${S}/../tools/debugscripts/gdbinit.${MACHINE_ARCH})
- cp ${S}/../tools/debugscripts/gdbinit.${MACHINE_ARCH} \
+.if exists(${S}/../tools/debugscripts/gdbinit.${MACHINE_CPUARCH})
+ cp ${S}/../tools/debugscripts/gdbinit.${MACHINE_CPUARCH} \
${.CURDIR}/gdbinit.machine
.endif
.endif
diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk
index b61113e..d4bdc1f 100644
--- a/sys/conf/kern.pre.mk
+++ b/sys/conf/kern.pre.mk
@@ -32,7 +32,7 @@ CTFFLAGS+= -g
. else
_MINUS_O= -O2
. endif
-. if ${MACHINE_ARCH} == "amd64"
+. if ${MACHINE_CPUARCH} == "amd64"
COPTFLAGS?=-O2 -frename-registers -pipe
. else
COPTFLAGS?=${_MINUS_O} -pipe
OpenPOWER on IntegriCloud