mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-16 14:28:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

x86: detect and set 16bit_mode and 32bit_mode CPU features

Browse Source
This commit is contained in:
Andrew Kelley 2021-03-02 14:49:28 -07:00
parent 939f334221
commit 68c00122b1
1 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -326,11 +326,33 @@ pub const NativeTargetInfo = struct {
cpu_detection_unimplemented = true;
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;
return target;
var result = try detectAbiAndDynamicLinker(allocator, cpu, os, cross_target);
// For x86, we need to populate some CPU feature flags depending on architecture
// and mode:
// * 16bit_mode => if the abi is code16
// * 32bit_mode => if the arch is i386
// However, the "mode" flags can be used as overrides, so if the user explicitly
// sets one of them, that takes precedence.
switch (cpu_arch) {
.i386 => {
if (!std.Target.x86.featureSetHasAny(cross_target.cpu_features_add, .{
.@"16bit_mode", .@"32bit_mode",
})) {
switch (result.target.abi) {
.code16 => result.target.cpu.features.addFeature(
@enumToInt(std.Target.x86.Feature.@"16bit_mode"),
),
else => result.target.cpu.features.addFeature(
@enumToInt(std.Target.x86.Feature.@"32bit_mode"),
),
}
}
},
else => {},
}
cross_target.updateCpuFeatures(&result.target.cpu.features);
result.cpu_detection_unimplemented = cpu_detection_unimplemented;
return result;
}
/// First we attempt to use the executable's own binary. If it is dynamically