From af396dde5abe64008eb3c2a03ff73938beeb446a Mon Sep 17 00:00:00 2001
From: bouyer <bouyer@NetBSD.org>
Date: Thu, 17 Jul 2014 10:49:45 +0000
Subject: [PATCH] Sync DEFCOPTS and CFLAGS with i386 and amd64 counterparts.
 Especially -fno-omit-frame-pointer

---
 sys/arch/xen/conf/Makefile.xen | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/sys/arch/xen/conf/Makefile.xen b/sys/arch/xen/conf/Makefile.xen
index 22073c675f46..20049a0997b2 100644
--- a/sys/arch/xen/conf/Makefile.xen
+++ b/sys/arch/xen/conf/Makefile.xen
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.xen,v 1.35 2011/12/19 14:06:17 joerg Exp $
+#	$NetBSD: Makefile.xen,v 1.36 2014/07/17 10:49:45 bouyer Exp $
 #	NetBSD: Makefile.i386,v 1.132 2003/07/05 16:56:10 simonb Exp 
 
 # Makefile for NetBSD
@@ -38,17 +38,24 @@ ARCH_INC=	$S/arch/xen/include/${XEN_BUILD}
 ##
 ## (2) compile settings
 ##
-DEFCOPTS=	-O2
 CPPFLAGS+=	-D${XEN_BUILD}
 AFLAGS+=	-x assembler-with-cpp ${DBG} -D__XEN__
 EXTRA_INCLUDES=	-I${.CURDIR}/xen-ma
 
 .if ${XEN_BUILD} == "amd64"
+DEFCOPTS=	-O2 -fno-omit-frame-pointer
 CPPFLAGS+=	-Dx86_64
 CFLAGS+=	-mcmodel=kernel
-CFLAGS+=	-mno-red-zone
+CFLAGS+=	-mno-red-zone -mno-mmx -mno-sse -mno-avx
+CFLAGS+=	-msoft-float
+CFLAGS+=	-mno-fp-ret-in-387
 .endif
 
+.if ${XEN_BUILD} == "i386"
+DEFCOPTS=	-O2 -fno-omit-frame-pointer
+CFLAGS+=	-msoft-float
+CFLAGS+=	-mno-mmx -mno-sse -mno-avx
+.endif
 
 ##
 ## (3) libkern and compat