diff options
| author | Hans Wennborg <hans@hanshq.net> | 2017-04-21 21:48:41 +0000 |
|---|---|---|
| committer | Hans Wennborg <hans@hanshq.net> | 2017-04-21 21:48:41 +0000 |
| commit | 9b9a5358dd35d63f83a54256aaf44e0c3cffdde2 (patch) | |
| tree | 28c4dbdc7d5f57afa287534e4878890cdb5b8a13 /llvm/lib/Target/ARM/Thumb2InstrInfo.cpp | |
| parent | 5b0887025bbc3ded0a4a65adc34d7a07f76b6c77 (diff) | |
| download | bcm5719-llvm-9b9a5358dd35d63f83a54256aaf44e0c3cffdde2.tar.gz bcm5719-llvm-9b9a5358dd35d63f83a54256aaf44e0c3cffdde2.zip | |
Re-commit r301040 "X86: Don't emit zero-byte functions on Windows"
In addition to the original commit, tighten the condition for when to
pad empty functions to COFF Windows. This avoids running into problems
when targeting e.g. Win32 AMDGPU, which caused test failures when this
was committed initially.
llvm-svn: 301047
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 818ba85c7d4..2e2dfe035e2 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() {} -/// getNoopForMachoTarget - Return the noop instruction to use for a noop. -void Thumb2InstrInfo::getNoopForMachoTarget(MCInst &NopInst) const { +/// Return the noop instruction to use for a noop. +void Thumb2InstrInfo::getNoop(MCInst &NopInst) const { NopInst.setOpcode(ARM::tHINT); NopInst.addOperand(MCOperand::createImm(0)); NopInst.addOperand(MCOperand::createImm(ARMCC::AL)); |
