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);
     }