diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2016-05-23 22:28:15 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2016-05-31 16:11:49 -0700 |
| commit | fa45670ce4c3813e9af0e50a6b61742310fdaa88 (patch) | |
| tree | 3e08c66b9c125b072ea0611ca39f8e482d291178 /src/libpanic_unwind | |
| parent | 298730e7032cd55809423773da397cd5c7d827d4 (diff) | |
| download | rust-fa45670ce4c3813e9af0e50a6b61742310fdaa88.tar.gz rust-fa45670ce4c3813e9af0e50a6b61742310fdaa88.zip | |
mk: Prepare for a new stage0 compiler
This commit prepares the source for a new stage0 compiler, the 1.10.0 beta compiler. These artifacts are hot off the bots and should be ready to go.
Diffstat (limited to 'src/libpanic_unwind')
| -rw-r--r-- | src/libpanic_unwind/lib.rs | 4 | ||||
| -rw-r--r-- | src/libpanic_unwind/seh.rs | 10 |
2 files changed, 3 insertions, 11 deletions
diff --git a/src/libpanic_unwind/lib.rs b/src/libpanic_unwind/lib.rs index 17cbd2e0d4c..39a93c4ac29 100644 --- a/src/libpanic_unwind/lib.rs +++ b/src/libpanic_unwind/lib.rs @@ -42,8 +42,8 @@ #![feature(unwind_attributes)] #![cfg_attr(target_env = "msvc", feature(raw))] -#![cfg_attr(not(stage0), panic_runtime)] -#![cfg_attr(not(stage0), feature(panic_runtime))] +#![panic_runtime] +#![feature(panic_runtime)] extern crate alloc; extern crate libc; diff --git a/src/libpanic_unwind/seh.rs b/src/libpanic_unwind/seh.rs index 04a3f7b9663..2b2926426f7 100644 --- a/src/libpanic_unwind/seh.rs +++ b/src/libpanic_unwind/seh.rs @@ -233,8 +233,7 @@ extern { // an argument to the C++ personality function. // // Again, I'm not entirely sure what this is describing, it just seems to work. -#[cfg_attr(all(not(test), not(stage0)), - lang = "msvc_try_filter")] +#[cfg_attr(not(test), lang = "msvc_try_filter")] static mut TYPE_DESCRIPTOR1: _TypeDescriptor = _TypeDescriptor { pVFTable: &TYPE_INFO_VTABLE as *const _ as *const _, spare: 0 as *mut _, @@ -308,13 +307,6 @@ pub unsafe fn cleanup(payload: [u64; 2]) -> Box<Any + Send> { }) } -#[lang = "msvc_try_filter"] -#[cfg(stage0)] -unsafe extern fn __rust_try_filter(_eh_ptrs: *mut u8, - _payload: *mut u8) -> i32 { - return 0 -} - // This is required by the compiler to exist (e.g. it's a lang item), but // it's never actually called by the compiler because __C_specific_handler // or _except_handler3 is the personality function that is always used. |