diff options
| author | bors <bors@rust-lang.org> | 2015-06-03 09:44:26 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-06-03 09:44:26 +0000 |
| commit | 5b56d73dc0e8b988f91c44fd9f9e40331451796b (patch) | |
| tree | 1b625651647a50735437145ba27bff9b3657aefa /src/libstd | |
| parent | a5979be9fefe671fa81ec70720234602f8112bec (diff) | |
| parent | e490c17eb5d85d6b968d91b2ca93f3607934e78d (diff) | |
| download | rust-5b56d73dc0e8b988f91c44fd9f9e40331451796b.tar.gz rust-5b56d73dc0e8b988f91c44fd9f9e40331451796b.zip | |
Auto merge of #25984 - Manishearth:rollup, r=Manishearth
- Successful merges: #25939, #25963, #25970, #25971, #25974 - Failed merges:
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/sys/common/stack.rs | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/libstd/sys/common/stack.rs b/src/libstd/sys/common/stack.rs index fadeebc8150..11982ebc572 100644 --- a/src/libstd/sys/common/stack.rs +++ b/src/libstd/sys/common/stack.rs @@ -139,7 +139,6 @@ pub unsafe fn record_os_managed_stack_bounds(stack_lo: usize, _stack_hi: usize) pub unsafe fn record_sp_limit(limit: usize) { return target_record_sp_limit(limit); - // x86-64 #[cfg(all(target_arch = "x86_64", any(target_os = "macos", target_os = "ios")))] #[inline(always)] @@ -164,7 +163,6 @@ pub unsafe fn record_sp_limit(limit: usize) { asm!("movq $0, %fs:32" :: "r"(limit) :: "volatile") } - // x86 #[cfg(all(target_arch = "x86", any(target_os = "macos", target_os = "ios")))] #[inline(always)] @@ -182,8 +180,8 @@ pub unsafe fn record_sp_limit(limit: usize) { unsafe fn target_record_sp_limit(_: usize) { } - // mips, arm - Some brave soul can port these to inline asm, but it's over - // my head personally + // mips, arm - The implementations are a bit big for inline asm! + // They can be found in src/rt/arch/$target_arch/record_sp.S #[cfg(any(target_arch = "mips", target_arch = "mipsel", all(target_arch = "arm", not(target_os = "ios"))))] @@ -221,7 +219,6 @@ pub unsafe fn record_sp_limit(limit: usize) { pub unsafe fn get_sp_limit() -> usize { return target_get_sp_limit(); - // x86-64 #[cfg(all(target_arch = "x86_64", any(target_os = "macos", target_os = "ios")))] #[inline(always)] @@ -255,7 +252,6 @@ pub unsafe fn get_sp_limit() -> usize { return limit; } - // x86 #[cfg(all(target_arch = "x86", any(target_os = "macos", target_os = "ios")))] #[inline(always)] @@ -278,8 +274,8 @@ pub unsafe fn get_sp_limit() -> usize { return 1024; } - // mips, arm - Some brave soul can port these to inline asm, but it's over - // my head personally + // mips, arm - The implementations are a bit big for inline asm! + // They can be found in src/rt/arch/$target_arch/record_sp.S #[cfg(any(target_arch = "mips", target_arch = "mipsel", all(target_arch = "arm", not(target_os = "ios"))))] |