From 0c6dfa6f0c057a7517f889e360a985cb62a2d91f Mon Sep 17 00:00:00 2001
From: Michael Dusan <michael.dusan@gmail.com>
Date: Tue, 20 Apr 2021 12:11:20 -0400
Subject: [PATCH] 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
---
 lib/std/target.zig            | 4 ++--
 lib/std/target/powerpc.zig    | 7 -------
 tools/update_cpu_features.zig | 6 ++++++
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/lib/std/target.zig b/lib/std/target.zig
index 3372f617a8..c741ea225f 100644
--- a/lib/std/target.zig
+++ b/lib/std/target.zig
@@ -1184,8 +1184,8 @@ pub const Target = struct {
                     .mips, .mipsel => &mips.cpu.mips32,
                     .mips64, .mips64el => &mips.cpu.mips64,
                     .msp430 => &msp430.cpu.generic,
-                    .powerpc => &powerpc.cpu.ppc32,
-                    .powerpcle => &powerpc.cpu.ppc32,
+                    .powerpc => &powerpc.cpu.ppc,
+                    .powerpcle => &powerpc.cpu.ppc,
                     .powerpc64 => &powerpc.cpu.ppc64,
                     .powerpc64le => &powerpc.cpu.ppc64le,
                     .amdgcn => &amdgpu.cpu.generic,
diff --git a/lib/std/target/powerpc.zig b/lib/std/target/powerpc.zig
index 4e2200a47f..db4d5dccdc 100644
--- a/lib/std/target/powerpc.zig
+++ b/lib/std/target/powerpc.zig
@@ -751,13 +751,6 @@ pub const cpu = struct {
             .hard_float,
         }),
     };
-    pub const ppc32 = CpuModel{
-        .name = "ppc32",
-        .llvm_name = "ppc32",
-        .features = featureSet(&[_]Feature{
-            .hard_float,
-        }),
-    };
     pub const ppc64 = CpuModel{
         .name = "ppc64",
         .llvm_name = "ppc64",
diff --git a/tools/update_cpu_features.zig b/tools/update_cpu_features.zig
index 7e3c636c31..15143dfca4 100644
--- a/tools/update_cpu_features.zig
+++ b/tools/update_cpu_features.zig
@@ -663,6 +663,12 @@ const llvm_targets = [_]LlvmTarget{
         .zig_name = "powerpc",
         .llvm_name = "PowerPC",
         .td_name = "PPC.td",
+        .feature_overrides = &.{
+            .{
+                .llvm_name = "ppc32",
+                .omit = true,
+            },
+        },
     },
     .{
         .zig_name = "riscv",