u-mips-fixes

Gbp-Pq: Name u-mips-fixes.diff

diff --git a/src/librustc_codegen_llvm/llvm_util.rs b/src/librustc_codegen_llvm/llvm_util.rs
index fdb6373bea1fed056e89eff3d0bad0412a97c3f4..9634cdc36b2492ca6166151563a59e0fddd96379 100644 (file)
--- 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 40a36dd895f772b9b82b217f2004418f1029188b..ca5b132350731b95ec1cbb3b73164a1df62a8ccf 100644 (file)
--- 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 73143f1154631be50106dbf82ee28d79e985a0f7..cf7a2a0cfd49126605df5b189266f8de4295a3cd 100644 (file)
--- 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 51933cac39692003261bc72e51121fe5c3b78648..02f5f3f8e3542245eda2417dcbc9690754ad901a 100644 (file)
--- 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`