Revert 272328 and 272329 to recommit as a single patch.

llvm-svn: 272332
2016-06-09 23:04:05 +00:00 · 2016-06-09 23:04:05 +00:00 · e0b7bf42c2
parent 2ec2324f3c
commit e0b7bf42c2
1 changed files with 10 additions and 3 deletions
--- a/llvm/lib/Support/Host.cpp
+++ b/llvm/lib/Support/Host.cpp
@ -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: