From bedcaad97eaeb5ae09c2782a76d92749ac5585c4 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Mon, 19 Dec 2011 15:17:49 -0800
Subject: rt: Give upcall_del_stack the same convention as other upcalls

---
 src/rt/rust_upcall.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/rt/rust_upcall.cpp')

diff --git a/src/rt/rust_upcall.cpp b/src/rt/rust_upcall.cpp
index 5febc5098a2..981ce0ffb7e 100644
--- a/src/rt/rust_upcall.cpp
+++ b/src/rt/rust_upcall.cpp
@@ -614,13 +614,17 @@ upcall_new_stack(struct rust_new_stack2_args *args) {
                                       args->args_sz);
 }
 
-// FIXME: As above
 extern "C" CDECL void
-upcall_del_stack() {
+upcall_s_del_stack() {
     rust_task *task = rust_scheduler::get_task();
     task->del_stack();
 }
 
+extern "C" CDECL void
+upcall_del_stack() {
+    UPCALL_SWITCH_STACK(NULL, upcall_s_del_stack);
+}
+
 // Landing pads need to call this to insert the
 // correct limit into TLS.
 // NB: This must run on the Rust stack because it
-- 
cgit 1.4.1-3-g733a5