From 04593000d871943ca37efa1ace6e63c401d633bf Mon Sep 17 00:00:00 2001
From: Hans Wennborg <hans@hanshq.net>
Date: Fri, 21 Apr 2017 21:10:37 +0000
Subject: Revert r301040 "X86: Don't emit zero-byte functions on Windows"

This broke almost all bots. Reverting while fixing.

llvm-svn: 301041
---
 llvm/lib/Target/ARM/ARMMCInstLower.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'llvm/lib/Target/ARM/ARMMCInstLower.cpp')

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);
-- 
cgit v1.2.3