diff options
| author | Vadim Chugunov <vadimcn@gmail.com> | 2014-08-10 21:26:45 -0700 |
|---|---|---|
| committer | Vadim Chugunov <vadimcn@gmail.com> | 2014-08-12 00:13:43 -0700 |
| commit | 3dfd12967aed35b7788f7d3c7460b76b76e70b60 (patch) | |
| tree | 6c28e2873f65ce3bc29edacd4a7e3f2bf4eb5725 /src/librustrt/stack.rs | |
| parent | 98332b1a06193c4f83fc2613f72273b50b77f2b3 (diff) | |
| download | rust-3dfd12967aed35b7788f7d3c7460b76b76e70b60.tar.gz rust-3dfd12967aed35b7788f7d3c7460b76b76e70b60.zip | |
Replace #[cfg(target_os = "win32")] with #[cfg(target_os = "windows")]
Diffstat (limited to 'src/librustrt/stack.rs')
| -rw-r--r-- | src/librustrt/stack.rs | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/librustrt/stack.rs b/src/librustrt/stack.rs index c941107d7e8..772b5da8cd5 100644 --- a/src/librustrt/stack.rs +++ b/src/librustrt/stack.rs @@ -199,7 +199,8 @@ pub unsafe fn record_sp_limit(limit: uint) { unsafe fn target_record_sp_limit(limit: uint) { asm!("movq $0, %fs:112" :: "r"(limit) :: "volatile") } - #[cfg(target_arch = "x86_64", target_os = "win32")] #[inline(always)] + #[cfg(target_arch = "x86_64", target_os = "windows")] #[inline(always)] + #[cfg(stage0, target_arch = "x86_64", target_os = "win32")] // NOTE: Remove after snapshot unsafe fn target_record_sp_limit(limit: uint) { // see: http://en.wikipedia.org/wiki/Win32_Thread_Information_Block // store this inside of the "arbitrary data slot", but double the size @@ -227,7 +228,8 @@ pub unsafe fn record_sp_limit(limit: uint) { unsafe fn target_record_sp_limit(limit: uint) { asm!("movl $0, %gs:48" :: "r"(limit) :: "volatile") } - #[cfg(target_arch = "x86", target_os = "win32")] #[inline(always)] + #[cfg(target_arch = "x86", target_os = "windows")] #[inline(always)] + #[cfg(stage0, target_arch = "x86", target_os = "win32")] // NOTE: Remove after snapshot unsafe fn target_record_sp_limit(limit: uint) { // see: http://en.wikipedia.org/wiki/Win32_Thread_Information_Block // store this inside of the "arbitrary data slot" @@ -280,7 +282,8 @@ pub unsafe fn get_sp_limit() -> uint { asm!("movq %fs:112, $0" : "=r"(limit) ::: "volatile"); return limit; } - #[cfg(target_arch = "x86_64", target_os = "win32")] #[inline(always)] + #[cfg(target_arch = "x86_64", target_os = "windows")] #[inline(always)] + #[cfg(stage0, target_arch = "x86_64", target_os = "win32")] // NOTE: Remove after snapshot unsafe fn target_get_sp_limit() -> uint { let limit; asm!("movq %gs:0x28, $0" : "=r"(limit) ::: "volatile"); @@ -316,7 +319,8 @@ pub unsafe fn get_sp_limit() -> uint { asm!("movl %gs:48, $0" : "=r"(limit) ::: "volatile"); return limit; } - #[cfg(target_arch = "x86", target_os = "win32")] #[inline(always)] + #[cfg(target_arch = "x86", target_os = "windows")] #[inline(always)] + #[cfg(stage0, target_arch = "x86", target_os = "win32")] // NOTE: Remove after snapshot unsafe fn target_get_sp_limit() -> uint { let limit; asm!("movl %fs:0x14, $0" : "=r"(limit) ::: "volatile"); |