diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2022-03-07 18:39:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-07 18:39:02 +0100 |
| commit | 1ca8d0bf8c154b0f602fadac8c38f14df5dea77a (patch) | |
| tree | c31073832c978a2534625570ed8a1e1ba562705b /library/unwind | |
| parent | d137c3a7bd3b180317044f8ccb9a8b4b3bb07db3 (diff) | |
| parent | 4d25c51f693c4155a278f9f1dd37b0ad13008041 (diff) | |
| download | rust-1ca8d0bf8c154b0f602fadac8c38f14df5dea77a.tar.gz rust-1ca8d0bf8c154b0f602fadac8c38f14df5dea77a.zip | |
Rollup merge of #93350 - gburgessiv:master, r=Mark-Simulacrum
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 r? `@alexcrichton`
Diffstat (limited to 'library/unwind')
| -rw-r--r-- | library/unwind/src/libunwind.rs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/library/unwind/src/libunwind.rs b/library/unwind/src/libunwind.rs index c8c5528b104..432628613f5 100644 --- a/library/unwind/src/libunwind.rs +++ b/library/unwind/src/libunwind.rs @@ -249,6 +249,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) |