--- a/hotspot/src/share/vm/interpreter/abstractInterpreter.hpp	Tue Oct 25 16:42:28 2016 +0200
+++ b/hotspot/src/share/vm/interpreter/abstractInterpreter.hpp	Thu Sep 22 18:23:15 2016 +0200
@@ -221,7 +221,7 @@
   }
 
   static int expr_offset_in_bytes(int i) {
-#if !defined(ZERO) && (defined(PPC) || defined(SPARC))
+#if !defined(ZERO) && (defined(PPC) || defined(S390) || defined(SPARC))
     return stackElementSize * i + wordSize;  // both point to one word past TOS
 #else
     return stackElementSize * i;