about summary refs log tree commit diff
path: root/src/libstd/rt
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-02-14 10:41:45 -0800
committerbors <bors@rust-lang.org>2014-02-14 10:41:45 -0800
commit994747022a45b5c2b03f38dddbe8b43bf09679f3 (patch)
tree68e9b9828799a0257ddabac44be1b4b1e2283025 /src/libstd/rt
parent92c5738aae54a15717005e84499a522d173a4a09 (diff)
parent28fa81a954a5722eedc838f413eb7b8ed04a8e95 (diff)
downloadrust-994747022a45b5c2b03f38dddbe8b43bf09679f3.tar.gz
rust-994747022a45b5c2b03f38dddbe8b43bf09679f3.zip
auto merge of #12205 : alexcrichton/rust/nodefaultlibs, r=brson
This will hopefully bring us closer to #11937. We're still using gcc's idea of
"startup files", but this should prevent us from leaking in dependencies that we
don't quite want (libgcc for example once compiler-rt is what we use).
Diffstat (limited to 'src/libstd/rt')
-rw-r--r--src/libstd/rt/unwind.rs10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/libstd/rt/unwind.rs b/src/libstd/rt/unwind.rs
index 9f89becaef9..5718a27bfef 100644
--- a/src/libstd/rt/unwind.rs
+++ b/src/libstd/rt/unwind.rs
@@ -143,6 +143,16 @@ mod libunwind {
     pub type _Unwind_Exception_Cleanup_Fn = extern "C" fn(unwind_code: _Unwind_Reason_Code,
                                                           exception: *_Unwind_Exception);
 
+    #[cfg(target_os = "linux")]
+    #[cfg(target_os = "freebsd")]
+    #[cfg(target_os = "win32")]
+    #[link(name = "gcc_s")]
+    extern {}
+
+    #[cfg(target_os = "android")]
+    #[link(name = "gcc")]
+    extern {}
+
     extern "C" {
         pub fn _Unwind_RaiseException(exception: *_Unwind_Exception) -> _Unwind_Reason_Code;
         pub fn _Unwind_DeleteException(exception: *_Unwind_Exception);