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) {...@@ -468,7 +468,7 @@ pub const Target = union(enum) {
468 };468 };
469 const cpu = switch (arch) {469 const cpu = switch (arch) {
470 .arm, .armeb, .thumb, .thumbeb => &arm.cpu.generic,470 .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,
472 .avr => &avr.cpu.avr1,472 .avr => &avr.cpu.avr1,
473 .bpfel, .bpfeb => &bpf.cpu.generic,473 .bpfel, .bpfeb => &bpf.cpu.generic,
474 .hexagon => &hexagon.cpu.generic,474 .hexagon => &hexagon.cpu.generic,
lib/std/target/aarch64.zig-6
...@@ -1225,11 +1225,6 @@ pub const cpu = struct {...@@ -1225,11 +1225,6 @@ pub const cpu = struct {
1225 .cyclone,1225 .cyclone,
1226 }),1226 }),
1227 };1227 };
1228 pub const baseline = Cpu{
1229 .name = "baseline",
1230 .llvm_name = null,
1231 .features = featureSet(&[_]Feature{}),
1232 };
1233 pub const cortex_a35 = Cpu{1228 pub const cortex_a35 = Cpu{
1234 .name = "cortex_a35",1229 .name = "cortex_a35",
1235 .llvm_name = "cortex-a35",1230 .llvm_name = "cortex-a35",
...@@ -1416,7 +1411,6 @@ pub const cpu = struct {...@@ -1416,7 +1411,6 @@ pub const cpu = struct {
1416/// compiler has inefficient memory and CPU usage, affecting build times.1411/// compiler has inefficient memory and CPU usage, affecting build times.
1417pub const all_cpus = &[_]*const Cpu{1412pub const all_cpus = &[_]*const Cpu{
1418 &cpu.apple_latest,1413 &cpu.apple_latest,
1419 &cpu.baseline,
1420 &cpu.cortex_a35,1414 &cpu.cortex_a35,
1421 &cpu.cortex_a53,1415 &cpu.cortex_a53,
1422 &cpu.cortex_a55,1416 &cpu.cortex_a55,
test/tests.zig+12-12
...@@ -111,8 +111,8 @@ const test_targets = blk: {...@@ -111,8 +111,8 @@ const test_targets = blk: {
111 .target = Target{111 .target = Target{
112 .Cross = CrossTarget{112 .Cross = CrossTarget{
113 .os = .linux,113 .os = .linux,
114 .arch = Target.Arch{ .aarch64 = .v8_5a },114 .arch = Target.Arch{ .aarch64 = .v8_1a },
115 .cpu_features = (Target.Arch{ .aarch64 = .v8_5a }).getBaselineCpuFeatures(),115 .cpu_features = (Target.Arch{ .aarch64 = .v8_1a }).getBaselineCpuFeatures(),
116 .abi = .none,116 .abi = .none,
117 },117 },
118 },118 },
...@@ -121,8 +121,8 @@ const test_targets = blk: {...@@ -121,8 +121,8 @@ const test_targets = blk: {
121 .target = Target{121 .target = Target{
122 .Cross = CrossTarget{122 .Cross = CrossTarget{
123 .os = .linux,123 .os = .linux,
124 .arch = Target.Arch{ .aarch64 = .v8_5a },124 .arch = Target.Arch{ .aarch64 = .v8_1a },
125 .cpu_features = (Target.Arch{ .aarch64 = .v8_5a }).getBaselineCpuFeatures(),125 .cpu_features = (Target.Arch{ .aarch64 = .v8_1a }).getBaselineCpuFeatures(),
126 .abi = .musl,126 .abi = .musl,
127 },127 },
128 },128 },
...@@ -132,8 +132,8 @@ const test_targets = blk: {...@@ -132,8 +132,8 @@ const test_targets = blk: {
132 .target = Target{132 .target = Target{
133 .Cross = CrossTarget{133 .Cross = CrossTarget{
134 .os = .linux,134 .os = .linux,
135 .arch = Target.Arch{ .aarch64 = .v8_5a },135 .arch = Target.Arch{ .aarch64 = .v8_1a },
136 .cpu_features = (Target.Arch{ .aarch64 = .v8_5a }).getBaselineCpuFeatures(),136 .cpu_features = (Target.Arch{ .aarch64 = .v8_1a }).getBaselineCpuFeatures(),
137 .abi = .gnu,137 .abi = .gnu,
138 },138 },
139 },139 },
...@@ -144,8 +144,8 @@ const test_targets = blk: {...@@ -144,8 +144,8 @@ const test_targets = blk: {
144 .target = Target{144 .target = Target{
145 .Cross = CrossTarget{145 .Cross = CrossTarget{
146 .os = .linux,146 .os = .linux,
147 .arch = Target.Arch{ .arm = .v8_5a },147 .arch = Target.Arch{ .arm = .v8_1a },
148 .cpu_features = (Target.Arch{ .arm = .v8_5a }).getBaselineCpuFeatures(),148 .cpu_features = (Target.Arch{ .arm = .v8_1a }).getBaselineCpuFeatures(),
149 .abi = .none,149 .abi = .none,
150 },150 },
151 },151 },
...@@ -154,8 +154,8 @@ const test_targets = blk: {...@@ -154,8 +154,8 @@ const test_targets = blk: {
154 .target = Target{154 .target = Target{
155 .Cross = CrossTarget{155 .Cross = CrossTarget{
156 .os = .linux,156 .os = .linux,
157 .arch = Target.Arch{ .arm = .v8_5a },157 .arch = Target.Arch{ .arm = .v8_1a },
158 .cpu_features = (Target.Arch{ .arm = .v8_5a }).getBaselineCpuFeatures(),158 .cpu_features = (Target.Arch{ .arm = .v8_1a }).getBaselineCpuFeatures(),
159 .abi = .musleabihf,159 .abi = .musleabihf,
160 },160 },
161 },161 },
...@@ -166,8 +166,8 @@ const test_targets = blk: {...@@ -166,8 +166,8 @@ const test_targets = blk: {
166 // .target = Target{166 // .target = Target{
167 // .Cross = CrossTarget{167 // .Cross = CrossTarget{
168 // .os = .linux,168 // .os = .linux,
169 // .arch = Target.Arch{ .arm = .v8_5a },169 // .arch = Target.Arch{ .arm = .v8_1a },
170 // .cpu_features = (Target.Arch{ .arm = .v8_5a }).getBaselineCpuFeatures(),170 // .cpu_features = (Target.Arch{ .arm = .v8_1a }).getBaselineCpuFeatures(),
171 // .abi = .gnueabihf,171 // .abi = .gnueabihf,
172 // },172 // },
173 // },173 // },