# HG changeset patch # User mikael # Date 1494520939 25200 # Node ID 0388e4c03d6f6770d574906df03799bbae47bde2 # Parent a4a8613c08e949aef02e5cff0e0521f833abfddb 8180036: Guard include of fpu_control.h Reviewed-by: dholmes diff -r a4a8613c08e9 -r 0388e4c03d6f hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp --- a/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp Thu May 11 08:40:32 2017 -0700 +++ b/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp Thu May 11 09:42:19 2017 -0700 @@ -73,7 +73,9 @@ # include # include # include +#ifndef AMD64 # include +#endif #ifdef AMD64 #define REG_SP REG_RSP