rollup merge of #19076: jxv/master

2014-11-19 22:39:23 +01:00 · 2014-11-19 22:39:23 +01:00 · 9b5ec0e4aa
commit 9b5ec0e4aa
parent 1faa09615e 33f8a82c02
1 changed files with 1 additions and 0 deletions
--- a/src/librustrt/stack_overflow.rs
+++ b/src/librustrt/stack_overflow.rs
@ -283,6 +283,7 @@ mod imp {
    #[cfg(any(all(target_os = "linux", target_arch = "x86"), // may not match
              all(target_os = "linux", target_arch = "x86_64"),
              all(target_os = "linux", target_arch = "arm"), // may not match
+              all(target_os = "linux", target_arch = "mips"), // may not match
              target_os = "android"))] // may not match
    mod signal {
        use libc;