--- old/src/hotspot/cpu/x86/x86_64.ad	2020-05-06 16:01:18.458000628 +0200
+++ new/src/hotspot/cpu/x86/x86_64.ad	2020-05-06 16:01:18.018001149 +0200
@@ -454,7 +454,7 @@
 }
 
 int MachCallRuntimeNode::ret_addr_offset() {
-  int offset = 13; // movq r10,#addr; callq (r10)
+  int offset = 5; // callq (#addr) [rip-relative]
   offset += clear_avx_size();
   return offset;
 }
@@ -2084,8 +2084,7 @@
   enc_class Java_To_Runtime(method meth) %{
     // No relocation needed
     MacroAssembler _masm(&cbuf);
-    __ mov64(r10, (int64_t) $meth$$method);
-    __ call(r10);
+    __ call(AddressLiteral((address)$meth$$method, relocInfo::runtime_call_type));
   %}
 
   enc_class Java_To_Interpreter(method meth)