--- old/src/cpu/ppc/vm/c1_LIRAssembler_ppc.hpp	2016-11-03 14:15:56.000000000 -0700
+++ new/src/cpu/ppc/vm/c1_LIRAssembler_ppc.hpp	2016-11-03 14:15:56.000000000 -0700
@@ -60,10 +60,21 @@
   bool emit_trampoline_stub_for_call(address target, Register Rtoc = noreg);
 
 enum {
-  max_static_call_stub_size = 4 * BytesPerInstWord + MacroAssembler::b64_patchable_size,
-  call_stub_size = max_static_call_stub_size + MacroAssembler::trampoline_stub_size, // or smaller
-  exception_handler_size = MacroAssembler::b64_patchable_size, // or smaller
-  deopt_handler_size = MacroAssembler::bl64_patchable_size
+  _static_call_stub_size = 4 * BytesPerInstWord + MacroAssembler::b64_patchable_size, // or smaller
+  _call_stub_size = _static_call_stub_size + MacroAssembler::trampoline_stub_size, // or smaller
+  _call_aot_stub_size = 0,
+  _exception_handler_size = MacroAssembler::b64_patchable_size, // or smaller
+  _deopt_handler_size = MacroAssembler::bl64_patchable_size
 };
 
+  // '_static_call_stub_size' is only used on ppc (see LIR_Assembler::emit_static_call_stub()
+  // in c1_LIRAssembler_ppc.cpp. The other, shared getters are defined in c1_LIRAssembler.hpp
+  static int static_call_stub_size() {
+    if (UseAOT) {
+      return _static_call_stub_size + _call_aot_stub_size;
+    } else {
+      return _static_call_stub_size;
+    }
+  }
+
 #endif // CPU_PPC_VM_C1_LIRASSEMBLER_PPC_HPP