From: Manman Ren <mren@apple.com>
Date: Mon, 13 Aug 2012 17:26:46 +0000 (+0000)
Subject: X86: when auto-detecting the subtarget features, make sure use IsIntel to detect
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=de7f1c251705cad8dc86f498402045235ff8aaaa;p=oota-llvm.git

X86: when auto-detecting the subtarget features, make sure use IsIntel to detect
Nehalem, Westmere and Sandy Bridge. AMD also has processor family 6.


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

diff --git a/lib/Target/X86/X86Subtarget.cpp b/lib/Target/X86/X86Subtarget.cpp
index d7e3efc4f98..908785296d7 100644
--- a/lib/Target/X86/X86Subtarget.cpp
+++ b/lib/Target/X86/X86Subtarget.cpp
@@ -248,9 +248,9 @@ void X86Subtarget::AutoDetectSubtargetFeatures() {
     // If it's Nehalem, unaligned memory access is fast.
     // Include Westmere and Sandy Bridge as well.
     // FIXME: add later processors.
-    if ((Family == 6 && Model == 26) ||
+    if (IsIntel && ((Family == 6 && Model == 26) ||
         (Family == 6 && Model == 44) ||
-        (Family == 6 && Model == 42)) {
+        (Family == 6 && Model == 42))) {
       IsUAMemFast = true;
       ToggleFeature(X86::FeatureFastUAMem);
     }