about summary refs log tree commit diff
path: root/src/libstd/rt
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-03-14 15:16:31 -0700
committerbors <bors@rust-lang.org>2014-03-14 15:16:31 -0700
commit26fdfa124c065872a0b3c98e7234b05b00840f20 (patch)
treebb2f938e28c8db156563a64fccfd81ac9c4c22de /src/libstd/rt
parent42fc32f293eb7de7139f058fa06f580a503b87b5 (diff)
parent6d7e86d099cf33821398731f750b36df564ca5d2 (diff)
downloadrust-26fdfa124c065872a0b3c98e7234b05b00840f20.tar.gz
rust-26fdfa124c065872a0b3c98e7234b05b00840f20.zip
auto merge of #12878 : crabtw/rust/mips, r=alexcrichton
I ignored AtomicU64 methods on MIPS target
because libgcc doesn't implement MIPS32 64-bit atomic operations.
Otherwise it would cause link failure.

By the way, the patched LLVM doesn't have MIPS split stack anymore.
Should I file an issue about that?
Diffstat (limited to 'src/libstd/rt')
-rw-r--r--src/libstd/rt/libunwind.rs3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/libstd/rt/libunwind.rs b/src/libstd/rt/libunwind.rs
index bdb049fbb5f..8c14e6c81e9 100644
--- a/src/libstd/rt/libunwind.rs
+++ b/src/libstd/rt/libunwind.rs
@@ -65,6 +65,9 @@ pub static unwinder_private_data_size: int = 2;
 #[cfg(target_arch = "arm")]
 pub static unwinder_private_data_size: int = 20;
 
+#[cfg(target_arch = "mips")]
+pub static unwinder_private_data_size: int = 2;
+
 pub struct _Unwind_Exception {
     exception_class: _Unwind_Exception_Class,
     exception_cleanup: _Unwind_Exception_Cleanup_Fn,