From 005cdc9fcffce179f18c1c44cc72240d810b489b Mon Sep 17 00:00:00 2001 From: Doug Goldstein Date: Tue, 26 Jan 2016 13:09:24 -0600 Subject: xen: don't inject -mfpmath=sse which causes build issues Don't inject -mfpmath=sse into the build which causes issues with the hypervisor build. Signed-off-by: Doug Goldstein Signed-off-by: Bruce Ashfield --- ...xen-x86-Fix-up-rules-when-forcing-mno-sse.patch | 28 ---------------------- recipes-extended/xen/xen.inc | 5 ++++ recipes-extended/xen/xen_4.6.0.bb | 1 - 3 files changed, 5 insertions(+), 29 deletions(-) delete mode 100644 recipes-extended/xen/files/xen-x86-Fix-up-rules-when-forcing-mno-sse.patch diff --git a/recipes-extended/xen/files/xen-x86-Fix-up-rules-when-forcing-mno-sse.patch b/recipes-extended/xen/files/xen-x86-Fix-up-rules-when-forcing-mno-sse.patch deleted file mode 100644 index 4c3e297f..00000000 --- a/recipes-extended/xen/files/xen-x86-Fix-up-rules-when-forcing-mno-sse.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: Nathan Rossi -Subject: [PATCH] xen/x86: Fix up rules when forcing -mno-sse - -* When forcing -mno-sse specify -mfpmath=387 to avoid the fallback - warning - -Signed-off-by: Nathan Rossi -Upstream-Status: Not-Submitted ---- - xen/arch/x86/Rules.mk | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk -index 6775cb5..03848f7 100644 ---- a/xen/arch/x86/Rules.mk -+++ b/xen/arch/x86/Rules.mk -@@ -42,7 +42,7 @@ x86 := y - x86_32 := n - x86_64 := y - --CFLAGS += -mno-red-zone -mno-sse -fpic -+CFLAGS += -mno-red-zone -mno-sse -fpic -mfpmath=387 - CFLAGS += -fno-asynchronous-unwind-tables - # -fvisibility=hidden reduces -fpic cost, if it's available - ifneq ($(call cc-option,$(CC),-fvisibility=hidden,n),n) --- -2.1.1 - diff --git a/recipes-extended/xen/xen.inc b/recipes-extended/xen/xen.inc index f937b05d..5555ed32 100644 --- a/recipes-extended/xen/xen.inc +++ b/recipes-extended/xen/xen.inc @@ -713,6 +713,11 @@ export CROSS_COMPILE="${TARGET_PREFIX}" # overide LDFLAGS to allow xen to build without: "x86_64-oe-linux-ld: unrecognized option '-Wl,-O1'" export LDFLAGS="" +# Yocto injects -mfpmath=sse for some machine types into the CFLAGS which +# conflicts with -mno-sse so instead we strip -mfpmath=sse instead of +# patching the build to be ok with this +TUNE_CCARGS := "${@oe_filter_out('-mfpmath=sse', '${TUNE_CCARGS}', d)}" + EXTRA_OECONF += " \ --exec-prefix=/usr \ --prefix=/usr \ diff --git a/recipes-extended/xen/xen_4.6.0.bb b/recipes-extended/xen/xen_4.6.0.bb index 0391dbd8..41241cd4 100644 --- a/recipes-extended/xen/xen_4.6.0.bb +++ b/recipes-extended/xen/xen_4.6.0.bb @@ -2,7 +2,6 @@ require xen.inc SRC_URI = " \ http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz \ - file://xen-x86-Fix-up-rules-when-forcing-mno-sse.patch \ " SRC_URI[md5sum] = "48e232f90927c08326a7b52bb06f49bc" -- cgit v1.2.3-54-g00ecf