bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

PR review fixes

Browse source
This commit is contained in:
Dave Huseby 2015-02-05 11:34:59 -08:00
parent 34590d6def
commit 2ece7a6831
2 changed files with 10 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/libstd/sys/common/stack.rs
View file

@ -195,12 +195,6 @@ pub unsafe fn record_sp_limit(limit: uint) {
asm!("movq $0, %fs:32" :: "r"(limit) :: "volatile") asm!("movq $0, %fs:32" :: "r"(limit) :: "volatile")
} }
#[cfg(target_os = "bitrig")]
#[inline(always)]
unsafe fn target_record_sp_limit(_: uint) {
// segmented stacks are disabled
}
// x86 // x86
#[cfg(all(target_arch = "x86", #[cfg(all(target_arch = "x86",
any(target_os = "macos", target_os = "ios")))] any(target_os = "macos", target_os = "ios")))]
@ -240,6 +234,7 @@ pub unsafe fn record_sp_limit(limit: uint) {
#[cfg(any(target_arch = "aarch64", #[cfg(any(target_arch = "aarch64",
target_arch = "powerpc", target_arch = "powerpc",
all(target_arch = "arm", target_os = "ios"), all(target_arch = "arm", target_os = "ios"),
target_os = "bitrig",
target_os = "openbsd"))] target_os = "openbsd"))]
unsafe fn target_record_sp_limit(_: uint) { unsafe fn target_record_sp_limit(_: uint) {
} }
@ -290,12 +285,6 @@ pub unsafe fn get_sp_limit() -> uint {
asm!("movq %fs:32, $0" : "=r"(limit) ::: "volatile"); asm!("movq %fs:32, $0" : "=r"(limit) ::: "volatile");
return limit; return limit;
} }
#[cfg(target_os = "bitrig")]
#[inline(always)]
unsafe fn target_get_sp_limit() -> uint {
return 2048;
}
// x86 // x86
#[cfg(all(target_arch = "x86", #[cfg(all(target_arch = "x86",
@ -344,6 +333,7 @@ pub unsafe fn get_sp_limit() -> uint {
#[cfg(any(target_arch = "aarch64", #[cfg(any(target_arch = "aarch64",
target_arch = "powerpc", target_arch = "powerpc",
all(target_arch = "arm", target_os = "ios"), all(target_arch = "arm", target_os = "ios"),
target_os = "bitrig",
target_os = "openbsd"))] target_os = "openbsd"))]
#[inline(always)] #[inline(always)]
unsafe fn target_get_sp_limit() -> uint { unsafe fn target_get_sp_limit() -> uint {