diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2022-11-05 02:34:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-05 02:34:24 -0400 |
| commit | 1d680459197e7ba5e163d99e07fdfe54c2ad9225 (patch) | |
| tree | 3e95a4d15194369e1640dc508ebe9c064f11fb63 /src/Sema.zig | |
| parent | e9a12491f6fe5e38a05eeef0e920f2dec23634a4 (diff) | |
| parent | 986b7ce5b27d5aa5fb2f31d70fd2cd863926bcba (diff) | |
| download | zig-1d680459197e7ba5e163d99e07fdfe54c2ad9225.tar.gz zig-1d680459197e7ba5e163d99e07fdfe54c2ad9225.zip | |
Merge pull request #13101 from alichraghi/o4
Diffstat (limited to 'src/Sema.zig')
| -rw-r--r-- | src/Sema.zig | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/Sema.zig b/src/Sema.zig index f3aa861b5c..3a36cbf2f5 100644 --- a/src/Sema.zig +++ b/src/Sema.zig @@ -8415,20 +8415,20 @@ fn funcCommon( if (switch (cc_workaround) { .Unspecified, .C, .Naked, .Async, .Inline => null, .Interrupt => switch (arch) { - .i386, .x86_64, .avr, .msp430 => null, - else => @as([]const u8, "i386, x86_64, AVR, and MSP430"), + .x86, .x86_64, .avr, .msp430 => null, + else => @as([]const u8, "x86, x86_64, AVR, and MSP430"), }, .Signal => switch (arch) { .avr => null, else => @as([]const u8, "AVR"), }, .Stdcall, .Fastcall, .Thiscall => switch (arch) { - .i386 => null, - else => @as([]const u8, "i386"), + .x86 => null, + else => @as([]const u8, "x86"), }, .Vectorcall => switch (arch) { - .i386, .aarch64, .aarch64_be, .aarch64_32 => null, - else => @as([]const u8, "i386 and AArch64"), + .x86, .aarch64, .aarch64_be, .aarch64_32 => null, + else => @as([]const u8, "x86 and AArch64"), }, .APCS, .AAPCS, .AAPCSVFP => switch (arch) { .arm, .armeb, .aarch64, .aarch64_be, .aarch64_32, .thumb, .thumbeb => null, @@ -30813,7 +30813,7 @@ pub fn analyzeAddressSpace( const supported = switch (address_space) { .generic => true, - .gs, .fs, .ss => (arch == .i386 or arch == .x86_64) and ctx == .pointer, + .gs, .fs, .ss => (arch == .x86 or arch == .x86_64) and ctx == .pointer, // TODO: check that .shared and .local are left uninitialized .param => is_nv, .global, .shared, .local => is_gpu, |