nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-01 06:51:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "rt: Make stack growth code build on Linux"

Browse Source 
This reverts commit da4b7da4e1.
This commit is contained in:
Brian Anderson 2011-11-16 18:49:07 -08:00
parent 55f89dbed9
commit 5559e149e4
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mk/rt.mk
View File

@ -67,7 +67,8 @@ 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))/morestack.S \
rt/arch/$$(HOST_$(1))/record_sp.S
RUNTIME_HDR_$(1) := rt/globals.h \
rt/rust.h \

7
src/rt/arch/i386/morestack.S
View File

@ -106,7 +106,7 @@ 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
@ -114,10 +114,5 @@ rust_del_stack_sym:
.indirect_symbol RUST_DEL_STACK
.long 0
#else
rust_new_stack_sym:
rust_del_stack_sym:
#endif

4
src/rt/rust_scheduler.cpp
View File

@ -13,6 +13,9 @@ 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) :
@ -286,6 +289,7 @@ 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;