Skip to content

Commit

Permalink
Rollup merge of rust-lang#93350 - gburgessiv:master, r=Mark-Simulacrum
Browse files Browse the repository at this point in the history
libunwind: readd link attrs to _Unwind_Backtrace

It seems the removal of these in 1c07096 was unintended; readding them fixes the build.

fixes rust-lang#93349

r? `@alexcrichton`
  • Loading branch information
matthiaskrgr authored Mar 7, 2022
2 parents d137c3a + 4d25c51 commit 1ca8d0b
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions library/unwind/src/libunwind.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 1ca8d0b

Please sign in to comment.