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/ARMMCInstLower.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/ARMMCInstLower.cpp')
| -rw-r--r-- | llvm/lib/Target/ARM/ARMMCInstLower.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/llvm/lib/Target/ARM/ARMMCInstLower.cpp b/llvm/lib/Target/ARM/ARMMCInstLower.cpp index 9e9c1ba6c11..0fd98268723 100644 --- a/llvm/lib/Target/ARM/ARMMCInstLower.cpp +++ b/llvm/lib/Target/ARM/ARMMCInstLower.cpp @@ -211,9 +211,11 @@ void ARMAsmPrinter::EmitSled(const MachineInstr &MI, SledKind Kind) .addImm(ARMCC::AL).addReg(0)); MCInst Noop; - Subtarget->getInstrInfo()->getNoop(Noop); + Subtarget->getInstrInfo()->getNoopForElfTarget(Noop); for (int8_t I = 0; I < NoopsInSledCount; I++) + { OutStreamer->EmitInstruction(Noop, getSubtargetInfo()); + } OutStreamer->EmitLabel(Target); recordSled(CurSled, MI, Kind); |
