--- a/src/hotspot/cpu/x86/globals_x86.hpp	Sat Nov 11 01:21:09 2017 +0100
+++ b/src/hotspot/cpu/x86/globals_x86.hpp	Thu Aug 31 10:00:28 2017 +0200
@@ -97,6 +97,12 @@
 
 define_pd_global(intx, InitArrayShortSize, 8*BytesPerLong);
 
+#ifdef _LP64
+define_pd_global(bool, ThreadLocalHandshakes, true);
+#else
+define_pd_global(bool, ThreadLocalHandshakes, false);
+#endif
+
 #define ARCH_FLAGS(develop, \
                    product, \
                    diagnostic, \