diff options
| author | bors <bors@rust-lang.org> | 2018-03-30 04:17:05 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-03-30 04:17:05 +0000 |
| commit | d8a1bc73f742d5c1e747270bdc8b5a6e97ba3bb1 (patch) | |
| tree | 59ac1ead4709d7b31c16dcab52e9511f905ae761 /src/test/codegen | |
| parent | 15e8c5d8466ae40c1ef9b2a1d96f9cd2c4dcccf0 (diff) | |
| parent | 67e0c2b52939de562fb06910295a6247750c11bc (diff) | |
| download | rust-d8a1bc73f742d5c1e747270bdc8b5a6e97ba3bb1.tar.gz rust-d8a1bc73f742d5c1e747270bdc8b5a6e97ba3bb1.zip | |
Auto merge of #49489 - kennytm:rollup, r=kennytm
Rollup of 10 pull requests - Successful merges: #49443, #49445, #49446, #49463, #49464, #49466, #49468, #49473, #49484, #49486 - Failed merges:
Diffstat (limited to 'src/test/codegen')
| -rw-r--r-- | src/test/codegen/stack-probes.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/test/codegen/stack-probes.rs b/src/test/codegen/stack-probes.rs index af400ff3bcb..51ebc42a0dd 100644 --- a/src/test/codegen/stack-probes.rs +++ b/src/test/codegen/stack-probes.rs @@ -13,6 +13,7 @@ // ignore-mips // ignore-mips64 // ignore-powerpc +// ignore-s390x // ignore-wasm // ignore-emscripten // ignore-windows |