From c3eb4e7b4323bb0a4a9600b3bc1f165332f05a98 Mon Sep 17 00:00:00 2001 From: Debian Rust Maintainers Date: Fri, 2 Nov 2018 08:42:36 +0000 Subject: [PATCH] u-mips-fixes Gbp-Pq: Name u-mips-fixes.diff --- src/librustc_codegen_llvm/llvm_util.rs | 2 ++ src/test/run-pass/invalid_const_promotion.rs | 3 ++- src/test/ui/asm/asm-out-assign-imm.rs | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/librustc_codegen_llvm/llvm_util.rs b/src/librustc_codegen_llvm/llvm_util.rs index 9e8ff20470..b09f834557 100644 --- a/src/librustc_codegen_llvm/llvm_util.rs +++ b/src/librustc_codegen_llvm/llvm_util.rs @@ -68,6 +68,8 @@ unsafe fn configure_llvm(sess: &Session) { add("-disable-preinline"); } + if sess.target.target.arch == "mips" || sess.target.target.arch == "mips64" { add("-fast-isel=0"); } + for arg in &sess.opts.cg.llvm_args { add(&(*arg)); } diff --git a/src/test/run-pass/invalid_const_promotion.rs b/src/test/run-pass/invalid_const_promotion.rs index a18d82fb7a..4fa4385d9c 100644 --- a/src/test/run-pass/invalid_const_promotion.rs +++ b/src/test/run-pass/invalid_const_promotion.rs @@ -35,7 +35,8 @@ fn check_status(status: std::process::ExitStatus) use std::os::unix::process::ExitStatusExt; assert!(status.signal() == Some(libc::SIGILL) - || status.signal() == Some(libc::SIGABRT)); + || status.signal() == Some(libc::SIGABRT) + || status.signal() == Some(libc::SIGTRAP)); } #[cfg(not(unix))] diff --git a/src/test/ui/asm/asm-out-assign-imm.rs b/src/test/ui/asm/asm-out-assign-imm.rs index 73143f1154..cf7a2a0cfd 100644 --- a/src/test/ui/asm/asm-out-assign-imm.rs +++ b/src/test/ui/asm/asm-out-assign-imm.rs @@ -10,6 +10,8 @@ // ignore-s390x // ignore-emscripten +// ignore-mips +// ignore-mips64 // ignore-powerpc // ignore-powerpc64 // ignore-powerpc64le -- 2.30.2