diff -r 28238583a459 -r 1f304d0c888b hotspot/src/cpu/s390/vm/c1_LIRAssembler_s390.hpp
--- a/hotspot/src/cpu/s390/vm/c1_LIRAssembler_s390.hpp	Sun Dec 11 12:05:57 2016 -0800
+++ b/hotspot/src/cpu/s390/vm/c1_LIRAssembler_s390.hpp	Sun Dec 11 19:07:04 2016 -0800
@@ -46,9 +46,10 @@
   }
 
   enum {
-    call_stub_size = 512, // See Compile::MAX_stubs_size and CompiledStaticCall::emit_to_interp_stub.
-    exception_handler_size = DEBUG_ONLY(1*K) NOT_DEBUG(128),
-    deopt_handler_size = DEBUG_ONLY(1*K) NOT_DEBUG(64)
+    _call_stub_size = 512, // See Compile::MAX_stubs_size and CompiledStaticCall::emit_to_interp_stub.
+    _call_aot_stub_size = 0,
+    _exception_handler_size = DEBUG_ONLY(1*K) NOT_DEBUG(128),
+    _deopt_handler_size = DEBUG_ONLY(1*K) NOT_DEBUG(64)
   };
 
 #endif // CPU_S390_VM_C1_LIRASSEMBLER_S390_HPP