summary refs log tree commit diff
path: root/src/rt
diff options
context:
space:
mode:
authorNiko Matsakis <niko@alum.mit.edu>2011-10-24 12:33:08 -0700
committerBrian Anderson <banderson@mozilla.com>2011-10-24 16:06:18 -0700
commit8f2d75d53c18c56e419a4e998699f2b525d68f07 (patch)
tree8cd0901c43185b8e5f4a54c9d7ba47858c2d44bd /src/rt
parentd69a83b0213952f2fdd48cddad493ad7a8dc0d6a (diff)
downloadrust-8f2d75d53c18c56e419a4e998699f2b525d68f07.tar.gz
rust-8f2d75d53c18c56e419a4e998699f2b525d68f07.zip
switch over sqrt from llvm to c-stack-cdecl, exposing a bug in
the supported return types of upcall_c_stack
Diffstat (limited to 'src/rt')
-rw-r--r--src/rt/arch/i386/ccall.S4
-rw-r--r--src/rt/rustrt.def.in1
2 files changed, 5 insertions, 0 deletions
diff --git a/src/rt/arch/i386/ccall.S b/src/rt/arch/i386/ccall.S
index 44d0c217736..378ea5e0b67 100644
--- a/src/rt/arch/i386/ccall.S
+++ b/src/rt/arch/i386/ccall.S
@@ -6,10 +6,14 @@
 // slower.
 #if defined(__APPLE__) || defined(_WIN32)
 .globl _upcall_call_c_stack
+.globl _upcall_call_c_stack_float
 _upcall_call_c_stack:
+_upcall_call_c_stack_float:
 #else
 .globl upcall_call_c_stack
+.globl upcall_call_c_stack_float
 upcall_call_c_stack:
+upcall_call_c_stack_float:
 #endif
     pushl %ebp
     movl %esp,%ebp          // save esp
diff --git a/src/rt/rustrt.def.in b/src/rt/rustrt.def.in
index 3430f77c892..6b70e283957 100644
--- a/src/rt/rustrt.def.in
+++ b/src/rt/rustrt.def.in
@@ -65,6 +65,7 @@ task_join
 unsupervise
 upcall_alloc_c_stack
 upcall_call_c_stack
+upcall_call_c_stack_float
 upcall_cmp_type
 upcall_dynastack_alloc
 upcall_dynastack_alloc_2