From 8131f8e4f64ff09f74346b0ba6654eb7ff617d6b Mon Sep 17 00:00:00 2001
From: avg <avg@FreeBSD.org>
Date: Sat, 20 Oct 2012 16:57:23 +0000
Subject: boot: use -march=i386 for both i386 and amd64 builds

.. so that consistent compilation algorithms are used for both
architectures as in practice the binaries are expected to be
interchangeable (for time being).
Previously i386 used default setting which were equivalent to
-march=i486 -mtune=generic.
The only difference is using smaller but slower "leave" instructions.

Discussed with:	jhb, dim
MFC after:	29 days
---
 sys/boot/efi/Makefile.inc       | 6 +++++-
 sys/boot/ficl/Makefile          | 3 ++-
 sys/boot/i386/Makefile.inc      | 4 ++--
 sys/boot/userboot/ficl/Makefile | 3 ++-
 sys/boot/zfs/Makefile           | 3 ++-
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/sys/boot/efi/Makefile.inc b/sys/boot/efi/Makefile.inc
index 7e75a6c..7446d31 100644
--- a/sys/boot/efi/Makefile.inc
+++ b/sys/boot/efi/Makefile.inc
@@ -2,8 +2,12 @@
 
 BINDIR?=	/boot
 
+.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
+CFLAGS+=        -march=i386
+.endif
+
 .if ${MACHINE_CPUARCH} == "amd64"
-CFLAGS+=        -m32 -march=i386
+CFLAGS+=        -m32
 ACFLAGS+=       -m32
 LDFLAGS+=       -m elf_i386_fbsd
 AFLAGS+=        --32
diff --git a/sys/boot/ficl/Makefile b/sys/boot/ficl/Makefile
index 1f8de9b..971faa7 100644
--- a/sys/boot/ficl/Makefile
+++ b/sys/boot/ficl/Makefile
@@ -8,6 +8,7 @@ SRCS=		${BASE_SRCS} sysdep.c softcore.c
 CLEANFILES=	softcore.c testmain testmain.o
 CFLAGS+=	-ffreestanding
 .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
+CFLAGS+=	-march=i386
 CFLAGS+=	-mpreferred-stack-boundary=2
 CFLAGS+=	-mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 -msoft-float
 .endif
@@ -39,7 +40,7 @@ SOFTWORDS=	softcore.fr jhlocal.fr marker.fr freebsd.fr ficllocal.fr \
 #SOFTWORDS+=	oo.fr classes.fr
 
 .if ${MACHINE_CPUARCH} == "amd64"
-CFLAGS+=	-m32 -march=i386 -I.
+CFLAGS+=	-m32 -I.
 .endif
 
 .if ${MACHINE_ARCH} == "powerpc64"
diff --git a/sys/boot/i386/Makefile.inc b/sys/boot/i386/Makefile.inc
index 0cad7d2..f5faec7 100644
--- a/sys/boot/i386/Makefile.inc
+++ b/sys/boot/i386/Makefile.inc
@@ -5,12 +5,12 @@
 BINDIR?=	/boot
 
 LOADER_ADDRESS?=0x200000
-CFLAGS+=	-ffreestanding -mpreferred-stack-boundary=2 \
+CFLAGS+=	-march=i386 -ffreestanding -mpreferred-stack-boundary=2 \
 		-mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 -msoft-float
 LDFLAGS+=	-nostdlib
 
 .if ${MACHINE_CPUARCH} == "amd64"
-CFLAGS+=	-m32 -march=i386
+CFLAGS+=	-m32
 ACFLAGS+=	-m32
 LDFLAGS+=	-m elf_i386_fbsd
 AFLAGS+=	--32
diff --git a/sys/boot/userboot/ficl/Makefile b/sys/boot/userboot/ficl/Makefile
index af5d1461..42b9309 100644
--- a/sys/boot/userboot/ficl/Makefile
+++ b/sys/boot/userboot/ficl/Makefile
@@ -12,6 +12,7 @@ SRCS=		${BASE_SRCS} sysdep.c softcore.c
 CLEANFILES=	softcore.c testmain testmain.o
 CFLAGS+=	-ffreestanding -fPIC
 .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
+#CFLAGS+=	-march=i386
 CFLAGS+=	-mno-mmx -mno-3dnow -mno-sse -mno-sse2
 .endif
 .if ${MACHINE_CPUARCH} == "i386"
@@ -46,7 +47,7 @@ SOFTWORDS=	softcore.fr jhlocal.fr marker.fr freebsd.fr ficllocal.fr \
 #SOFTWORDS+=	oo.fr classes.fr
 
 #.if ${MACHINE_CPUARCH} == "amd64"
-#CFLAGS+=	-m32 -march=i386 -I.
+#CFLAGS+=	-m32 -I.
 #.endif
 
 .if ${MACHINE_ARCH} == "powerpc64"
diff --git a/sys/boot/zfs/Makefile b/sys/boot/zfs/Makefile
index ff423a0..9b900e4 100644
--- a/sys/boot/zfs/Makefile
+++ b/sys/boot/zfs/Makefile
@@ -12,6 +12,7 @@ CFLAGS+=	-I${.CURDIR}/../../cddl/boot/zfs
 
 CFLAGS+=	-ffreestanding
 .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
+CFLAGS+=	-march=i386
 CFLAGS+=	-mpreferred-stack-boundary=2
 CFLAGS+=	-mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 -msoft-float
 .endif
@@ -19,7 +20,7 @@ CFLAGS+=	-mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 -msoft-float
 CFLAGS+=	-msoft-float
 .endif
 .if ${MACHINE_CPUARCH} == "amd64"
-CFLAGS+=	-m32 -march=i386
+CFLAGS+=	-m32
 .endif
 
 CFLAGS+=	-Wformat -Wall
-- 
cgit v1.1