diff options
| -rw-r--r-- | llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp | 6 | ||||
| -rw-r--r-- | llvm/test/CodeGen/X86/2008-01-25-EmptyFunction.ll | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp b/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp index 68fd77c0bdb..e7a128623e4 100644 --- a/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp +++ b/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp @@ -376,10 +376,8 @@ void AsmPrinter::EmitFunctionBody() { // If the function is empty and the object file uses .subsections_via_symbols, // then we need to emit *some* thing to the function body to prevent the // labels from collapsing together. - if (MAI->hasSubsectionsViaSymbols() && !HasAnyRealCode) { - // FIXME: EmitByte(0). - O << "\tnop\n"; - } + if (MAI->hasSubsectionsViaSymbols() && !HasAnyRealCode) + OutStreamer.EmitIntValue(0, 1, 0/*addrspace*/); if (MAI->hasDotTypeDotSizeDirective()) O << "\t.size\t" << *CurrentFnSym << ", .-" << *CurrentFnSym << '\n'; diff --git a/llvm/test/CodeGen/X86/2008-01-25-EmptyFunction.ll b/llvm/test/CodeGen/X86/2008-01-25-EmptyFunction.ll index b936686798f..387645f7436 100644 --- a/llvm/test/CodeGen/X86/2008-01-25-EmptyFunction.ll +++ b/llvm/test/CodeGen/X86/2008-01-25-EmptyFunction.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=x86 | grep nop +; RUN: llc < %s -march=x86 | grep {.byte 0} target triple = "i686-apple-darwin8" |
