Revert CPU detection code to return "generic" instead of an empty string in case

of failure. The x86 target didn't like empty cpu names and broke x86 tests on
non-x86 buildbots.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@89111 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Support/CommandLine.cpp b/lib/Support/CommandLine.cpp
index 4275b2833548f85909292c528866d35432338c7d..59340d4d5bc53db263d14160a338184676a5b550 100644 (file)
--- a/lib/Support/CommandLine.cpp
+++ b/lib/Support/CommandLine.cpp
@@ -1154,7 +1154,7 @@ public:
     OS << " with assertions";
 #endif
     std::string CPU = sys::getHostCPUName();
-    if (CPU.empty()) CPU = "(unknown)";
+    if (CPU == "generic") CPU = "(unknown)";
     OS << ".\n"
        << "  Built " << __DATE__ << " (" << __TIME__ << ").\n"
        << "  Host: " << sys::getHostTriple() << '\n'

diff --git a/lib/System/Host.cpp b/lib/System/Host.cpp
index 0faf8feacf43fbea105062a8aaf07465ab5935c9..37591a57b0707e7e7e7acdec2f99d99572e3e8ea 100644 (file)
--- a/lib/System/Host.cpp
+++ b/lib/System/Host.cpp
@@ -249,7 +249,7 @@ std::string sys::getHostCPUName() {
     }
 
     default:
-      return "";
+      return "generic";
     }
   } else if (memcmp(text.c, "AuthenticAMD", 12) == 0) {
     // FIXME: this poorly matches the generated SubtargetFeatureKV table.  There
@@ -289,10 +289,10 @@ std::string sys::getHostCPUName() {
       case 16:
         return "amdfam10";
     default:
-      return "";
+      return "generic";
     }
   }
 #endif
 
-  return "";
+  return "generic";
 }