Skip to content
Snippets Groups Projects
Commit 6e5d01d1 authored by Steve Lhomme's avatar Steve Lhomme
Browse files

contrib: rav1e: remove i686 unwind patch

We only build with LLVM for i686 and it doesn't seem needed there.
parent 3af8a660
No related branches found
No related tags found
1 merge request!5711contrib: rav1e: remove i686 unwind patch
Pipeline #491247 passed with stage
in 39 minutes and 59 seconds
......@@ -60,11 +60,6 @@ rav1e-vendor: rav1e-$(RAV1E_VERSION)-vendor.tar.bz2 .sum-rav1e-vendor
rav1e: rav1e-$(RAV1E_VERSION).tar.gz .sum-rav1e
$(UNPACK)
ifdef HAVE_WIN32
ifndef HAVE_WIN64
$(APPLY) $(SRC)/rav1e/unwind-resume-stub.patch
endif
endif
$(call cargo_vendor_setup,$(UNPACK_DIR),$@)
$(MOVE)
......
From d186b5350e425a82dbd4513b5d629dc892c3c4a5 Mon Sep 17 00:00:00 2001
From: Tristan Matthews <tmatth@videolan.org>
Date: Fri, 25 Feb 2022 12:30:01 -0500
Subject: [PATCH] lib: workaround for
https://github.com/rust-lang/rust/issues/79609
This avoids to broken linking on some mingw32 versions. The function
will never be called since we set `-C panic=abort`.
---
src/lib.rs | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/src/lib.rs b/src/lib.rs
index 3425588d..1b645340 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -486,3 +486,35 @@ pub mod bench {
#[cfg(fuzzing)]
pub mod fuzzing;
+
+#[no_mangle]
+#[allow(non_snake_case)]
+fn _Unwind_GetDataRelBase() {}
+
+#[no_mangle]
+#[allow(non_snake_case)]
+fn _Unwind_GetIPInfo() {}
+
+#[no_mangle]
+#[allow(non_snake_case)]
+fn _Unwind_GetLanguageSpecificData() {}
+
+#[no_mangle]
+#[allow(non_snake_case)]
+fn _Unwind_GetRegionStart() {}
+
+#[no_mangle]
+#[allow(non_snake_case)]
+fn _Unwind_GetTextRelBase() {}
+
+#[no_mangle]
+#[allow(non_snake_case)]
+fn _Unwind_Resume() {}
+
+#[no_mangle]
+#[allow(non_snake_case)]
+fn _Unwind_SetGR() {}
+
+#[no_mangle]
+#[allow(non_snake_case)]
+fn _Unwind_SetIP() {}
--
2.37.1 (Apple Git-137.1)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment