From 812bfe0d0f7b8aa16d59e4743c09a9df019bd679 Mon Sep 17 00:00:00 2001 From: Debian Rust Maintainers Date: Sun, 17 Mar 2019 23:40:05 +0000 Subject: [PATCH] u-mips-fixes Gbp-Pq: Name u-mips-fixes.diff --- src/librustc_codegen_llvm/llvm_util.rs | 3 +++ src/test/ui/asm/asm-out-assign-imm.nll.stderr | 2 +- src/test/ui/asm/asm-out-assign-imm.rs | 2 ++ src/test/ui/asm/asm-out-assign-imm.stderr | 2 +- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/librustc_codegen_llvm/llvm_util.rs b/src/librustc_codegen_llvm/llvm_util.rs index fdb6373bea..9634cdc36b 100644 --- a/src/librustc_codegen_llvm/llvm_util.rs +++ b/src/librustc_codegen_llvm/llvm_util.rs @@ -74,6 +74,9 @@ unsafe fn configure_llvm(sess: &Session) { add("-mergefunc-use-aliases"); } + 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/ui/asm/asm-out-assign-imm.nll.stderr b/src/test/ui/asm/asm-out-assign-imm.nll.stderr index 40a36dd895..ca5b132350 100644 --- a/src/test/ui/asm/asm-out-assign-imm.nll.stderr +++ b/src/test/ui/asm/asm-out-assign-imm.nll.stderr @@ -1,5 +1,5 @@ error[E0384]: cannot assign twice to immutable variable `x` - --> $DIR/asm-out-assign-imm.rs:34:34 + --> $DIR/asm-out-assign-imm.rs:36:34 | LL | let x: isize; | - help: make this binding mutable: `mut x` 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 diff --git a/src/test/ui/asm/asm-out-assign-imm.stderr b/src/test/ui/asm/asm-out-assign-imm.stderr index 51933cac39..02f5f3f8e3 100644 --- a/src/test/ui/asm/asm-out-assign-imm.stderr +++ b/src/test/ui/asm/asm-out-assign-imm.stderr @@ -1,5 +1,5 @@ error[E0384]: cannot assign twice to immutable variable `x` - --> $DIR/asm-out-assign-imm.rs:34:34 + --> $DIR/asm-out-assign-imm.rs:36:34 | LL | x = 1; | ----- first assignment to `x` -- 2.30.2