Merge pull request #1494 from cfallin/arm64-merge

Add new `MachInst` backend and ARM64 support.

crates/runtime/src/helpers.c

@@ -26,3 +26,12 @@ void* GetPcFromUContext(ucontext_t *cx) {
   return (void*) cx->uc_mcontext->__ss.__rip;
 }
 #endif
+
+#if defined(__linux__) && defined(__aarch64__)
+#include <sys/ucontext.h>
+
+void* GetPcFromUContext(ucontext_t *cx) {
+    return (void*) cx->uc_mcontext.pc;
+}
+
+#endif  // __linux__ && __aarch64__

crates/runtime/src/traphandlers.rs

@@ -156,6 +156,12 @@ cfg_if::cfg_if! {
                 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 = "linux", target_arch = "aarch64"))] {
+                    // libc doesn't seem to support Linux/aarch64 at the moment?
+                    extern "C" {
+                        fn GetPcFromUContext(cx: *mut libc::c_void) -> *const u8;
+                    }
+                    GetPcFromUContext(cx)
                 } else if #[cfg(target_os = "macos")] {
                     // FIXME(rust-lang/libc#1702) - once that lands and is
                     // released we should inline the definition here