updpkg(main/wasmer): update to 2.3.0

Includes:
* chore(main/wasmer): drop lib_vm_src_trap_traphandlers.rs.patch
This commit is contained in:
Jia Yuan Lo 2022-06-28 21:00:25 +08:00 committed by 2096779623
parent ce5c70de26
commit 5d1b4d303d
2 changed files with 2 additions and 28 deletions

View File

@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/wasmerio/wasmer
TERMUX_PKG_DESCRIPTION="A fast and secure WebAssembly runtime"
TERMUX_PKG_LICENSE="MIT"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=2.2.1
TERMUX_PKG_VERSION=2.3.0
TERMUX_PKG_SRCURL=https://github.com/wasmerio/wasmer/archive/${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=e9da2d07c5336266f8a13332628610b3833b9d9d45001b1b0558d3b8b0262e4f
TERMUX_PKG_SHA256=b27d12494191a5fe4a77b2cce085b6005f2bf6285ede6c86601a3062c6135782
TERMUX_PKG_BUILD_IN_SRC=true
TERMUX_PKG_NO_STATICSPLIT=true

View File

@ -1,26 +0,0 @@
diff -uNr wasmer/lib/vm/src/trap/traphandlers.rs wasmer.mod/lib/vm/src/trap/traphandlers.rs
--- wasmer/lib/vm/src/trap/traphandlers.rs 2022-03-16 06:54:09.000000000 +0800
+++ wasmer.mod/lib/vm/src/trap/traphandlers.rs 2022-05-22 16:42:49.608666718 +0800
@@ -210,6 +210,9 @@
if #[cfg(all(target_os = "linux", target_arch = "x86_64"))] {
let cx = &*(cx as *const libc::ucontext_t);
cx.uc_mcontext.gregs[libc::REG_RIP as usize] as *const u8
+ } else if #[cfg(all(target_os = "android", target_arch = "x86_64"))] {
+ let cx = &*(cx as *const libc::ucontext_t);
+ cx.uc_mcontext.gregs[libc::REG_RIP as usize] as *const u8
} else if #[cfg(all(target_os = "linux", target_arch = "x86"))] {
let cx = &*(cx as *const libc::ucontext_t);
cx.uc_mcontext.gregs[libc::REG_EIP as usize] as *const u8
@@ -222,6 +225,12 @@
} else if #[cfg(all(target_os = "android", target_arch = "aarch64"))] {
let cx = &*(cx as *const libc::ucontext_t);
cx.uc_mcontext.pc as *const u8
+ } else if #[cfg(all(target_os = "linux", target_arch = "arm"))] {
+ let cx = &*(cx as *const libc::ucontext_t);
+ cx.uc_mcontext.arm_pc as *const u8 // still not implemented in rust libc
+ } else if #[cfg(all(target_os = "android", target_arch = "arm"))] {
+ let cx = &*(cx as *const libc::ucontext_t);
+ cx.uc_mcontext.arm_pc as *const u8
} else if #[cfg(all(target_vendor = "apple", target_arch = "x86_64"))] {
let cx = &*(cx as *const libc::ucontext_t);
(*cx.uc_mcontext).__ss.__rip as *const u8