Nixyri/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2024-11-15 00:26:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

use an older arm64 sub-arch for test suite

Browse Source 
hopefully this avoids the older qemu version crashing
This commit is contained in:
Andrew Kelley 2020-01-23 00:41:34 -05:00
parent 9845264a0b
commit ead7d15772
No known key found for this signature in database
GPG Key ID: 7C5F548F728501A9
3 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/std/target.zig
View File

@ -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,

6
lib/std/target/aarch64.zig
View File

@ -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,

24
test/tests.zig
View File

@ -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,
// },
// },