--- a/hotspot/src/share/vm/utilities/macros.hpp	Tue Oct 25 16:42:28 2016 +0200
+++ b/hotspot/src/share/vm/utilities/macros.hpp	Thu Sep 22 18:23:15 2016 +0200
@@ -386,6 +386,14 @@
 #define NOT_AMD64(code) code
 #endif
 
+#ifdef S390
+#define S390_ONLY(code) code
+#define NOT_S390(code)
+#else
+#define S390_ONLY(code)
+#define NOT_S390(code) code
+#endif
+
 #ifdef SPARC
 #define SPARC_ONLY(code) code
 #define NOT_SPARC(code)