--- old/src/share/vm/c1/c1_LIRAssembler.hpp	2015-08-12 14:09:16.000000000 +0200
+++ new/src/share/vm/c1/c1_LIRAssembler.hpp	2015-08-12 14:09:16.000000000 +0200
@@ -161,12 +161,12 @@
   // particular sparc uses this for delay slot filling.
   void peephole(LIR_List* list);
 
-  void emit_string_compare(LIR_Opr left, LIR_Opr right, LIR_Opr dst, CodeEmitInfo* info);
+  void emit_string_compare(LIR_Opr left, LIR_Opr right, LIR_Opr dst, C1ThreadLocalSafepoint *tls_stub, CodeEmitInfo* info);
 
-  void return_op(LIR_Opr result);
+  void return_op(LIR_Opr result, C1ThreadLocalSafepoint *code_stub);
 
   // returns offset of poll instruction
-  int safepoint_poll(LIR_Opr result, CodeEmitInfo* info);
+  int safepoint_poll(LIR_Opr result, C1ThreadLocalSafepoint *tls_stub, CodeEmitInfo* info);
 
   void const2reg  (LIR_Opr src, LIR_Opr dest, LIR_PatchCode patch_code, CodeEmitInfo* info);
   void const2stack(LIR_Opr src, LIR_Opr dest);