From 86fd661bcbf84f8f387b824d05f4803fc00ee34f Mon Sep 17 00:00:00 2001 From: Jan-Erik Rediger Date: Sun, 7 Aug 2016 00:14:33 +0200 Subject: [PATCH] Patch panic_unwind to compile, but this is surely broken --- src/libpanic_unwind/gcc.rs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/libpanic_unwind/gcc.rs b/src/libpanic_unwind/gcc.rs index 33b24fbaa26..e4730a73204 100644 --- a/src/libpanic_unwind/gcc.rs +++ b/src/libpanic_unwind/gcc.rs @@ -133,6 +133,12 @@ const UNWIND_DATA_REG: (i32, i32) = (3, 4); // R3, R4 / X3, X4 #[cfg(target_arch = "s390x")] const UNWIND_DATA_REG: (i32, i32) = (6, 7); // R6, R7 +// FIXME: This is completely and utterly wrong. +// I copy'n'pasted the x86 thing just to see if asmjs-unknown-emscripten compiles at all +// (the happy path) +#[cfg(target_arch = "asmjs")] +const UNWIND_DATA_REG: (i32, i32) = (0, 2); // EAX, EDX + // The following code is based on GCC's C and C++ personality routines. For reference, see: // https://github.com/gcc-mirror/gcc/blob/master/libstdc++-v3/libsupc++/eh_personality.cc // https://github.com/gcc-mirror/gcc/blob/trunk/libgcc/unwind-c.c