From 8959d1a54366ab3742c5f3589a0fef88aea77110 Mon Sep 17 00:00:00 2001
From: Dimitry Andric <dim@FreeBSD.org>
Date: Wed, 5 Jan 2011 22:00:37 +0000
Subject: [PATCH] In lib/libstand, sys/boot/ficl and sys/boot/zfs, -mno-sse3
 should also be used for amd64, not just for i386.

---
 lib/libstand/Makefile  | 5 +----
 sys/boot/ficl/Makefile | 3 +--
 sys/boot/zfs/Makefile  | 5 +----
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/lib/libstand/Makefile b/lib/libstand/Makefile
index 90b47e780213..cdf298ba201b 100644
--- a/lib/libstand/Makefile
+++ b/lib/libstand/Makefile
@@ -22,10 +22,7 @@ CFLAGS+= -I${.CURDIR}
 
 .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
 CFLAGS+=	-mpreferred-stack-boundary=2
-CFLAGS+=	-mno-mmx -mno-3dnow -mno-sse -mno-sse2
-.endif
-.if ${MACHINE_CPUARCH} == "i386"
-CFLAGS+=	-mno-sse3
+CFLAGS+=	-mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3
 .endif
 .if ${MACHINE} == "pc98"
 CFLAGS+=	-Os
diff --git a/sys/boot/ficl/Makefile b/sys/boot/ficl/Makefile
index 61760d003280..9bb891bd09cf 100644
--- a/sys/boot/ficl/Makefile
+++ b/sys/boot/ficl/Makefile
@@ -9,10 +9,9 @@ CLEANFILES=	softcore.c testmain testmain.o
 CFLAGS+=	-ffreestanding
 .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
 CFLAGS+=	-mpreferred-stack-boundary=2
-CFLAGS+=	-mno-mmx -mno-3dnow -mno-sse -mno-sse2
+CFLAGS+=	-mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3
 .endif
 .if ${MACHINE_CPUARCH} == "i386"
-CFLAGS+=	-mno-sse3
 .endif
 .if ${MACHINE_CPUARCH} == "powerpc" || ${MACHINE_CPUARCH} == "arm"
 CFLAGS+=	-msoft-float
diff --git a/sys/boot/zfs/Makefile b/sys/boot/zfs/Makefile
index 91525d77c8d0..e5d489ccf056 100644
--- a/sys/boot/zfs/Makefile
+++ b/sys/boot/zfs/Makefile
@@ -13,10 +13,7 @@ CFLAGS+=	-I${.CURDIR}/../../cddl/boot/zfs
 CFLAGS+=	-ffreestanding
 .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
 CFLAGS+=	-mpreferred-stack-boundary=2
-CFLAGS+=	-mno-mmx -mno-3dnow -mno-sse -mno-sse2
-.endif
-.if ${MACHINE_CPUARCH} == "i386"
-CFLAGS+=	-mno-sse3
+CFLAGS+=	-mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3
 .endif
 .if ${MACHINE_CPUARCH} == "powerpc" || ${MACHINE_CPUARCH} == "arm"
 CFLAGS+=	-msoft-float