---

yaml
---
r: 6302
b: refs/heads/master
c: 59e2a0a
h: refs/heads/master
v: v3

Author: nikomatsakis

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4fc34e23faddf02c2ed85ee97ae929b36a9aaa1b
+refs/heads/master: 59e2a0a9c1434db65afc6c94752de3cf2ab761a0

trunk/src/rt/arch/x86_64/ccall.S

@@ -56,3 +56,19 @@ upcall_call_c_stack_float:
     pop %rbp
     ret
 
+#if defined(__APPLE__) || defined(_WIN32)
+.globl _upcall_call_c_stack_shim
+_upcall_call_c_stack_shim:
+#else
+.globl upcall_call_c_stack_shim
+upcall_call_c_stack_shim
+#endif
+    push %rbp
+    mov %rsp,%rbp          // save rsp
+    mov ARG1,%rsp          // switch stack
+    mov ARG0,%r11          // Remember target address
+    mov ARG1,ARG0          // setup the parameter shim expects
+    call *%r11
+    mov %rbp,%rsp
+    pop %rbp
+    ret