diff --git a/llvm/lib/Target/X86/X86InstrInfo.td b/llvm/lib/Target/X86/X86InstrInfo.td
index 4ddff1486b74..126677d40742 100644
--- a/llvm/lib/Target/X86/X86InstrInfo.td
+++ b/llvm/lib/Target/X86/X86InstrInfo.td
@@ -430,9 +430,9 @@ def PUSH32r  : I<0x50, AddRegFrm, (outs), (ins GR32:$reg), "push{l}\t$reg",[]>;
 }
 
 let Defs = [ESP, EFLAGS], Uses = [ESP] in
-def POPFD    : I<0x9D, RawFrm, (outs), (ins), "popfd", []>;
+def POPFD    : I<0x9D, RawFrm, (outs), (ins), "popf", []>;
 let Defs = [ESP], Uses = [ESP, EFLAGS] in
-def PUSHFD   : I<0x9C, RawFrm, (outs), (ins), "pushfd", []>;
+def PUSHFD   : I<0x9C, RawFrm, (outs), (ins), "pushf", []>;
 
 def MovePCtoStack : I<0, Pseudo, (outs), (ins piclabel:$label),
                       "call\t$label", []>;
diff --git a/llvm/lib/Target/X86/X86InstrX86-64.td b/llvm/lib/Target/X86/X86InstrX86-64.td
index 6b1d40948010..c0287c40012c 100644
--- a/llvm/lib/Target/X86/X86InstrX86-64.td
+++ b/llvm/lib/Target/X86/X86InstrX86-64.td
@@ -124,9 +124,9 @@ def PUSH64r  : I<0x50, AddRegFrm,
 }
 
 let Defs = [RSP, EFLAGS], Uses = [RSP] in
-def POPFQ    : I<0x9D, RawFrm, (outs), (ins), "popfq", []>, REX_W;
+def POPFQ    : I<0x9D, RawFrm, (outs), (ins), "popf", []>, REX_W;
 let Defs = [RSP], Uses = [RSP, EFLAGS] in
-def PUSHFQ   : I<0x9C, RawFrm, (outs), (ins), "pushfq", []>;
+def PUSHFQ   : I<0x9C, RawFrm, (outs), (ins), "pushf", []>;
 
 def LEA64_32r : I<0x8D, MRMSrcMem,
                   (outs GR32:$dst), (ins lea64_32mem:$src),