Automerge master into ibm_sdk 2017-10-25-15:53:31

eclipse-openj9 · Oct 25, 2017 · 03788a5 · 03788a5
2 parents 78712ce + 221427f
commit 03788a5
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/runtime/codert_vm/xnathelp.m4 b/runtime/codert_vm/xnathelp.m4
@@ -145,7 +145,7 @@ define({OLD_DUAL_MODE_HELPER},{
 	SAVE_C_VOLATILE_REGS
 	FASTCALL_C_WITH_VMTHREAD(old_fast_$1,1)
 	test _rax,_rax
-	je SHORT_JMP LABEL(L_done_$1)
+	je LABEL(L_done_$1)
 	SAVE_C_NONVOLATILE_REGS
 	SAVE_C_NONVOLATILE_JIT_FP_ARG_REGS
 	FASTCALL_INDIRECT_WITH_VMTHREAD(_rax)
@@ -170,7 +170,7 @@ define({OLD_DUAL_MODE_HELPER_NO_RETURN_VALUE},{
 	SAVE_C_VOLATILE_REGS
 	FASTCALL_C_WITH_VMTHREAD(old_fast_$1,1)
 	test _rax,_rax
-	je SHORT_JMP LABEL(L_done_$1)
+	je LABEL(L_done_$1)
 	SAVE_C_NONVOLATILE_REGS
 	SAVE_C_NONVOLATILE_JIT_FP_ARG_REGS
 	FASTCALL_INDIRECT_WITH_VMTHREAD(_rax)