mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-06 14:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "x86" CPU model (not arch) back to "i386"

Browse Source 
PR #13101 recently renamed the "i386" architecture to "x86", and it
seems the specific CPU model got swept up in that. "x86" is an umbrella
term that describes a family of CPUs, and the "i386" is the oldest
supported model under that umbrella.
This commit is contained in:
Jay Petacat 2022-11-05 21:26:33 -06:00 committed by Jakub Konka
parent 1aeef29733
commit 694d8831c3
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/std/target.zig
View File

@ -1377,7 +1377,7 @@ pub const Target = struct {
.sparc, .sparcel => &sparc.cpu.generic, .sparc, .sparcel => &sparc.cpu.generic,
.sparc64 => &sparc.cpu.v9, // 64-bit SPARC needs v9 as the baseline .sparc64 => &sparc.cpu.v9, // 64-bit SPARC needs v9 as the baseline
.s390x => &s390x.cpu.generic, .s390x => &s390x.cpu.generic,
.x86 => &x86.cpu.x86, .x86 => &x86.cpu.i386,
.x86_64 => &x86.cpu.x86_64, .x86_64 => &x86.cpu.x86_64,
.nvptx, .nvptx64 => &nvptx.cpu.sm_20, .nvptx, .nvptx64 => &nvptx.cpu.sm_20,
.ve => &ve.cpu.generic, .ve => &ve.cpu.generic,

4
lib/std/target/x86.zig
View File

@ -2040,8 +2040,8 @@ pub const cpu = struct {
.xsaveopt, .xsaveopt,
}), }),
}; };
pub const x86 = CpuModel{ pub const @"i386" = CpuModel{
.name = "x86", .name = "i386",
.llvm_name = "i386", .llvm_name = "i386",
.features = featureSet(&[_]Feature{ .features = featureSet(&[_]Feature{
.slow_unaligned_mem_16, .slow_unaligned_mem_16,

2
lib/std/zig/system/x86.zig
View File

@ -80,7 +80,7 @@ fn detectIntelProcessor(cpu: *Target.Cpu, family: u32, model: u32, brand_id: u32
} }
switch (family) { switch (family) {
3 => { 3 => {
cpu.model = &Target.x86.cpu.x86; cpu.model = &Target.x86.cpu.i386;
return; return;
}, },
4 => { 4 => {