Commit 694d8831c3

Jay Petacat <jay@jayschwa.net>
2022-11-06 04:26:33
Revert "x86" CPU model (not arch) back to "i386"
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.
master
1 parent 1aeef29
Changed files (3)
lib
std
target
x86.zig
zig
system
x86.zig
target.zig
lib/std/target/x86.zig
@@ -2040,8 +2040,8 @@ pub const cpu = struct {
             .xsaveopt,
         }),
     };
-    pub const x86 = CpuModel{
-        .name = "x86",
+    pub const @"i386" = CpuModel{
+        .name = "i386",
         .llvm_name = "i386",
         .features = featureSet(&[_]Feature{
             .slow_unaligned_mem_16,
lib/std/zig/system/x86.zig
@@ -80,7 +80,7 @@ fn detectIntelProcessor(cpu: *Target.Cpu, family: u32, model: u32, brand_id: u32
     }
     switch (family) {
         3 => {
-            cpu.model = &Target.x86.cpu.x86;
+            cpu.model = &Target.x86.cpu.i386;
             return;
         },
         4 => {
lib/std/target.zig
@@ -1377,7 +1377,7 @@ pub const Target = struct {
                     .sparc, .sparcel => &sparc.cpu.generic,
                     .sparc64 => &sparc.cpu.v9, // 64-bit SPARC needs v9 as the baseline
                     .s390x => &s390x.cpu.generic,
-                    .x86 => &x86.cpu.x86,
+                    .x86 => &x86.cpu.i386,
                     .x86_64 => &x86.cpu.x86_64,
                     .nvptx, .nvptx64 => &nvptx.cpu.sm_20,
                     .ve => &ve.cpu.generic,