---

yaml
---
r: 6351
b: refs/heads/master
c: d624e52
h: refs/heads/master
i:
  6349: ca60e4c
  6347: d6a6121
  6343: 3bd1fae
  6335: 091bb5e
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e6c3c4e48c6187212b5bb21b5fdb521660b6b510
+refs/heads/master: d624e523c97b0dbcab0f9d1d933e40130dcfa44a

trunk/mk/rt.mk

@@ -67,8 +67,7 @@ RUNTIME_CS_$(1) := \
 
 RUNTIME_S_$(1) := rt/arch/$$(HOST_$(1))/_context.S \
                   rt/arch/$$(HOST_$(1))/ccall.S \
-                  rt/arch/$$(HOST_$(1))/morestack.S \
-                  rt/arch/$$(HOST_$(1))/record_sp.S
+                  rt/arch/$$(HOST_$(1))/morestack.S
 
 RUNTIME_HDR_$(1) := rt/globals.h \
                rt/rust.h \

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

@@ -106,13 +106,18 @@ L$bail:
 
 #ifdef __APPLE__
 
-	.section	__IMPORT,__pointers,non_lazy_symbol_pointers
+		.section	__IMPORT,__pointers,non_lazy_symbol_pointers
 rust_new_stack_sym:
     .indirect_symbol RUST_NEW_STACK
     .long 0
 rust_del_stack_sym:
     .indirect_symbol RUST_DEL_STACK
     .long 0
 
+#else
+
+rust_new_stack_sym:
+rust_del_stack_sym:
+
 #endif
 

trunk/src/rt/rust_scheduler.cpp

@@ -13,9 +13,6 @@ DWORD rust_scheduler::task_key;
 
 bool rust_scheduler::tls_initialized = false;
 
-// Defined in arch/*/record_sp.S.
-extern "C" void rust_record_sp(uintptr_t sp);
-
 rust_scheduler::rust_scheduler(rust_kernel *kernel,
                                rust_srv *srv,
                                int id) :
@@ -289,7 +286,6 @@ rust_scheduler::start_main_loop() {
              scheduled_task->state->name);
 
         place_task_in_tls(scheduled_task);
-        rust_record_sp(scheduled_task->stk->limit);
         //pthread_setspecific(89, (void *)scheduled_task->stk->limit);
 
         interrupt_flag = 0;