---

yaml
---
r: 178653
b: refs/heads/snap-stage3
c: 568a451
h: refs/heads/master
i:
  178651: 6cc3e8b
v: v3

Author: semarie

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 3d072a193bfcb76206aab576049e696d6d8db25d
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 3096784a3b1dd7d20bc67f19d4ccd61ae497a7de
+refs/heads/snap-stage3: 568a451a90a14b101ed357235a5055de2940f16b
 refs/heads/try: ccf8fedf1cffcb8f6f3581d53d220039e192fe77
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d

branches/snap-stage3/src/libstd/sys/common/stack.rs

@@ -227,24 +227,14 @@ pub unsafe fn record_sp_limit(limit: uint) {
     }
 
     // aarch64 - FIXME(AARCH64): missing...
-    #[cfg(target_arch = "aarch64")]
-    unsafe fn target_record_sp_limit(_: uint) {
-    }
-
     // powerpc - FIXME(POWERPC): missing...
-    #[cfg(target_arch = "powerpc")]
-    unsafe fn target_record_sp_limit(_: uint) {
-    }
-
-
-    // iOS segmented stack is disabled for now, see related notes
-    #[cfg(all(target_arch = "arm", target_os = "ios"))] #[inline(always)]
-    unsafe fn target_record_sp_limit(_: uint) {
-    }
-
-    #[cfg(target_os = "openbsd")] #[inline(always)]
+    // arm-ios - iOS segmented stack is disabled for now, see related notes
+    // openbsd - segmented stack is disabled
+    #[cfg(any(target_arch = "aarch64",
+              target_arch = "powerpc",
+              all(target_arch = "arm", target_os = "ios"),
+              target_os = "openbsd"))]
     unsafe fn target_record_sp_limit(_: uint) {
-        // segmented stack is disabled
     }
 }
 
@@ -332,28 +322,18 @@ pub unsafe fn get_sp_limit() -> uint {
     }
 
     // aarch64 - FIXME(AARCH64): missing...
-    #[cfg(target_arch = "aarch64")]
-    unsafe fn target_get_sp_limit() -> uint {
-        1024
-    }
-
-    // powepc - FIXME(POWERPC): missing...
-    #[cfg(target_arch = "powerpc")]
-    unsafe fn target_get_sp_limit() -> uint {
-        1024
-    }
-
-    // iOS doesn't support segmented stacks yet. This function might
-    // be called by runtime though so it is unsafe to mark it as
-    // unreachable, let's return a fixed constant.
-    #[cfg(all(target_arch = "arm", target_os = "ios"))] #[inline(always)]
-    unsafe fn target_get_sp_limit() -> uint {
-        1024
-    }
-
-    #[cfg(target_os = "openbsd")] #[inline(always)]
+    // powerpc - FIXME(POWERPC): missing...
+    // arm-ios - iOS doesn't support segmented stacks yet.
+    // openbsd - OpenBSD doesn't support segmented stacks.
+    //
+    // This function might be called by runtime though
+    // so it is unsafe to unreachable, let's return a fixed constant.
+    #[cfg(any(target_arch = "aarch64",
+              target_arch = "powerpc",
+              all(target_arch = "arm", target_os = "ios"),
+              target_os = "openbsd"))]
+    #[inline(always)]
     unsafe fn target_get_sp_limit() -> uint {
-        // segmented stack is disabled
         1024
     }
 }

branches/snap-stage3/src/libstd/sys/unix/os.rs

@@ -217,11 +217,18 @@ pub fn load_self() -> Option<Vec<u8>> {
 
 #[cfg(target_os = "openbsd")]
 pub fn load_self() -> Option<Vec<u8>> {
+    use sync::{StaticMutex, MUTEX_INIT};
+
+    static LOCK: StaticMutex = MUTEX_INIT;
+
     extern {
-        fn __load_self() -> *const c_char;
+        fn rust_load_self() -> *const c_char;
     }
+
+    let _guard = LOCK.lock();
+
     unsafe {
-        let v = __load_self();
+        let v = rust_load_self();
         if v.is_null() {
             None
         } else {

branches/snap-stage3/src/rt/rust_builtin.c

@@ -204,7 +204,7 @@ int *__dfly_error(void) { return __error(); }
 #include <sys/sysctl.h>
 #include <limits.h>
 
-const char * __load_self() {
+const char * rust_load_self() {
     static char *self = NULL;
 
     if (self == NULL) {