From e555854f9d738a1a786ca61875390c3aca777a8d Mon Sep 17 00:00:00 2001
From: "Felix S. Klock II" <pnkfelix@pnkfx.org>
Date: Fri, 22 Feb 2019 15:13:07 +0100
Subject: [PATCH 1/2] Make target pointer-width specific variants of (very old)
 huge-array-simple.rs test.

(and now unignore the test since it shouldn't break tests of
cross-compiles anymore.)
---
 src/test/ui/huge-array-simple.rs     | 13 +++++++++----
 src/test/ui/huge-array-simple.stderr |  4 ++++
 2 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 src/test/ui/huge-array-simple.stderr

diff --git a/src/test/ui/huge-array-simple.rs b/src/test/ui/huge-array-simple.rs
index 5fa874c1fa0d3..8b244a47232fa 100644
--- a/src/test/ui/huge-array-simple.rs
+++ b/src/test/ui/huge-array-simple.rs
@@ -1,11 +1,16 @@
-// FIXME (#23926): the error output is not consistent between a
-// self-hosted and a cross-compiled setup. Skipping for now.
-
-// ignore-test FIXME(#23926)
+// error-pattern: too big for the current architecture
 
+// normalize-stderr-test "; \d+]" -> "; N]"
 #![allow(exceeding_bitshifts)]
 
+#[cfg(target_pointer_width = "64")]
 fn main() {
     let _fat : [u8; (1<<61)+(1<<31)] =
         [0; (1u64<<61) as usize +(1u64<<31) as usize];
 }
+
+#[cfg(target_pointer_width = "32")]
+fn main() {
+    let _fat : [u8; (1<<31)+(1<<15)] =
+        [0; (1u32<<31) as usize +(1u32<<15) as usize];
+}
diff --git a/src/test/ui/huge-array-simple.stderr b/src/test/ui/huge-array-simple.stderr
new file mode 100644
index 0000000000000..3e9c86296cec2
--- /dev/null
+++ b/src/test/ui/huge-array-simple.stderr
@@ -0,0 +1,4 @@
+error: the type `[u8; N]` is too big for the current architecture
+
+error: aborting due to previous error
+

From b72ba0559cab28ab88c9397ece9e5e4b193bdc89 Mon Sep 17 00:00:00 2001
From: "Felix S. Klock II" <pnkfelix@pnkfx.org>
Date: Fri, 22 Feb 2019 16:07:15 +0100
Subject: [PATCH 2/2] Switch from error patterns to `//~ ERROR` markers.

AFAICT, we do not have the same const-eval issues that we used to when
rust-lang/rust#23926 was filed. (Probably because of the switch to
miri for const-evaluation.)
---
 src/test/ui/consts/const-eval/const-eval-overflow-3.rs |  9 +++++----
 .../ui/consts/const-eval/const-eval-overflow-3b.rs     | 10 ++++++----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/test/ui/consts/const-eval/const-eval-overflow-3.rs b/src/test/ui/consts/const-eval/const-eval-overflow-3.rs
index 95deb04fb01d5..6fd8e9cbc806b 100644
--- a/src/test/ui/consts/const-eval/const-eval-overflow-3.rs
+++ b/src/test/ui/consts/const-eval/const-eval-overflow-3.rs
@@ -3,11 +3,11 @@
 //
 // This test is checking the count in an array expression.
 
-// FIXME (#23926): the error output is not consistent between a
-// self-hosted and a cross-compiled setup; therefore resorting to
-// error-pattern for now.
 
-// error-pattern: attempt to add with overflow
+
+
+
+
 
 #![allow(unused_imports)]
 
@@ -18,6 +18,7 @@ use std::{u8, u16, u32, u64, usize};
 const A_I8_I
     : [u32; (i8::MAX as usize) + 1]
     = [0; (i8::MAX + 1) as usize];
+//~^ ERROR evaluation of constant value failed
 
 fn main() {
     foo(&A_I8_I[..]);
diff --git a/src/test/ui/consts/const-eval/const-eval-overflow-3b.rs b/src/test/ui/consts/const-eval/const-eval-overflow-3b.rs
index 5a6be0c9bd38b..d9b06370dff79 100644
--- a/src/test/ui/consts/const-eval/const-eval-overflow-3b.rs
+++ b/src/test/ui/consts/const-eval/const-eval-overflow-3b.rs
@@ -7,11 +7,11 @@
 // types for the left- and right-hand sides of the addition do not
 // match (as well as overflow).
 
-// FIXME (#23926): the error output is not consistent between a
-// self-hosted and a cross-compiled setup; therefore resorting to
-// error-pattern for now.
 
-// error-pattern: mismatched types
+
+
+
+
 
 #![allow(unused_imports)]
 
@@ -22,6 +22,8 @@ use std::{u8, u16, u32, u64, usize};
 const A_I8_I
     : [u32; (i8::MAX as usize) + 1]
     = [0; (i8::MAX + 1u8) as usize];
+//~^ ERROR mismatched types
+//~| ERROR cannot add `u8` to `i8`
 
 fn main() {
     foo(&A_I8_I[..]);