authorgravatar for michael.dusan@gmail.comMichael Dusan <michael.dusan@gmail.com> 2021-04-20 12:11:20-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-04-20 16:19:59-04:00
log0c6dfa6f0c057a7517f889e360a985cb62a2d91f
treee6b8a2c4537a1e5e8b9ac9169022e8e2f4e2326f
parent10f2d6278946485f057f65bbb3c094a6fcde1adf

target: drop `ppc32` and prefer `ppc`

- original PR #7949 (incorrectly) patched a generated-file and changes have subsequently been lost/overwritten - fix #7947 in a different way: drop `ppc32` because `ppc` already exists

3 files changed, 8 insertions(+), 9 deletions(-)

lib/std/target.zig+2-2
......@@ -1184,8 +1184,8 @@ pub const Target = struct {
11841184 .mips, .mipsel => &mips.cpu.mips32,
11851185 .mips64, .mips64el => &mips.cpu.mips64,
11861186 .msp430 => &msp430.cpu.generic,
1187 .powerpc => &powerpc.cpu.ppc32,
1188 .powerpcle => &powerpc.cpu.ppc32,
1187 .powerpc => &powerpc.cpu.ppc,
1188 .powerpcle => &powerpc.cpu.ppc,
11891189 .powerpc64 => &powerpc.cpu.ppc64,
11901190 .powerpc64le => &powerpc.cpu.ppc64le,
11911191 .amdgcn => &amdgpu.cpu.generic,
lib/std/target/powerpc.zig-7
......@@ -751,13 +751,6 @@ pub const cpu = struct {
751751 .hard_float,
752752 }),
753753 };
754 pub const ppc32 = CpuModel{
755 .name = "ppc32",
756 .llvm_name = "ppc32",
757 .features = featureSet(&[_]Feature{
758 .hard_float,
759 }),
760 };
761754 pub const ppc64 = CpuModel{
762755 .name = "ppc64",
763756 .llvm_name = "ppc64",
tools/update_cpu_features.zig+6
......@@ -663,6 +663,12 @@ const llvm_targets = [_]LlvmTarget{
663663 .zig_name = "powerpc",
664664 .llvm_name = "PowerPC",
665665 .td_name = "PPC.td",
666 .feature_overrides = &.{
667 .{
668 .llvm_name = "ppc32",
669 .omit = true,
670 },
671 },
666672 },
667673 .{
668674 .zig_name = "riscv",