diff options
| author | Mark Rousskov <mark.simulacrum@gmail.com> | 2019-07-04 10:05:50 -0400 |
|---|---|---|
| committer | Mark Rousskov <mark.simulacrum@gmail.com> | 2019-07-04 11:26:57 -0400 |
| commit | 8a7dded1a249a21540583333204c378bf960a700 (patch) | |
| tree | a3f2218f1d0ec0a122a3b947ed837268aa688981 /src/libunwind/libunwind.rs | |
| parent | b43eb4235ac43c822d903ad26ed806f34cc1a14a (diff) | |
Switch master to 1.38
Diffstat (limited to 'src/libunwind/libunwind.rs')
| -rw-r--r-- | src/libunwind/libunwind.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libunwind/libunwind.rs b/src/libunwind/libunwind.rs index 7e640897af7..41adc0a4153 100644 --- a/src/libunwind/libunwind.rs +++ b/src/libunwind/libunwind.rs @@ -67,7 +67,7 @@ pub enum _Unwind_Context {} pub type _Unwind_Exception_Cleanup_Fn = extern "C" fn(unwind_code: _Unwind_Reason_Code, exception: *mut _Unwind_Exception); -#[cfg_attr(all(not(bootstrap), feature = "llvm-libunwind"), +#[cfg_attr(feature = "llvm-libunwind", link(name = "unwind", kind = "static"))] extern "C" { #[unwind(allowed)] @@ -93,7 +93,7 @@ if #[cfg(all(any(target_os = "ios", target_os = "netbsd", not(target_arch = "arm } pub use _Unwind_Action::*; - #[cfg_attr(all(not(bootstrap), feature = "llvm-libunwind"), + #[cfg_attr(feature = "llvm-libunwind", link(name = "unwind", kind = "static"))] extern "C" { pub fn _Unwind_GetGR(ctx: *mut _Unwind_Context, reg_index: c_int) -> _Unwind_Word; @@ -148,7 +148,7 @@ if #[cfg(all(any(target_os = "ios", target_os = "netbsd", not(target_arch = "arm pub const UNWIND_POINTER_REG: c_int = 12; pub const UNWIND_IP_REG: c_int = 15; - #[cfg_attr(all(not(bootstrap), feature = "llvm-libunwind"), + #[cfg_attr(feature = "llvm-libunwind", link(name = "unwind", kind = "static"))] extern "C" { fn _Unwind_VRS_Get(ctx: *mut _Unwind_Context, @@ -212,7 +212,7 @@ if #[cfg(all(any(target_os = "ios", target_os = "netbsd", not(target_arch = "arm cfg_if::cfg_if! { if #[cfg(not(all(target_os = "ios", target_arch = "arm")))] { // Not 32-bit iOS - #[cfg_attr(all(not(bootstrap), feature = "llvm-libunwind"), + #[cfg_attr(feature = "llvm-libunwind", link(name = "unwind", kind = "static"))] extern "C" { #[unwind(allowed)] @@ -223,7 +223,7 @@ if #[cfg(not(all(target_os = "ios", target_arch = "arm")))] { } } else { // 32-bit iOS uses SjLj and does not provide _Unwind_Backtrace() - #[cfg_attr(all(not(bootstrap), feature = "llvm-libunwind"), + #[cfg_attr(feature = "llvm-libunwind", link(name = "unwind", kind = "static"))] extern "C" { #[unwind(allowed)] |