diff options
| author | bors <bors@rust-lang.org> | 2015-07-28 08:51:21 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-07-28 08:51:21 +0000 |
| commit | 5b72fa42d434e92e5fbb9fbd3b0995cc936ddcb9 (patch) | |
| tree | 5e0ce03e0e08c453eb3c8c8f470553c6cda98263 /src/libstd/rt | |
| parent | 79d5fefa2508212ec2cc46c1069819a988f23598 (diff) | |
| parent | cc09b1a08cc61dd3f485308adf3a5a252c718861 (diff) | |
| download | rust-5b72fa42d434e92e5fbb9fbd3b0995cc936ddcb9.tar.gz rust-5b72fa42d434e92e5fbb9fbd3b0995cc936ddcb9.zip | |
Auto merge of #27309 - eddyb:snapshot-infdef, r=alexcrichton
FreeBSD i386 snapshot is missing, failed tests (possibly spurious). r? @alexcrichton
Diffstat (limited to 'src/libstd/rt')
| -rw-r--r-- | src/libstd/rt/unwind/gcc.rs | 8 | ||||
| -rw-r--r-- | src/libstd/rt/unwind/mod.rs | 6 |
2 files changed, 4 insertions, 10 deletions
diff --git a/src/libstd/rt/unwind/gcc.rs b/src/libstd/rt/unwind/gcc.rs index 59fc8df6107..23e10ee6c39 100644 --- a/src/libstd/rt/unwind/gcc.rs +++ b/src/libstd/rt/unwind/gcc.rs @@ -115,7 +115,7 @@ pub mod eabi { } } - #[cfg_attr(not(stage0), lang = "eh_personality_catch")] + #[lang = "eh_personality_catch"] #[no_mangle] pub extern fn rust_eh_personality_catch( _version: c_int, @@ -168,7 +168,7 @@ pub mod eabi { } } - #[cfg_attr(not(stage0), lang = "eh_personality_catch")] + #[lang = "eh_personality_catch"] #[no_mangle] pub extern fn rust_eh_personality_catch( _version: c_int, @@ -218,7 +218,7 @@ pub mod eabi { } } - #[cfg_attr(not(stage0), lang = "eh_personality_catch")] + #[lang = "eh_personality_catch"] #[no_mangle] pub extern fn rust_eh_personality_catch( state: uw::_Unwind_State, @@ -307,7 +307,7 @@ pub mod eabi { } } - #[cfg_attr(not(stage0), lang = "eh_personality_catch")] + #[lang = "eh_personality_catch"] #[no_mangle] pub extern fn rust_eh_personality_catch( exceptionRecord: *mut EXCEPTION_RECORD, diff --git a/src/libstd/rt/unwind/mod.rs b/src/libstd/rt/unwind/mod.rs index db2310ba361..60eced014de 100644 --- a/src/libstd/rt/unwind/mod.rs +++ b/src/libstd/rt/unwind/mod.rs @@ -139,7 +139,6 @@ pub unsafe fn try<F: FnOnce()>(f: F) -> Result<(), Box<Any + Send>> { // `dllexport`, but it's easier to not have conditional `src/rt/rust_try.ll` // files and instead just have this non-generic shim the compiler can take // care of exposing correctly. - #[cfg(not(stage0))] unsafe fn inner_try(f: fn(*mut u8), data: *mut u8) -> Result<(), Box<Any + Send>> { let prev = PANICKING.with(|s| s.get()); @@ -152,11 +151,6 @@ pub unsafe fn try<F: FnOnce()>(f: F) -> Result<(), Box<Any + Send>> { Err(imp::cleanup(ep)) } } - #[cfg(stage0)] - unsafe fn inner_try(f: fn(*mut u8), data: *mut u8) - -> Result<(), Box<Any + Send>> { - Ok(f(data)) - } fn try_fn<F: FnOnce()>(opt_closure: *mut u8) { let opt_closure = opt_closure as *mut Option<F>; |