From 6670c82df5ef7b97862ef2a0807aa835498b7306 Mon Sep 17 00:00:00 2001
From: Hal Finkel <hfinkel@anl.gov>
Date: Tue, 12 Jun 2012 16:39:23 +0000
Subject: [PATCH] Fixes for PPC host detection and features.

POWER4 is a 64-bit CPU (better matched to the 970).
The g3 is really the 750 (no altivec), the g4+ is the 74xx (not the 750).

Patch by Andreas Tobler.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@158363 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/Support/Host.cpp      | 2 +-
 lib/Target/PowerPC/PPC.td | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/Support/Host.cpp b/lib/Support/Host.cpp
index d48c5265a4d..677da5cd9fb 100644
--- a/lib/Support/Host.cpp
+++ b/lib/Support/Host.cpp
@@ -440,7 +440,7 @@ std::string sys::getHostCPUName() {
     .Case("7447", "7400")
     .Case("7455", "7450")
     .Case("G4", "g4")
-    .Case("POWER4", "g4")
+    .Case("POWER4", "970")
     .Case("PPC970FX", "970")
     .Case("PPC970MP", "970")
     .Case("G5", "g5")
diff --git a/lib/Target/PowerPC/PPC.td b/lib/Target/PowerPC/PPC.td
index 4ad5c54aa52..96c46451be9 100644
--- a/lib/Target/PowerPC/PPC.td
+++ b/lib/Target/PowerPC/PPC.td
@@ -76,12 +76,12 @@ def : Processor<"603ev", G3Itineraries, [Directive603]>;
 def : Processor<"604", G3Itineraries, [Directive604]>;
 def : Processor<"604e", G3Itineraries, [Directive604]>;
 def : Processor<"620", G3Itineraries, [Directive620]>;
-def : Processor<"g3", G3Itineraries, [Directive7400]>;
+def : Processor<"750", G4Itineraries, [Directive750]>;
+def : Processor<"g3", G3Itineraries, [Directive750]>;
 def : Processor<"7400", G4Itineraries, [Directive7400, FeatureAltivec]>;
 def : Processor<"g4", G4Itineraries, [Directive7400, FeatureAltivec]>;
 def : Processor<"7450", G4PlusItineraries, [Directive7400, FeatureAltivec]>;
-def : Processor<"g4+", G4PlusItineraries, [Directive750, FeatureAltivec]>;
-def : Processor<"750", G4Itineraries, [Directive750, FeatureAltivec]>;
+def : Processor<"g4+", G4PlusItineraries, [Directive7400, FeatureAltivec]>;
 def : Processor<"970", G5Itineraries,
                   [Directive970, FeatureAltivec,
                    FeatureMFOCRF, FeatureFSqrt, FeatureSTFIWX,