From ead7d15772587cecff69d8b8fac3b5122ff2b98c Mon Sep 17 00:00:00 2001
From: Andrew Kelley <andrew@ziglang.org>
Date: Thu, 23 Jan 2020 00:41:34 -0500
Subject: [PATCH] use an older arm64 sub-arch for test suite

hopefully this avoids the older qemu version crashing
---
 lib/std/target.zig         |  2 +-
 lib/std/target/aarch64.zig |  6 ------
 test/tests.zig             | 24 ++++++++++++------------
 3 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/lib/std/target.zig b/lib/std/target.zig
index 6457216676..5dcbb962be 100644
--- a/lib/std/target.zig
+++ b/lib/std/target.zig
@@ -468,7 +468,7 @@ pub const Target = union(enum) {
             };
             const cpu = switch (arch) {
                 .arm, .armeb, .thumb, .thumbeb => &arm.cpu.generic,
-                .aarch64, .aarch64_be, .aarch64_32 => &aarch64.cpu.baseline,
+                .aarch64, .aarch64_be, .aarch64_32 => &aarch64.cpu.generic,
                 .avr => &avr.cpu.avr1,
                 .bpfel, .bpfeb => &bpf.cpu.generic,
                 .hexagon => &hexagon.cpu.generic,
diff --git a/lib/std/target/aarch64.zig b/lib/std/target/aarch64.zig
index 4d05a94290..4639fe6dcc 100644
--- a/lib/std/target/aarch64.zig
+++ b/lib/std/target/aarch64.zig
@@ -1225,11 +1225,6 @@ pub const cpu = struct {
             .cyclone,
         }),
     };
-    pub const baseline = Cpu{
-        .name = "baseline",
-        .llvm_name = null,
-        .features = featureSet(&[_]Feature{}),
-    };
     pub const cortex_a35 = Cpu{
         .name = "cortex_a35",
         .llvm_name = "cortex-a35",
@@ -1416,7 +1411,6 @@ pub const cpu = struct {
 /// compiler has inefficient memory and CPU usage, affecting build times.
 pub const all_cpus = &[_]*const Cpu{
     &cpu.apple_latest,
-    &cpu.baseline,
     &cpu.cortex_a35,
     &cpu.cortex_a53,
     &cpu.cortex_a55,
diff --git a/test/tests.zig b/test/tests.zig
index 1ec25d11ec..13cd2c3198 100644
--- a/test/tests.zig
+++ b/test/tests.zig
@@ -111,8 +111,8 @@ const test_targets = blk: {
             .target = Target{
                 .Cross = CrossTarget{
                     .os = .linux,
-                    .arch = Target.Arch{ .aarch64 = .v8_5a },
-                    .cpu_features = (Target.Arch{ .aarch64 = .v8_5a }).getBaselineCpuFeatures(),
+                    .arch = Target.Arch{ .aarch64 = .v8_1a },
+                    .cpu_features = (Target.Arch{ .aarch64 = .v8_1a }).getBaselineCpuFeatures(),
                     .abi = .none,
                 },
             },
@@ -121,8 +121,8 @@ const test_targets = blk: {
             .target = Target{
                 .Cross = CrossTarget{
                     .os = .linux,
-                    .arch = Target.Arch{ .aarch64 = .v8_5a },
-                    .cpu_features = (Target.Arch{ .aarch64 = .v8_5a }).getBaselineCpuFeatures(),
+                    .arch = Target.Arch{ .aarch64 = .v8_1a },
+                    .cpu_features = (Target.Arch{ .aarch64 = .v8_1a }).getBaselineCpuFeatures(),
                     .abi = .musl,
                 },
             },
@@ -132,8 +132,8 @@ const test_targets = blk: {
             .target = Target{
                 .Cross = CrossTarget{
                     .os = .linux,
-                    .arch = Target.Arch{ .aarch64 = .v8_5a },
-                    .cpu_features = (Target.Arch{ .aarch64 = .v8_5a }).getBaselineCpuFeatures(),
+                    .arch = Target.Arch{ .aarch64 = .v8_1a },
+                    .cpu_features = (Target.Arch{ .aarch64 = .v8_1a }).getBaselineCpuFeatures(),
                     .abi = .gnu,
                 },
             },
@@ -144,8 +144,8 @@ const test_targets = blk: {
             .target = Target{
                 .Cross = CrossTarget{
                     .os = .linux,
-                    .arch = Target.Arch{ .arm = .v8_5a },
-                    .cpu_features = (Target.Arch{ .arm = .v8_5a }).getBaselineCpuFeatures(),
+                    .arch = Target.Arch{ .arm = .v8_1a },
+                    .cpu_features = (Target.Arch{ .arm = .v8_1a }).getBaselineCpuFeatures(),
                     .abi = .none,
                 },
             },
@@ -154,8 +154,8 @@ const test_targets = blk: {
             .target = Target{
                 .Cross = CrossTarget{
                     .os = .linux,
-                    .arch = Target.Arch{ .arm = .v8_5a },
-                    .cpu_features = (Target.Arch{ .arm = .v8_5a }).getBaselineCpuFeatures(),
+                    .arch = Target.Arch{ .arm = .v8_1a },
+                    .cpu_features = (Target.Arch{ .arm = .v8_1a }).getBaselineCpuFeatures(),
                     .abi = .musleabihf,
                 },
             },
@@ -166,8 +166,8 @@ const test_targets = blk: {
         //    .target = Target{
         //        .Cross = CrossTarget{
         //            .os = .linux,
-        //            .arch = Target.Arch{ .arm = .v8_5a },
-        //            .cpu_features = (Target.Arch{ .arm = .v8_5a }).getBaselineCpuFeatures(),
+        //            .arch = Target.Arch{ .arm = .v8_1a },
+        //            .cpu_features = (Target.Arch{ .arm = .v8_1a }).getBaselineCpuFeatures(),
         //            .abi = .gnueabihf,
         //        },
         //    },