authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2024-08-05 09:52:52-07:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2024-08-05 09:52:52-07:00
logfab5df4028f686a69330982b41ee880b5bdd4e04
tree4f74441cd6af69aa5dee5273c044ede0ddd8c392
parent388248ad337e0bbca05f2f40bf42c46bcdc61e47
parent27775f1a9eecc6142834affb524eadd33b9e56b7
signaturebadge-check Signed by PGP key B5690EEEBB952194

Merge pull request #20934 from alexrp/sparc32-leon3

`std.Target`: Bump baseline CPU for sparc32 to v9; add `sparcv9-linux-gnu` to `process_headers.zig`

2 files changed, 6 insertions(+), 7 deletions(-)

lib/std/Target.zig+1-1
...@@ -1502,7 +1502,7 @@ pub const Cpu = struct {...@@ -1502,7 +1502,7 @@ pub const Cpu = struct {
1502 .x86 => &x86.cpu.pentium4,1502 .x86 => &x86.cpu.pentium4,
1503 .nvptx, .nvptx64 => &nvptx.cpu.sm_20,1503 .nvptx, .nvptx64 => &nvptx.cpu.sm_20,
1504 .s390x => &s390x.cpu.arch8,1504 .s390x => &s390x.cpu.arch8,
1505 .sparc => &sparc.cpu.v8,1505 .sparc => &sparc.cpu.v9, // glibc does not work with 'plain' v8.
1506 .loongarch64 => &loongarch.cpu.loongarch64,1506 .loongarch64 => &loongarch.cpu.loongarch64,
15071507
1508 else => generic(arch),1508 else => generic(arch),
tools/process_headers.zig+5-6
...@@ -174,12 +174,11 @@ const glibc_targets = [_]LibCTarget{...@@ -174,12 +174,11 @@ const glibc_targets = [_]LibCTarget{
174 .arch = MultiArch{ .specific = Arch.s390x },174 .arch = MultiArch{ .specific = Arch.s390x },
175 .abi = MultiAbi{ .specific = Abi.gnu },175 .abi = MultiAbi{ .specific = Abi.gnu },
176 },176 },
177 // It's unclear which zig target this glibc sparcv9 target maps to.177 LibCTarget{
178 //LibCTarget{178 .name = "sparcv9-linux-gnu",
179 // .name = "sparcv9-linux-gnu",179 .arch = MultiArch{ .specific = Arch.sparc },
180 // .arch = MultiArch{ .specific = Arch.sparc },180 .abi = MultiAbi{ .specific = Abi.gnu },
181 // .abi = MultiAbi{ .specific = Abi.gnu },181 },
182 //},
183 LibCTarget{182 LibCTarget{
184 .name = "sparc64-linux-gnu",183 .name = "sparc64-linux-gnu",
185 .arch = MultiArch{ .specific = Arch.sparc64 },184 .arch = MultiArch{ .specific = Arch.sparc64 },