diff options
| -rw-r--r-- | lib/Target/ARM/ARMAsmPrinter.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/Target/ARM/ARMAsmPrinter.cpp b/lib/Target/ARM/ARMAsmPrinter.cpp index 36819a0d78..69ee26a56c 100644 --- a/lib/Target/ARM/ARMAsmPrinter.cpp +++ b/lib/Target/ARM/ARMAsmPrinter.cpp @@ -378,9 +378,12 @@ void ARMAsmPrinter::EmitFunctionEntryLabel() { // @LOCALMOD-START // make sure function entry is aligned. We use XmagicX as our basis // for alignment decisions (c.f. assembler sfi macros) - if (Subtarget->isTargetNaCl() && OutStreamer.hasRawTextSupport()) { - EmitAlignment(std::min(MF->getAlignment(), 4u)); - OutStreamer.EmitRawText(StringRef("\t.set XmagicX, .\n")); + if (Subtarget->isTargetNaCl()) { + EmitAlignment(std::max(MF->getAlignment(), 4u)); + + if (OutStreamer.hasRawTextSupport()) { + OutStreamer.EmitRawText(StringRef("\t.set XmagicX, .\n")); + } } // @LOCALMOD-END |