From db542b884d80bd4fa79862f62e07951a4a9d7045 Mon Sep 17 00:00:00 2001
From: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Date: Sun, 23 Dec 2018 13:29:40 +0100
Subject: [PATCH 1/2] test: Ignore ui/target-feature-gate on s390x

---
 src/test/ui/target-feature-gate.rs     | 1 +
 src/test/ui/target-feature-gate.stderr | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/test/ui/target-feature-gate.rs b/src/test/ui/target-feature-gate.rs
index cb0938b861c05..9f3a7b5e92462 100644
--- a/src/test/ui/target-feature-gate.rs
+++ b/src/test/ui/target-feature-gate.rs
@@ -19,6 +19,7 @@
 // ignore-powerpc64le
 // ignore-sparc
 // ignore-sparc64
+// ignore-s390x
 // gate-test-sse4a_target_feature
 // gate-test-powerpc_target_feature
 // gate-test-avx512_target_feature
diff --git a/src/test/ui/target-feature-gate.stderr b/src/test/ui/target-feature-gate.stderr
index d7154324d12fe..73da67a9b8fc9 100644
--- a/src/test/ui/target-feature-gate.stderr
+++ b/src/test/ui/target-feature-gate.stderr
@@ -1,5 +1,5 @@
 error[E0658]: the target feature `avx512bw` is currently unstable (see issue #44839)
-  --> $DIR/target-feature-gate.rs:36:18
+  --> $DIR/target-feature-gate.rs:37:18
    |
 LL | #[target_feature(enable = "avx512bw")]
    |                  ^^^^^^^^^^^^^^^^^^^

From ecdbcada5de5c4e3d5d46920658f3c4688923659 Mon Sep 17 00:00:00 2001
From: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Date: Sun, 23 Dec 2018 13:32:03 +0100
Subject: [PATCH 2/2] test: Ignore codegen/x86_mmx.rs on s390x

---
 src/test/codegen/x86_mmx.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/test/codegen/x86_mmx.rs b/src/test/codegen/x86_mmx.rs
index 4424c30e0f875..0fd3d5424383f 100644
--- a/src/test/codegen/x86_mmx.rs
+++ b/src/test/codegen/x86_mmx.rs
@@ -18,6 +18,7 @@
 // ignore-powerpc64le
 // ignore-sparc
 // ignore-sparc64
+// ignore-s390x
 // compile-flags: -O
 
 #![feature(repr_simd)]