Merge #2348

2348: Copied trap handlers so this will compile for `aarch64-linux-android` r=syrusakbary a=dgrijalva-squire Attempting to compile Wasmer for android fails with an 'unsupported platform' error. These two additional cases are copied from their neighbors, but properly match against the `aarch64-linux-android` target. I don't know enough about what this code is actually doing to know if this is 'right', but it does appear to work. Co-authored-by: Dave Grijalva <[email protected]>
wasmerio · May 26, 2021 · 50f48ff · 50f48ff
2 parents ea369c4 + cc3168b
commit 50f48ff
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/lib/vm/src/trap/traphandlers.rs b/lib/vm/src/trap/traphandlers.rs
@@ -210,9 +210,15 @@ cfg_if::cfg_if! {
                 } 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
+                } else if #[cfg(all(target_os = "android", target_arch = "x86"))] {
+                    let cx = &*(cx as *const libc::ucontext_t);
+                    cx.uc_mcontext.gregs[libc::REG_EIP as usize] as *const u8
                 } else if #[cfg(all(target_os = "linux", target_arch = "aarch64"))] {
                     let cx = &*(cx as *const libc::ucontext_t);
                     cx.uc_mcontext.pc as *const u8
+                } 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 = "macos", target_arch = "x86_64"))] {
                     let cx = &*(cx as *const libc::ucontext_t);
                     (*cx.uc_mcontext).__ss.__rip as *const u8