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 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'sys/boot/efi')

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
-- 
cgit v1.1