about summary refs log tree commit diff
path: root/src/libpanic_unwind
diff options
context:
space:
mode:
authorJan-Erik Rediger <janerik@fnordig.de>2016-08-07 00:14:33 +0200
committerBrian Anderson <banderson@mozilla.com>2016-09-30 14:02:41 -0700
commit86fd661bcbf84f8f387b824d05f4803fc00ee34f (patch)
treee7561ce924e81523bfc31037eed9e1f99e2e4491 /src/libpanic_unwind
parentcb3f5799f4c1e5786eb3976dfa33f527a0415168 (diff)
downloadrust-86fd661bcbf84f8f387b824d05f4803fc00ee34f.tar.gz
rust-86fd661bcbf84f8f387b824d05f4803fc00ee34f.zip
Patch panic_unwind to compile, but this is surely broken
Diffstat (limited to 'src/libpanic_unwind')
-rw-r--r--src/libpanic_unwind/gcc.rs6
1 files changed, 6 insertions, 0 deletions
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