From c3a76ef9553a2e89a18eab9d052052305e69fc93 Mon Sep 17 00:00:00 2001 From: Bill Wendling Date: Fri, 17 Apr 2009 04:19:22 +0000 Subject: [PATCH] Revert r69335 and r69336. They were causing build failures. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@69347 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/X86/X86InstrInfo.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/Target/X86/X86InstrInfo.cpp b/lib/Target/X86/X86InstrInfo.cpp index ccec7b1c32c..e123ae7e24a 100644 --- a/lib/Target/X86/X86InstrInfo.cpp +++ b/lib/Target/X86/X86InstrInfo.cpp @@ -667,7 +667,6 @@ bool X86InstrInfo::isMoveInstr(const MachineInstr& MI, default: return false; case X86::MOV8rr: - case X86::MOV8rr_NOREX: case X86::MOV16rr: case X86::MOV32rr: case X86::MOV64rr: @@ -1665,10 +1664,9 @@ bool X86InstrInfo::copyRegToReg(MachineBasicBlock &MBB, } else if (DestRC == &X86::GR16RegClass) { Opc = X86::MOV16rr; } else if (DestRC == &X86::GR8RegClass) { - // Copying two or from a physical H register on x86-64 requires a NOREX - // move. Otherwise use a normal move. - if ((isHReg(DestReg) || isHReg(SrcReg)) && - TM.getSubtarget().is64Bit()) + // Copying two or from a physical H register requires a NOREX move. + // Otherwise use a normal move. + if (isHReg(DestReg) || isHReg(SrcReg)) Opc = X86::MOV8rr_NOREX; else Opc = X86::MOV8rr; -- 2.34.1