diff options
| author | Hans Wennborg <hans@hanshq.net> | 2017-04-21 21:10:37 +0000 |
|---|---|---|
| committer | Hans Wennborg <hans@hanshq.net> | 2017-04-21 21:10:37 +0000 |
| commit | 04593000d871943ca37efa1ace6e63c401d633bf (patch) | |
| tree | 6d2b9fc361d3c06553cb61313e81fc626f9390a4 /llvm/lib/Target/ARM/Thumb2InstrInfo.cpp | |
| parent | cb3e81071495dd2f63af38f6b50945a47939f9d7 (diff) | |
| download | bcm5719-llvm-04593000d871943ca37efa1ace6e63c401d633bf.tar.gz bcm5719-llvm-04593000d871943ca37efa1ace6e63c401d633bf.zip | |
Revert r301040 "X86: Don't emit zero-byte functions on Windows"
This broke almost all bots. Reverting while fixing.
llvm-svn: 301041
Diffstat (limited to 'llvm/lib/Target/ARM/Thumb2InstrInfo.cpp')
| -rw-r--r-- | llvm/lib/Target/ARM/Thumb2InstrInfo.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/Target/ARM/Thumb2InstrInfo.cpp b/llvm/lib/Target/ARM/Thumb2InstrInfo.cpp index 2e2dfe035e2..818ba85c7d4 100644 --- a/llvm/lib/Target/ARM/Thumb2InstrInfo.cpp +++ b/llvm/lib/Target/ARM/Thumb2InstrInfo.cpp @@ -32,8 +32,8 @@ OldT2IfCvt("old-thumb2-ifcvt", cl::Hidden, Thumb2InstrInfo::Thumb2InstrInfo(const ARMSubtarget &STI) : ARMBaseInstrInfo(STI), RI() {} -/// Return the noop instruction to use for a noop. -void Thumb2InstrInfo::getNoop(MCInst &NopInst) const { +/// getNoopForMachoTarget - Return the noop instruction to use for a noop. +void Thumb2InstrInfo::getNoopForMachoTarget(MCInst &NopInst) const { NopInst.setOpcode(ARM::tHINT); NopInst.addOperand(MCOperand::createImm(0)); NopInst.addOperand(MCOperand::createImm(ARMCC::AL)); |
