[llvm] r272332 - Revert 272328 and 272329 to recommit as a single patch.

[Alina Sbirlea via llvm-commits]

Author: asbirlea
Date: Thu Jun  9 18:04:05 2016
New Revision: 272332

URL: http://llvm.org/viewvc/llvm-project?rev=272332&view=rev
Log:
Revert 272328 and 272329 to recommit as a single patch.

Modified:
    llvm/trunk/lib/Support/Host.cpp

Modified: llvm/trunk/lib/Support/Host.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Host.cpp?rev=272332&r1=272331&r2=272332&view=diff
==============================================================================
--- llvm/trunk/lib/Support/Host.cpp (original)
+++ llvm/trunk/lib/Support/Host.cpp Thu Jun  9 18:04:05 2016
@@ -869,9 +869,16 @@ StringRef sys::getHostCPUName() {
         return "athlon";
       }
     case AMDFAM10H:
-      if(Subtype == AMDFAM10H_BARCELONA)
-        return "barcelona";
-      return "amdfam10";
+      switch (Subtype) {
+      case AMDFAM10H_BARCELONA:
+        return "amdfam10-barcelona";
+      case AMDFAM10H_SHANGHAI:
+        return "amdfam10-shanghai";
+      case AMDFAM10H_ISTANBUL:
+        return "amdfam10-istanbul";
+      default:
+        return "amdfam10";
+      }
     case AMDFAM14H:
       return "btver1";
     case AMDFAM15H: