about summary refs log tree commit diff
path: root/src/rt
diff options
context:
space:
mode:
authorNiko Matsakis <niko@alum.mit.edu>2013-06-15 16:18:39 -0400
committerNiko Matsakis <niko@alum.mit.edu>2013-06-16 12:46:51 -0400
commit461a79a24702f262fa9116ed769315b25f064cbf (patch)
tree6a3dbdc1d45b6a0d9481c41bf273a2cb7d4014d0 /src/rt
parent0d7f8f76852e8ea3bf08f43ec581bfd5f87a9d03 (diff)
downloadrust-461a79a24702f262fa9116ed769315b25f064cbf.tar.gz
rust-461a79a24702f262fa9116ed769315b25f064cbf.zip
Partial fix for #7158: Save EDX in morestack on x86-32
Diffstat (limited to 'src/rt')
-rw-r--r--src/rt/arch/i386/morestack.S2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/rt/arch/i386/morestack.S b/src/rt/arch/i386/morestack.S
index 1b276820805..a95e183a1d1 100644
--- a/src/rt/arch/i386/morestack.S
+++ b/src/rt/arch/i386/morestack.S
@@ -207,12 +207,14 @@ MORESTACK:
 	subl $12, %esp
 
 	// Save the return value of the function we allocated space for
+	movl %edx, 4(%esp)
 	movl %eax, (%esp)
 
 	call UPCALL_DEL_STACK
 
 	// And restore it
 	movl (%esp), %eax
+	movl 4(%esp), %edx
 
 	addl $12,%esp