diff --git a/test/MC/X86/intel-syntax.s b/test/MC/X86/intel-syntax.s
index ec236e0ef77..2a54b320c5b 100644
--- a/test/MC/X86/intel-syntax.s
+++ b/test/MC/X86/intel-syntax.s
@@ -1,5 +1,10 @@
 // RUN: llvm-mc -triple x86_64-unknown-unknown -x86-asm-syntax=intel %s | FileCheck %s
 
+_test:
+	xor	EAX, EAX
+	ret
+
+_main:
 // CHECK:	movl	$257, -4(%rsp)
 	mov	DWORD PTR [RSP - 4], 257
 // CHECK:	movq	$123, -16(%rsp)
@@ -16,3 +21,6 @@
 	mov	RCX, QWORD PTR [0]
 // CHECK:	movl	-24(%rsp,%rax,4), %eax	
 	mov	EAX, DWORD PTR [RSP + 4*RAX - 24]
+// CHECK:	callq	_test
+	call	_test
+	ret
diff --git a/utils/TableGen/AsmMatcherEmitter.cpp b/utils/TableGen/AsmMatcherEmitter.cpp
index 3a5caeb2c46..4d18516d69b 100644
--- a/utils/TableGen/AsmMatcherEmitter.cpp
+++ b/utils/TableGen/AsmMatcherEmitter.cpp
@@ -2388,7 +2388,9 @@ void AsmMatcherEmitter::run(raw_ostream &OS) {
 
   if (HasMnemonicAliases) {
     OS << "  // Process all MnemonicAliases to remap the mnemonic.\n";
-    OS << "  applyMnemonicAliases(Mnemonic, AvailableFeatures);\n\n";
+    OS << "  // FIXME : Add an entry in AsmParserVariant to check this.\n";
+    OS << "  if (!VariantID)\n";
+    OS << "    applyMnemonicAliases(Mnemonic, AvailableFeatures);\n\n";
   }
 
   // Emit code to compute the class list for this operand vector.