Skip to content

Commit a5abcf1

Browse files
Copilotmessense
andcommitted
Update s390x-unwind.patch for latest Rust unwind library structure
Co-authored-by: messense <1556054+messense@users.noreply.github.com>
1 parent 6757a9e commit a5abcf1

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

s390x-unwind.patch

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,14 @@ error: aborting due to previous error
2323

2424
--- a/library/unwind/src/lib.rs
2525
+++ b/library/unwind/src/lib.rs
26-
@@ -51,7 +51,10 @@
27-
#[link(name = "unwind", cfg(not(target_feature = "crt-static")))]
28-
unsafe extern "C" {}
29-
} else {
26+
@@ -74,7 +74,10 @@
27+
}
28+
_ => {
3029
- #[link(name = "unwind", kind = "static", modifiers = "-bundle", cfg(target_feature = "crt-static"))]
3130
+ // on musl gcc_eh needs pthread_once from libc
3231
+ #[link(name = "gcc_eh", kind = "static", modifiers = "-bundle", cfg(target_feature = "crt-static"))]
3332
+ #[link(name = "c", kind = "static", modifiers = "-bundle", cfg(target_feature = "crt-static"))]
3433
+ unsafe extern "C" {}
35-
#[link(name = "gcc_s", cfg(not(target_feature = "crt-static")))]
34+
#[link(name = "gcc_s", cfg(all(not(target_feature = "crt-static"), not(target_arch = "hexagon"))))]
3635
unsafe extern "C" {}
3736
}

0 commit comments

Comments
 (0)