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