about summary refs log tree commit diff
path: root/src/libstd/rt
diff options
context:
space:
mode:
Diffstat (limited to 'src/libstd/rt')
-rw-r--r--src/libstd/rt/unwind/gcc.rs8
-rw-r--r--src/libstd/rt/unwind/mod.rs6
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>;