--- old/src/cpu/sparc/vm/interp_masm_sparc.cpp	2015-12-17 17:51:59.018863792 -0500
+++ new/src/cpu/sparc/vm/interp_masm_sparc.cpp	2015-12-17 17:51:58.486162784 -0500
@@ -39,7 +39,6 @@
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/thread.inline.hpp"
 
-#ifndef CC_INTERP
 #ifndef FAST_DISPATCH
 #define FAST_DISPATCH 1
 #endif
@@ -52,13 +51,6 @@
 const Address InterpreterMacroAssembler::l_tmp(FP, (frame::interpreter_frame_l_scratch_fp_offset * wordSize) + STACK_BIAS);
 const Address InterpreterMacroAssembler::d_tmp(FP, (frame::interpreter_frame_d_scratch_fp_offset * wordSize) + STACK_BIAS);
 
-#else // CC_INTERP
-#ifndef STATE
-#define STATE(field_name) Lstate, in_bytes(byte_offset_of(BytecodeInterpreter, field_name))
-#endif // STATE
-
-#endif // CC_INTERP
-
 void InterpreterMacroAssembler::jump_to_entry(address entry) {
   assert(entry, "Entry must have been generated by now");
   AddressLiteral al(entry);
@@ -82,8 +74,6 @@
   sll(delta, LogBytesPerWord, delta);  // extra space for locals in bytes
 }
 
-#ifndef CC_INTERP
-
 // Dispatch code executed in the prolog of a bytecode which does not do it's
 // own dispatch. The dispatch address is computed and placed in IdispatchAddress
 void InterpreterMacroAssembler::dispatch_prolog(TosState state, int bcp_incr) {
@@ -265,10 +255,6 @@
   mov(arg_2, O1);
   MacroAssembler::call_VM_leaf_base(thread_cache, entry_point, 2);
 }
-#endif /* CC_INTERP */
-
-
-#ifndef CC_INTERP
 
 void InterpreterMacroAssembler::dispatch_base(TosState state, address* table) {
   assert_not_delayed();
@@ -1189,8 +1175,6 @@
 #endif /* COMPILER2 */
 
 }
-#endif /* CC_INTERP */
-
 
 // Lock object
 //
@@ -1323,8 +1307,6 @@
   }
 }
 
-#ifndef CC_INTERP
-
 // Get the method data pointer from the Method* and set the
 // specified register to its value.
 
@@ -2366,8 +2348,6 @@
   add( Lesp,      wordSize,                                    Rdest );
 }
 
-#endif /* CC_INTERP */
-
 void InterpreterMacroAssembler::get_method_counters(Register method,
                                                     Register Rcounters,
                                                     Label& skip) {
@@ -2443,7 +2423,6 @@
   // Note that this macro must leave backedge_count + invocation_count in Rtmp!
 }
 
-#ifndef CC_INTERP
 void InterpreterMacroAssembler::test_backedge_count_for_osr( Register backedge_count,
                                                              Register method_counters,
                                                              Register branch_bcp,
@@ -2581,7 +2560,6 @@
   br(cond, false, Assembler::pn, *where);
   delayed()->st(scratch1, counter_addr);
 }
-#endif /* CC_INTERP */
 
 // Inline assembly for:
 //
@@ -2597,8 +2575,6 @@
 
 void InterpreterMacroAssembler::notify_method_entry() {
 
-  // C++ interpreter only uses this for native methods.
-
   // Whenever JVMTI puts a thread in interp_only_mode, method
   // entry/exit events are sent for that thread to track stack
   // depth.  If it is possible to enter interp_only_mode we add
@@ -2647,7 +2623,6 @@
 void InterpreterMacroAssembler::notify_method_exit(bool is_native_method,
                                                    TosState state,
                                                    NotifyMethodExitMode mode) {
-  // C++ interpreter only uses this for native methods.
 
   // Whenever JVMTI puts a thread in interp_only_mode, method
   // entry/exit events are sent for that thread to track stack
@@ -2687,15 +2662,6 @@
 }
 
 void InterpreterMacroAssembler::save_return_value(TosState state, bool is_native_call) {
-#ifdef CC_INTERP
-  // result potentially in O0/O1: save it across calls
-  stf(FloatRegisterImpl::D, F0, STATE(_native_fresult));
-#ifdef _LP64
-  stx(O0, STATE(_native_lresult));
-#else
-  std(O0, STATE(_native_lresult));
-#endif
-#else // CC_INTERP
   if (is_native_call) {
     stf(FloatRegisterImpl::D, F0, d_tmp);
 #ifdef _LP64
@@ -2706,18 +2672,9 @@
   } else {
     push(state);
   }
-#endif // CC_INTERP
 }
 
 void InterpreterMacroAssembler::restore_return_value( TosState state, bool is_native_call) {
-#ifdef CC_INTERP
-  ldf(FloatRegisterImpl::D, STATE(_native_fresult), F0);
-#ifdef _LP64
-  ldx(STATE(_native_lresult), O0);
-#else
-  ldd(STATE(_native_lresult), O0);
-#endif
-#else // CC_INTERP
   if (is_native_call) {
     ldf(FloatRegisterImpl::D, d_tmp, F0);
 #ifdef _LP64
@@ -2728,5 +2685,4 @@
   } else {
     pop(state);
   }
-#endif // CC_INTERP
 }