[llvm-branch-commits] [llvm-branch] r329473 - Merging r326840:

[Tom Stellard via llvm-branch-commits]

Author: tstellar
Date: Fri Apr  6 17:58:44 2018
New Revision: 329473

URL: http://llvm.org/viewvc/llvm-project?rev=329473&view=rev
Log:
Merging r326840:

------------------------------------------------------------------------
r326840 | ctopper | 2018-03-06 14:45:31 -0800 (Tue, 06 Mar 2018) | 5 lines

[X86] Fix a typo in Host.cpp that causes us to misidentify KNL, Silvermont, Goldmont and probably other CPUs for -march=native

I think most of the Intel Core CPUs and recent AMD CPUs are unaffected. All the CPUs that have a "subtype" should work. The ones that were broken are the ones that are a "type" with no subtypes.

Fixes PR36619.
------------------------------------------------------------------------

Modified:
    llvm/branches/release_60/lib/Support/Host.cpp

Modified: llvm/branches/release_60/lib/Support/Host.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_60/lib/Support/Host.cpp?rev=329473&r1=329472&r2=329473&view=diff
==============================================================================
--- llvm/branches/release_60/lib/Support/Host.cpp (original)
+++ llvm/branches/release_60/lib/Support/Host.cpp Fri Apr  6 17:58:44 2018
@@ -1009,7 +1009,7 @@ StringRef sys::getHostCPUName() {
 #include "llvm/Support/X86TargetParser.def"
 
   // Now check types.
-#define X86_CPU_SUBTYPE(ARCHNAME, ENUM) \
+#define X86_CPU_TYPE(ARCHNAME, ENUM) \
   if (Type == X86::ENUM) \
     return ARCHNAME;
 #include "llvm/Support/X86TargetParser.def"