Skip to content

Commit da88827

Browse files
authored
Rollup merge of rust-lang#48875 - jcowgill:mips-test-fixes, r=sanxiyn
MIPS testsuite fixes This PR adjusts various bits in the testsuite so that more stuff passes on mips*.
2 parents a45b79d + fb806fd commit da88827

18 files changed

+73
-10
lines changed

src/test/codegen/abi-main-signature-16bit-c-int.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
// ignore-asmjs
1818
// ignore-hexagon
1919
// ignore-mips
20+
// ignore-mips64
2021
// ignore-powerpc
2122
// ignore-s390x
2223
// ignore-sparc

src/test/codegen/fastcall-inreg.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@
2121
// ignore-bpfeb
2222
// ignore-hexagon
2323
// ignore-mips
24-
// ignore-mipsel
2524
// ignore-mips64
26-
// ignore-mips64el
2725
// ignore-msp430
2826
// ignore-powerpc
2927
// ignore-r600

src/test/codegen/global_asm.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@
1717
// ignore-bpfeb
1818
// ignore-hexagon
1919
// ignore-mips
20-
// ignore-mipsel
2120
// ignore-mips64
22-
// ignore-mips64el
2321
// ignore-msp430
2422
// ignore-powerpc
2523
// ignore-r600

src/test/codegen/global_asm_include.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@
1717
// ignore-bpfeb
1818
// ignore-hexagon
1919
// ignore-mips
20-
// ignore-mipsel
2120
// ignore-mips64
22-
// ignore-mips64el
2321
// ignore-msp430
2422
// ignore-powerpc
2523
// ignore-r600

src/test/codegen/global_asm_x2.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@
1717
// ignore-bpfeb
1818
// ignore-hexagon
1919
// ignore-mips
20-
// ignore-mipsel
2120
// ignore-mips64
22-
// ignore-mips64el
2321
// ignore-msp430
2422
// ignore-powerpc
2523
// ignore-r600

src/test/codegen/repr-transparent-aggregates-2.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
// ignore-aarch64
1414
// ignore-asmjs
15+
// ignore-mips64
1516
// ignore-s390x
1617
// ignore-wasm
1718
// ignore-x86
Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
// compile-flags: -C no-prepopulate-passes
12+
13+
// only-mips64
14+
// See repr-transparent.rs
15+
16+
#![crate_type="lib"]
17+
#![feature(repr_transparent)]
18+
19+
20+
#[repr(C)]
21+
pub struct Big([u32; 16]);
22+
23+
#[repr(transparent)]
24+
pub struct BigW(Big);
25+
26+
// CHECK: define void @test_Big(%Big* [[BIG_RET_ATTRS:.*]], [8 x i64]
27+
#[no_mangle]
28+
pub extern fn test_Big(_: Big) -> Big { loop {} }
29+
30+
// CHECK: define void @test_BigW(%BigW* [[BIG_RET_ATTRS]], [8 x i64]
31+
#[no_mangle]
32+
pub extern fn test_BigW(_: BigW) -> BigW { loop {} }
33+
34+
35+
#[repr(C)]
36+
pub union BigU {
37+
foo: [u32; 16],
38+
}
39+
40+
#[repr(transparent)]
41+
pub struct BigUw(BigU);
42+
43+
// CHECK: define void @test_BigU(%BigU* [[BIGU_RET_ATTRS:.*]], [8 x i64]
44+
#[no_mangle]
45+
pub extern fn test_BigU(_: BigU) -> BigU { loop {} }
46+
47+
// CHECK: define void @test_BigUw(%BigUw* [[BIGU_RET_ATTRS]], [8 x i64]
48+
#[no_mangle]
49+
pub extern fn test_BigUw(_: BigUw) -> BigUw { loop {} }

src/test/codegen/stack-probes.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@
1010

1111
// ignore-arm
1212
// ignore-aarch64
13+
// ignore-mips
14+
// ignore-mips64
1315
// ignore-powerpc
14-
// ignore-aarch64
1516
// ignore-wasm
1617
// ignore-emscripten
1718
// ignore-windows

src/test/codegen/x86_mmx.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
// ignore-arm
1212
// ignore-aarch64
1313
// ignore-emscripten
14+
// ignore-mips
15+
// ignore-mips64
1416
// compile-flags: -O
1517

1618
#![feature(repr_simd)]

src/test/compile-fail/asm-bad-clobber.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
// ignore-emscripten
1616
// ignore-powerpc
1717
// ignore-sparc
18+
// ignore-mips
19+
// ignore-mips64
1820

1921
#![feature(asm, rustc_attrs)]
2022

src/test/compile-fail/asm-in-bad-modifier.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
// ignore-emscripten
1313
// ignore-powerpc
1414
// ignore-sparc
15+
// ignore-mips
16+
// ignore-mips64
1517

1618
#![feature(asm)]
1719

src/test/compile-fail/asm-misplaced-option.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
// ignore-emscripten
1616
// ignore-powerpc
1717
// ignore-sparc
18+
// ignore-mips
19+
// ignore-mips64
1820

1921
#![feature(asm, rustc_attrs)]
2022

src/test/compile-fail/asm-out-no-modifier.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
// ignore-emscripten
1313
// ignore-powerpc
1414
// ignore-sparc
15+
// ignore-mips
16+
// ignore-mips64
1517

1618
#![feature(asm)]
1719

src/test/compile-fail/asm-out-read-uninit.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
// ignore-emscripten
1313
// ignore-powerpc
1414
// ignore-sparc
15+
// ignore-mips
16+
// ignore-mips64
1517

1618
// revisions: ast mir
1719
//[mir]compile-flags: -Z borrowck=mir

src/test/compile-fail/borrowck/borrowck-asm.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@
2121
#[cfg(any(target_arch = "x86",
2222
target_arch = "x86_64",
2323
target_arch = "arm",
24-
target_arch = "aarch64"))]
24+
target_arch = "aarch64",
25+
target_arch = "mips",
26+
target_arch = "mips64"))]
2527
mod test_cases {
2628
fn is_move() {
2729
let y: &mut isize;

src/test/run-pass/stack-probes-lto.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010

1111
// ignore-arm
1212
// ignore-aarch64
13+
// ignore-mips
14+
// ignore-mips64
1315
// ignore-wasm
1416
// ignore-cloudabi no processes
1517
// ignore-emscripten no processes

src/test/run-pass/stack-probes.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010

1111
// ignore-arm
1212
// ignore-aarch64
13+
// ignore-mips
14+
// ignore-mips64
1315
// ignore-wasm
1416
// ignore-cloudabi no processes
1517
// ignore-emscripten no processes

src/tools/compiletest/src/util.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ const ARCH_TABLE: &'static [(&'static str, &'static str)] = &[
4040
("i386", "x86"),
4141
("i586", "x86"),
4242
("i686", "x86"),
43+
("mips64", "mips64"),
4344
("mips", "mips"),
4445
("msp430", "msp430"),
4546
("powerpc", "powerpc"),

0 commit comments

Comments
 (0)