From eaa863d46a216e6233f786ddcc71cf2b2c2e00c3 Mon Sep 17 00:00:00 2001
From: emaste <emaste@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Mon, 11 Jan 2016 04:25:03 +0000
Subject: [PATCH] Move -msoft-float compiler flag into x86/i386 cases to fix
 ia64

Direct commit to stable/10 as ia64 support does not exist in HEAD.


git-svn-id: svn://svn.freebsd.org/base/stable/10@293654 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 sys/boot/efi/Makefile.inc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sys/boot/efi/Makefile.inc b/sys/boot/efi/Makefile.inc
index d9474dce5..2b5f1eeb0 100644
--- a/sys/boot/efi/Makefile.inc
+++ b/sys/boot/efi/Makefile.inc
@@ -4,17 +4,19 @@ BINDIR?=	/boot
 
 .if ${MACHINE_CPUARCH} == "i386"
 CFLAGS+=        -march=i386
+CFLAGS+=	-msoft-float
 .endif
 
 # Options used when building app-specific efi components
 # See conf/kern.mk for the correct set of these
-CFLAGS+=	-ffreestanding -Wformat -msoft-float
+CFLAGS+=	-ffreestanding -Wformat
 LDFLAGS+=	-nostdlib
 
 .if ${MACHINE_CPUARCH} == "amd64"
 CFLAGS+=	-fshort-wchar
 CFLAGS+=	-mno-red-zone
 CFLAGS+=	-mno-mmx -mno-sse -mno-aes -mno-avx
+CFLAGS+=	-msoft-float
 .endif
 
 
-- 
2.45.0