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 4275b28..59340d4 100644
--- a/lib/Support/CommandLine.cpp
+++ b/lib/Support/CommandLine.cpp
@@ -1154,7 +1154,7 @@
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 0faf8fe..37591a5 100644
--- a/lib/System/Host.cpp
+++ b/lib/System/Host.cpp
@@ -249,7 +249,7 @@
}
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 @@
case 16:
return "amdfam10";
default:
- return "";
+ return "generic";
}
}
#endif
- return "";
+ return "generic";
}