summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Wennborg <hans@hanshq.net>2014-10-14 21:41:17 +0000
committerHans Wennborg <hans@hanshq.net>2014-10-14 21:41:17 +0000
commitf6aafeee6029bece1133250f3d9a65bd059c68fa (patch)
treeb18607a2aa0a29674f7b18c9cce512c143c50022
parent82399f96ae92366042d23e2fdb9917971ad7ad4f (diff)
downloadbcm5719-llvm-f6aafeee6029bece1133250f3d9a65bd059c68fa.tar.gz
bcm5719-llvm-f6aafeee6029bece1133250f3d9a65bd059c68fa.zip
[x86 asm] allow fwait alias in both At&t and Intel modes (PR21208)
Differential Revision: http://reviews.llvm.org/D5741 llvm-svn: 219725
-rw-r--r--llvm/lib/Target/X86/X86InstrInfo.td2
-rw-r--r--llvm/test/MC/X86/x86-32-ms-inline-asm.s4
2 files changed, 5 insertions, 1 deletions
diff --git a/llvm/lib/Target/X86/X86InstrInfo.td b/llvm/lib/Target/X86/X86InstrInfo.td
index cb208bdd4e3..4c55f7cffe4 100644
--- a/llvm/lib/Target/X86/X86InstrInfo.td
+++ b/llvm/lib/Target/X86/X86InstrInfo.td
@@ -2510,7 +2510,7 @@ def : MnemonicAlias<"fldcww", "fldcw", "att">;
def : MnemonicAlias<"fnstcww", "fnstcw", "att">;
def : MnemonicAlias<"fnstsww", "fnstsw", "att">;
def : MnemonicAlias<"fucomip", "fucompi", "att">;
-def : MnemonicAlias<"fwait", "wait", "att">;
+def : MnemonicAlias<"fwait", "wait">;
class CondCodeAlias<string Prefix,string Suffix, string OldCond, string NewCond,
diff --git a/llvm/test/MC/X86/x86-32-ms-inline-asm.s b/llvm/test/MC/X86/x86-32-ms-inline-asm.s
index d912915c585..3169033f2ff 100644
--- a/llvm/test/MC/X86/x86-32-ms-inline-asm.s
+++ b/llvm/test/MC/X86/x86-32-ms-inline-asm.s
@@ -90,4 +90,8 @@ _t21: ## @t21
// CHECK: popal
// CHECK: # encoding: [0x61]
+ fwait
+// CHECK: wait
+// CHECK: # encoding: [0x9b]
+
ret
OpenPOWER on IntegriCloud