--- a/src/hotspot/cpu/s390/globals_s390.hpp	Sat Nov 11 01:21:09 2017 +0100
+++ b/src/hotspot/cpu/s390/globals_s390.hpp	Thu Aug 31 10:00:28 2017 +0200
@@ -85,6 +85,8 @@
 // 8146801 (Short Array Allocation): No performance work done here yet.
 define_pd_global(intx, InitArrayShortSize, 1*BytesPerLong);
 
+define_pd_global(bool, ThreadLocalHandshakes, false);
+
 #define ARCH_FLAGS(develop, product, diagnostic, experimental, notproduct, range, constraint, writeable) \
                                                                               \
   /* Reoptimize code-sequences of calls at runtime, e.g. replace an */        \