about summary refs log tree commit diff
path: root/src/libnative
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2014-08-06 11:25:14 -0700
committerAlex Crichton <alex@alexcrichton.com>2014-08-06 11:25:14 -0700
commit720746a139278adaaac40ed264afeac70d2e9c95 (patch)
treea23d7f639a1c8297592fc6530df2187a9d0a32f3 /src/libnative
parente5df5f56069de2778857597118a6e5f95d659736 (diff)
parent881bfb1a180a1b545daa9da1539ec4c8ebda7ed1 (diff)
downloadrust-720746a139278adaaac40ed264afeac70d2e9c95.tar.gz
rust-720746a139278adaaac40ed264afeac70d2e9c95.zip
Merge commit '881bfb1a180a1b545daa9da1539ec4c8ebda7ed1' into rollup
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);