summaryrefslogtreecommitdiffstats
path: root/sys/boot/zfs
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2010-08-23 01:50:34 +0000
committerimp <imp@FreeBSD.org>2010-08-23 01:50:34 +0000
commit86c4c6b1df3ee3fb37a13959ff7ba362f3010f9f (patch)
tree289a9fe244cec05bdcaf9a79e3e343ad4f250a52 /sys/boot/zfs
parent5d0150b96a8d9fe21a0769888dd7b134248a27d5 (diff)
downloadFreeBSD-src-86c4c6b1df3ee3fb37a13959ff7ba362f3010f9f.zip
FreeBSD-src-86c4c6b1df3ee3fb37a13959ff7ba362f3010f9f.tar.gz
MF tbemd: Minor tweaks, prefer MACHINE_CPUARCH generally to MACHINE_ARCH (which simplifies some powerpc/powerpc64 ifs)
Diffstat (limited to 'sys/boot/zfs')
-rw-r--r--sys/boot/zfs/Makefile12
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/boot/zfs/Makefile b/sys/boot/zfs/Makefile
index b48804b..beba733 100644
--- a/sys/boot/zfs/Makefile
+++ b/sys/boot/zfs/Makefile
@@ -10,23 +10,23 @@ CFLAGS+= -I${.CURDIR}/../../../lib/libstand
CFLAGS+= -I${.CURDIR}/../../cddl/boot/zfs
CFLAGS+= -ffreestanding
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64"
+.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
CFLAGS+= -mpreferred-stack-boundary=2
CFLAGS+= -mno-mmx -mno-3dnow -mno-sse -mno-sse2
.endif
-.if ${MACHINE_ARCH} == "i386"
+.if ${MACHINE_CPUARCH} == "i386"
CFLAGS+= -mno-sse3
.endif
-.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "arm"
+.if ${MACHINE_CPUARCH} == "powerpc" || ${MACHINE_CPUARCH} == "arm"
CFLAGS+= -msoft-float
.endif
-.if ${MACHINE_ARCH} == "amd64"
+.if ${MACHINE_CPUARCH} == "amd64"
CFLAGS+= -m32 -march=i386
.endif
CFLAGS+= -Wformat -Wall
-.if ${MACHINE_ARCH} == "amd64"
+.if ${MACHINE_CPUARCH} == "amd64"
CLEANFILES+= machine
machine:
ln -sf ${.CURDIR}/../../i386/include machine
@@ -34,6 +34,6 @@ machine:
.include <bsd.lib.mk>
-.if ${MACHINE_ARCH} == "amd64"
+.if ${MACHINE_CPUARCH} == "amd64"
beforedepend ${OBJS}: machine
.endif
OpenPOWER on IntegriCloud