---

yaml
---
r: 6484
b: refs/heads/master
c: ef20afc
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4dcb0ee0ce0c48fa2328c9c88dbbe19614cdc545
+refs/heads/master: ef20afc36ca7083c910fa05ea28576fe4b465783

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

@@ -48,6 +48,7 @@
 	.type MORESTACK,@function
 #endif
 
+#if defined(__linux)
 MORESTACK:
 	.cfi_startproc
 
@@ -71,19 +72,23 @@ MORESTACK:
 	addq $16, %rcx   // Add the saved %rbp, and return address
 	addq %r11, %rcx // Add the size of stack arguments
 
-	pushq %r10 // The amount of stack needed
-	pushq %rcx // Address of stack arguments
-	pushq %r11 // Size of stack arguments
 	pushq %rbp // Save the Rust stack pointer
+	pushq %r11 // Size of stack arguments
+	pushq %rcx // Address of stack arguments
+	pushq %r10 // The amount of stack needed
 
 	// FIXME: Don't understand why I have to use the PLT here
 	lea RUST_NEW_STACK2@PLT(%rip), %rsi
-	lea 24(%rsp), %rdi
+	mov %rsp, %rdi
 	call UPCALL_CALL_C@PLT
 
         mov (%rsp),%rdx        // Grab the return pointer.
         inc %rdx               // Skip past the `ret`.
         mov %rax,%rsp          // Switch to the new stack.
         call *%rdx             // Enter the new function.
 
-	.cfi_endproc
+	.cfi_endproc
+#else
+MORESTACK:
+	ret
+#endif