aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/Target/ARM/ARMAsmPrinter.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/Target/ARM/ARMAsmPrinter.cpp b/lib/Target/ARM/ARMAsmPrinter.cpp
index f67decc550..36819a0d78 100644
--- a/lib/Target/ARM/ARMAsmPrinter.cpp
+++ b/lib/Target/ARM/ARMAsmPrinter.cpp
@@ -378,10 +378,8 @@ 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)
- int alignment = MF->getAlignment();
- if (alignment < 4) alignment = 4;
- EmitAlignment(alignment);
if (Subtarget->isTargetNaCl() && OutStreamer.hasRawTextSupport()) {
+ EmitAlignment(std::min(MF->getAlignment(), 4u));
OutStreamer.EmitRawText(StringRef("\t.set XmagicX, .\n"));
}
// @LOCALMOD-END