mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-20 00:08:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

update/apply CPU features when -mcpu native

Browse Source 
- fix: features were not applied if cpu is specified as native
This commit is contained in:
Michael Dusan 2020-03-11 19:33:11 -04:00
parent e0fe0f7f1e
commit c988167377
No known key found for this signature in database
GPG Key ID: ED4C5BA849FA1B74
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/std/zig/system.zig
View File

@ -325,22 +325,19 @@ pub const NativeTargetInfo = struct {
// native CPU architecture as being different than the current target), we use this:
const cpu_arch = cross_target.getCpuArch();
const cpu = switch (cross_target.cpu_model) {
var cpu = switch (cross_target.cpu_model) {
.native => detectNativeCpuAndFeatures(cpu_arch, os, cross_target),
.baseline => baselineCpuAndFeatures(cpu_arch, cross_target),
.baseline => Target.Cpu.baseline(cpu_arch),
.determined_by_cpu_arch => if (cross_target.cpu_arch == null)
detectNativeCpuAndFeatures(cpu_arch, os, cross_target)
else
baselineCpuAndFeatures(cpu_arch, cross_target),
.explicit => |model| blk: {
var adjusted_model = model.toCpu(cpu_arch);
cross_target.updateCpuFeatures(&adjusted_model.features);
break :blk adjusted_model;
},
Target.Cpu.baseline(cpu_arch),
.explicit => |model| model.toCpu(cpu_arch),
} orelse backup_cpu_detection: {
cpu_detection_unimplemented = true;
break :backup_cpu_detection baselineCpuAndFeatures(cpu_arch, cross_target);
break :backup_cpu_detection Target.Cpu.baseline(cpu_arch);
};
cross_target.updateCpuFeatures(&cpu.features);
var target = try detectAbiAndDynamicLinker(allocator, cpu, os, cross_target);
target.cpu_detection_unimplemented = cpu_detection_unimplemented;
@ -884,10 +881,4 @@ pub const NativeTargetInfo = struct {
},
}
}
fn baselineCpuAndFeatures(cpu_arch: Target.Cpu.Arch, cross_target: CrossTarget) Target.Cpu {
var adjusted_baseline = Target.Cpu.baseline(cpu_arch);
cross_target.updateCpuFeatures(&adjusted_baseline.features);
return adjusted_baseline;
}
};