Skip to content

Commit 0c6dfa6

Browse files
mikdusanandrewrk
authored andcommitted
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
1 parent 10f2d62 commit 0c6dfa6

File tree

3 files changed

+8
-9
lines changed

3 files changed

+8
-9
lines changed

lib/std/target.zig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -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",

0 commit comments

Comments
 (0)