--- old/src/cpu/sparc/vm/interp_masm_sparc.hpp	2015-12-17 17:51:58.512008030 -0500
+++ new/src/cpu/sparc/vm/interp_masm_sparc.hpp	2015-12-17 17:51:58.024861609 -0500
@@ -54,7 +54,6 @@
 
 class InterpreterMacroAssembler: public MacroAssembler {
  protected:
-#ifndef CC_INTERP
   // Interpreter specific version of call_VM_base
     virtual void call_VM_leaf_base(
     Register java_thread,
@@ -76,7 +75,6 @@
 
   // base routine for all dispatches
   void dispatch_base(TosState state, address* table);
-#endif /* CC_INTERP */
 
  public:
   InterpreterMacroAssembler(CodeBuffer* c)
@@ -84,12 +82,10 @@
 
   void jump_to_entry(address entry);
 
-#ifndef CC_INTERP
   virtual void load_earlyret_value(TosState state);
 
   static const Address l_tmp ;
   static const Address d_tmp ;
-#endif /* CC_INTERP */
 
   // helper routine for frame allocation/deallocation
   // compute the delta by which the caller's SP has to
@@ -97,8 +93,6 @@
   // locals
   void compute_extra_locals_size_in_bytes(Register args_size, Register locals_size, Register delta);
 
-#ifndef CC_INTERP
-
   // dispatch routines
   void dispatch_prolog(TosState state, int step = 0);
   void dispatch_epilog(TosState state, int step = 0);
@@ -118,7 +112,6 @@
 
  protected:
   void dispatch_Lbyte_code(TosState state, address* table, int bcp_incr = 0, bool verify = true);
-#endif /* CC_INTERP */
 
  public:
   // Super call_VM calls - correspond to MacroAssembler::call_VM(_leaf) calls
@@ -130,7 +123,6 @@
                      Register arg_2,
                      bool check_exception = true);
 
-#ifndef CC_INTERP
   void super_call_VM_leaf(Register thread_cache, address entry_point, Register arg_1, Register arg_2);
 
   // Generate a subtype check: branch to ok_is_subtype if sub_klass is
@@ -265,19 +257,15 @@
   Address top_most_monitor();
   void compute_stack_base( Register Rdest );
 
-#endif /* CC_INTERP */
   void get_method_counters(Register method, Register Rcounters, Label& skip);
   void increment_invocation_counter( Register Rcounters, Register Rtmp, Register Rtmp2 );
   void increment_backedge_counter( Register Rcounters, Register Rtmp, Register Rtmp2 );
-#ifndef CC_INTERP
   void test_backedge_count_for_osr(Register backedge_count, Register method_counters, Register branch_bcp, Register Rtmp );
 
-#endif /* CC_INTERP */
   // Object locking
   void lock_object  (Register lock_reg, Register obj_reg);
   void unlock_object(Register lock_reg);
 
-#ifndef CC_INTERP
   // Interpreter profiling operations
   void set_method_data_pointer();
   void set_method_data_pointer_for_bcp();
@@ -341,7 +329,6 @@
   void verify_oop_or_return_address(Register reg, Register rtmp); // for astore
   void verify_FPU(int stack_depth, TosState state = ftos); // only if +VerifyFPU  && (state == ftos || state == dtos)
 
-#endif /* CC_INTERP */
   // support for JVMTI/Dtrace
   typedef enum { NotifyJVMTI, SkipNotifyJVMTI } NotifyMethodExitMode;
   void notify_method_entry();