diff options
| author | bors <bors@rust-lang.org> | 2018-03-22 16:58:57 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-03-22 16:58:57 +0000 |
| commit | 5092c6b01acbff60935a5e6d84f83b6c73c1ca5e (patch) | |
| tree | bdc8568384c95b430e9bb324b82a876d98b1f56a /src/test/codegen | |
| parent | b176285ba775f86301040fc624acb96b4499f562 (diff) | |
| parent | 2c6f911463efa6c2d87e5566fc1cd77a7d26509a (diff) | |
| download | rust-5092c6b01acbff60935a5e6d84f83b6c73c1ca5e.tar.gz rust-5092c6b01acbff60935a5e6d84f83b6c73c1ca5e.zip | |
Auto merge of #49264 - kennytm:rollup, r=kennytm
Rollup of 23 pull requests - Successful merges: #48374, #48596, #48759, #48939, #49029, #49069, #49093, #49109, #49117, #49140, #49158, #49188, #49189, #49209, #49211, #49216, #49225, #49231, #49234, #49242, #49244, #49105, #49038 - Failed merges:
Diffstat (limited to 'src/test/codegen')
| -rw-r--r-- | src/test/codegen/abi-main-signature-16bit-c-int.rs | 1 | ||||
| -rw-r--r-- | src/test/codegen/fastcall-inreg.rs | 2 | ||||
| -rw-r--r-- | src/test/codegen/global_asm.rs | 2 | ||||
| -rw-r--r-- | src/test/codegen/global_asm_include.rs | 2 | ||||
| -rw-r--r-- | src/test/codegen/global_asm_x2.rs | 2 | ||||
| -rw-r--r-- | src/test/codegen/repr-transparent-aggregates-1.rs | 1 |
6 files changed, 10 insertions, 0 deletions
diff --git a/src/test/codegen/abi-main-signature-16bit-c-int.rs b/src/test/codegen/abi-main-signature-16bit-c-int.rs index 707531bf376..367d509cadf 100644 --- a/src/test/codegen/abi-main-signature-16bit-c-int.rs +++ b/src/test/codegen/abi-main-signature-16bit-c-int.rs @@ -19,6 +19,7 @@ // ignore-mips // ignore-mips64 // ignore-powerpc +// ignore-powerpc64 // ignore-s390x // ignore-sparc // ignore-wasm32 diff --git a/src/test/codegen/fastcall-inreg.rs b/src/test/codegen/fastcall-inreg.rs index 9bfe47d0a1f..d6dd3f356b5 100644 --- a/src/test/codegen/fastcall-inreg.rs +++ b/src/test/codegen/fastcall-inreg.rs @@ -23,6 +23,8 @@ // ignore-mips // ignore-mips64 // ignore-msp430 +// ignore-powerpc64 +// ignore-powerpc64le // ignore-powerpc // ignore-r600 // ignore-amdgcn diff --git a/src/test/codegen/global_asm.rs b/src/test/codegen/global_asm.rs index 94b69a6cab5..6b79e79fa00 100644 --- a/src/test/codegen/global_asm.rs +++ b/src/test/codegen/global_asm.rs @@ -19,6 +19,8 @@ // ignore-mips // ignore-mips64 // ignore-msp430 +// ignore-powerpc64 +// ignore-powerpc64le // ignore-powerpc // ignore-r600 // ignore-amdgcn diff --git a/src/test/codegen/global_asm_include.rs b/src/test/codegen/global_asm_include.rs index c3688077f22..3f73a1cabbf 100644 --- a/src/test/codegen/global_asm_include.rs +++ b/src/test/codegen/global_asm_include.rs @@ -19,6 +19,8 @@ // ignore-mips // ignore-mips64 // ignore-msp430 +// ignore-powerpc64 +// ignore-powerpc64le // ignore-powerpc // ignore-r600 // ignore-amdgcn diff --git a/src/test/codegen/global_asm_x2.rs b/src/test/codegen/global_asm_x2.rs index 3b8fe43fa04..3e118a50d45 100644 --- a/src/test/codegen/global_asm_x2.rs +++ b/src/test/codegen/global_asm_x2.rs @@ -19,6 +19,8 @@ // ignore-mips // ignore-mips64 // ignore-msp430 +// ignore-powerpc64 +// ignore-powerpc64le // ignore-powerpc // ignore-r600 // ignore-amdgcn diff --git a/src/test/codegen/repr-transparent-aggregates-1.rs b/src/test/codegen/repr-transparent-aggregates-1.rs index 655e67cf7ee..2eeed2b788c 100644 --- a/src/test/codegen/repr-transparent-aggregates-1.rs +++ b/src/test/codegen/repr-transparent-aggregates-1.rs @@ -14,6 +14,7 @@ // ignore-mips // ignore-mips64 // ignore-powerpc +// ignore-powerpc64 // See repr-transparent.rs #![crate_type="lib"] |