diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-31 11:59:31 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-31 11:59:31 -0700 |
commit | 54cad6270a30edc75276c653ccb81dc313f0fcde (patch) | |
tree | caaf3cee212da8cc8982816eff6ae0b5f5b4318e /arch/x86 | |
parent | 6ed7705167dd056c61b1954fe1366fcddb5bda98 (diff) | |
parent | b399fe355b30d0102e7690c99e6f764ddfd32ec3 (diff) | |
download | linux-54cad6270a30edc75276c653ccb81dc313f0fcde.tar.bz2 |
Merge branch 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 build change from Ingo Molnar:
"Explicitly disable x87 FPU instructions, to catch mistaken floating
point use at build time, instead of crashing or misbehaving during run
time"
* 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86: Disable generation of traditional x87 instructions
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/Makefile b/arch/x86/Makefile index eeda43abed6e..a414b1471ffc 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -82,8 +82,8 @@ else KBUILD_AFLAGS += -m64 KBUILD_CFLAGS += -m64 - # Don't autogenerate MMX or SSE instructions - KBUILD_CFLAGS += -mno-mmx -mno-sse + # Don't autogenerate traditional x87, MMX or SSE instructions + KBUILD_CFLAGS += -mno-mmx -mno-sse -mno-80387 -mno-fp-ret-in-387 # Use -mpreferred-stack-boundary=3 if supported. KBUILD_CFLAGS += $(call cc-option,-mpreferred-stack-boundary=3) |