about summary refs log tree commit diff
path: root/src/libnative
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-08-06 19:26:19 +0000
committerbors <bors@rust-lang.org>2014-08-06 19:26:19 +0000
commit51e19e750185f60e404412f702f8f2edc7bc1245 (patch)
tree2758cc7e8a6f208de1b72b6ea93e358e98ac1f1d /src/libnative
parentdd20f0961149022505359c27e308d04b06b672a7 (diff)
parentffa258846ad7669a67850da9b1d5fa534e87f04f (diff)
downloadrust-51e19e750185f60e404412f702f8f2edc7bc1245.tar.gz
rust-51e19e750185f60e404412f702f8f2edc7bc1245.zip
auto merge of #16308 : alexcrichton/rust/rollup, r=alexcrichton
Diffstat (limited to 'src/libnative')
-rw-r--r--src/libnative/lib.rs2
-rw-r--r--src/libnative/task.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libnative/lib.rs b/src/libnative/lib.rs
index d358aa6b645..c7b89b6cb91 100644
--- a/src/libnative/lib.rs
+++ b/src/libnative/lib.rs
@@ -137,7 +137,7 @@ pub fn start(argc: int, argv: *const *const u8, main: proc()) -> int {
     task.name = Some(str::Slice("<main>"));
     drop(task.run(|| {
         unsafe {
-            rt::stack::record_stack_bounds(my_stack_bottom, my_stack_top);
+            rt::stack::record_os_managed_stack_bounds(my_stack_bottom, my_stack_top);
         }
         exit_code = Some(run(main.take_unwrap()));
     }).destroy());
diff --git a/src/libnative/task.rs b/src/libnative/task.rs
index c72d6c24a7c..55806caaf13 100644
--- a/src/libnative/task.rs
+++ b/src/libnative/task.rs
@@ -84,7 +84,7 @@ pub fn spawn_opts(opts: TaskOpts, f: proc():Send) {
         let addr = &something_around_the_top_of_the_stack as *const int;
         let my_stack = addr as uint;
         unsafe {
-            stack::record_stack_bounds(my_stack - stack + 1024, my_stack);
+            stack::record_os_managed_stack_bounds(my_stack - stack + 1024, my_stack);
         }
         let mut ops = ops;
         ops.stack_bounds = (my_stack - stack + 1024, my_stack);