From 4d25c51f693c4155a278f9f1dd37b0ad13008041 Mon Sep 17 00:00:00 2001 From: George Burgess IV Date: Wed, 26 Jan 2022 12:59:14 -0800 Subject: [PATCH] libunwind: readd link attrs to _Unwind_Backtrace It seems the removal of these in 1c07096a45a15de64216f12ec726333870e372b1 was unintended; readding them fixes the build. fixes rust-lang/rust#93349 --- library/unwind/src/libunwind.rs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/library/unwind/src/libunwind.rs b/library/unwind/src/libunwind.rs index 5e15fe75a2463..fe98e860ace78 100644 --- a/library/unwind/src/libunwind.rs +++ b/library/unwind/src/libunwind.rs @@ -246,6 +246,10 @@ if #[cfg(not(all(target_os = "ios", target_arch = "arm")))] { extern "C-unwind" { pub fn _Unwind_RaiseException(exception: *mut _Unwind_Exception) -> _Unwind_Reason_Code; } + #[cfg_attr( + all(feature = "llvm-libunwind", any(target_os = "fuchsia", target_os = "linux")), + link(name = "unwind", kind = "static", modifiers = "-bundle") + )] extern "C" { pub fn _Unwind_Backtrace(trace: _Unwind_Trace_Fn, trace_argument: *mut c_void)