diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-01-30 12:26:44 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-01-30 14:53:34 -0800 |
| commit | 3a2530d611fc92bd8094ec1745a927e059ac432a (patch) | |
| tree | 0e02c7b12ca7ab267ba36903a535ec3cb286a23e /src/libstd/rt | |
| parent | 188d7c0bc36e69b99f6bdefd613027e53fa8b2d0 (diff) | |
| download | rust-3a2530d611fc92bd8094ec1745a927e059ac432a.tar.gz rust-3a2530d611fc92bd8094ec1745a927e059ac432a.zip | |
Test fixes and rebase conflicts
Also some tidying up of a bunch of crate attributes
Diffstat (limited to 'src/libstd/rt')
| -rw-r--r-- | src/libstd/rt/unwind.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/rt/unwind.rs b/src/libstd/rt/unwind.rs index 757aecaaaff..fb40a6c8f60 100644 --- a/src/libstd/rt/unwind.rs +++ b/src/libstd/rt/unwind.rs @@ -160,7 +160,7 @@ pub fn panicking() -> bool { // An uninlined, unmangled function upon which to slap yer breakpoints #[inline(never)] #[no_mangle] -#[allow(private_no_mangle_fns)] +#[cfg_attr(not(stage0), allow(private_no_mangle_fns))] fn rust_panic(cause: Box<Any + Send>) -> ! { rtdebug!("begin_unwind()"); @@ -238,7 +238,7 @@ pub mod eabi { #[lang="eh_personality"] #[no_mangle] // referenced from rust_try.ll - #[allow(private_no_mangle_fns)] + #[cfg_attr(not(stage0), allow(private_no_mangle_fns))] extern fn rust_eh_personality( version: c_int, actions: uw::_Unwind_Action, |