authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-01-23 00:41:34-05:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-01-23 00:41:46-05:00
logead7d15772587cecff69d8b8fac3b5122ff2b98c
tree09f4332cf8118d6276173c21d8a7c28cc5fae321
parent9845264a0bcb1347216a00dad0fd67fe79555485
signaturelock-open Commit is signed but in an unrecognized format.

use an older arm64 sub-arch for test suite

hopefully this avoids the older qemu version crashing

3 files changed, 13 insertions(+), 19 deletions(-)

lib/std/target.zig+1-1
......@@ -468,7 +468,7 @@ pub const Target = union(enum) {
468468 };
469469 const cpu = switch (arch) {
470470 .arm, .armeb, .thumb, .thumbeb => &arm.cpu.generic,
471 .aarch64, .aarch64_be, .aarch64_32 => &aarch64.cpu.baseline,
471 .aarch64, .aarch64_be, .aarch64_32 => &aarch64.cpu.generic,
472472 .avr => &avr.cpu.avr1,
473473 .bpfel, .bpfeb => &bpf.cpu.generic,
474474 .hexagon => &hexagon.cpu.generic,
lib/std/target/aarch64.zig-6
......@@ -1225,11 +1225,6 @@ pub const cpu = struct {
12251225 .cyclone,
12261226 }),
12271227 };
1228 pub const baseline = Cpu{
1229 .name = "baseline",
1230 .llvm_name = null,
1231 .features = featureSet(&[_]Feature{}),
1232 };
12331228 pub const cortex_a35 = Cpu{
12341229 .name = "cortex_a35",
12351230 .llvm_name = "cortex-a35",
......@@ -1416,7 +1411,6 @@ pub const cpu = struct {
14161411/// compiler has inefficient memory and CPU usage, affecting build times.
14171412pub const all_cpus = &[_]*const Cpu{
14181413 &cpu.apple_latest,
1419 &cpu.baseline,
14201414 &cpu.cortex_a35,
14211415 &cpu.cortex_a53,
14221416 &cpu.cortex_a55,
test/tests.zig+12-12
......@@ -111,8 +111,8 @@ const test_targets = blk: {
111111 .target = Target{
112112 .Cross = CrossTarget{
113113 .os = .linux,
114 .arch = Target.Arch{ .aarch64 = .v8_5a },
115 .cpu_features = (Target.Arch{ .aarch64 = .v8_5a }).getBaselineCpuFeatures(),
114 .arch = Target.Arch{ .aarch64 = .v8_1a },
115 .cpu_features = (Target.Arch{ .aarch64 = .v8_1a }).getBaselineCpuFeatures(),
116116 .abi = .none,
117117 },
118118 },
......@@ -121,8 +121,8 @@ const test_targets = blk: {
121121 .target = Target{
122122 .Cross = CrossTarget{
123123 .os = .linux,
124 .arch = Target.Arch{ .aarch64 = .v8_5a },
125 .cpu_features = (Target.Arch{ .aarch64 = .v8_5a }).getBaselineCpuFeatures(),
124 .arch = Target.Arch{ .aarch64 = .v8_1a },
125 .cpu_features = (Target.Arch{ .aarch64 = .v8_1a }).getBaselineCpuFeatures(),
126126 .abi = .musl,
127127 },
128128 },
......@@ -132,8 +132,8 @@ const test_targets = blk: {
132132 .target = Target{
133133 .Cross = CrossTarget{
134134 .os = .linux,
135 .arch = Target.Arch{ .aarch64 = .v8_5a },
136 .cpu_features = (Target.Arch{ .aarch64 = .v8_5a }).getBaselineCpuFeatures(),
135 .arch = Target.Arch{ .aarch64 = .v8_1a },
136 .cpu_features = (Target.Arch{ .aarch64 = .v8_1a }).getBaselineCpuFeatures(),
137137 .abi = .gnu,
138138 },
139139 },
......@@ -144,8 +144,8 @@ const test_targets = blk: {
144144 .target = Target{
145145 .Cross = CrossTarget{
146146 .os = .linux,
147 .arch = Target.Arch{ .arm = .v8_5a },
148 .cpu_features = (Target.Arch{ .arm = .v8_5a }).getBaselineCpuFeatures(),
147 .arch = Target.Arch{ .arm = .v8_1a },
148 .cpu_features = (Target.Arch{ .arm = .v8_1a }).getBaselineCpuFeatures(),
149149 .abi = .none,
150150 },
151151 },
......@@ -154,8 +154,8 @@ const test_targets = blk: {
154154 .target = Target{
155155 .Cross = CrossTarget{
156156 .os = .linux,
157 .arch = Target.Arch{ .arm = .v8_5a },
158 .cpu_features = (Target.Arch{ .arm = .v8_5a }).getBaselineCpuFeatures(),
157 .arch = Target.Arch{ .arm = .v8_1a },
158 .cpu_features = (Target.Arch{ .arm = .v8_1a }).getBaselineCpuFeatures(),
159159 .abi = .musleabihf,
160160 },
161161 },
......@@ -166,8 +166,8 @@ const test_targets = blk: {
166166 // .target = Target{
167167 // .Cross = CrossTarget{
168168 // .os = .linux,
169 // .arch = Target.Arch{ .arm = .v8_5a },
170 // .cpu_features = (Target.Arch{ .arm = .v8_5a }).getBaselineCpuFeatures(),
169 // .arch = Target.Arch{ .arm = .v8_1a },
170 // .cpu_features = (Target.Arch{ .arm = .v8_1a }).getBaselineCpuFeatures(),
171171 // .abi = .gnueabihf,
172172 // },
173173 // },