--- a/hotspot/src/cpu/aarch64/vm/interp_masm_aarch64.cpp	Tue Dec 22 11:03:37 2015 +0100
+++ b/hotspot/src/cpu/aarch64/vm/interp_masm_aarch64.cpp	Tue Dec 22 11:11:29 2015 -0500
@@ -47,8 +47,6 @@
   b(entry);
 }
 
-#ifndef CC_INTERP
-
 void InterpreterMacroAssembler::check_and_handle_popframe(Register java_thread) {
   if (JvmtiExport::can_pop_frame()) {
     Label L;
@@ -595,8 +593,6 @@
   andr(sp, esp, -16);
 }
 
-#endif // C_INTERP
-
 // Lock object
 //
 // Args:
@@ -758,8 +754,6 @@
   }
 }
 
-#ifndef CC_INTERP
-
 void InterpreterMacroAssembler::test_method_data_pointer(Register mdp,
                                                          Label& zero_continue) {
   assert(ProfileInterpreter, "must be profiling interpreter");
@@ -1345,7 +1339,6 @@
 }
 
 void InterpreterMacroAssembler::verify_FPU(int stack_depth, TosState state) { ; }
-#endif // !CC_INTERP
 
 
 void InterpreterMacroAssembler::notify_method_entry() {
@@ -1392,24 +1385,23 @@
     // is changed then the interpreter_frame_result implementation will
     // need to be updated too.
 
-    // For c++ interpreter the result is always stored at a known location in the frame
-    // template interpreter will leave it on the top of the stack.
-    NOT_CC_INTERP(push(state);)
+    // template interpreter will leave the result on the top of the stack.
+    push(state);
     ldrw(r3, Address(rthread, JavaThread::interp_only_mode_offset()));
     cbz(r3, L);
     call_VM(noreg,
             CAST_FROM_FN_PTR(address, InterpreterRuntime::post_method_exit));
     bind(L);
-    NOT_CC_INTERP(pop(state));
+    pop(state);
   }
 
   {
     SkipIfEqual skip(this, &DTraceMethodProbes, false);
-    NOT_CC_INTERP(push(state));
+    push(state);
     get_method(c_rarg1);
     call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::dtrace_method_exit),
                  rthread, c_rarg1);
-    NOT_CC_INTERP(pop(state));
+    pop(state);
   }
 }