diff options
| author | Eli Bendersky <eliben@chromium.org> | 2012-11-26 16:08:35 -0800 |
|---|---|---|
| committer | Eli Bendersky <eliben@chromium.org> | 2012-11-26 16:08:35 -0800 |
| commit | 6e1ee29aa7b61ab68d71d08433ac249ef0586ab2 (patch) | |
| tree | 4043ba91e1e65f0b8d8ff7147c1216cac496d076 | |
| parent | 3b46d602e10074ce1d54b49a3c5ec9ed708425a6 (diff) | |
Fix previous CL to actually work on NaCl (and not only fix non-NaCl).
std::min has to be std::max, and the alignment should not be conditioned
on hasRawTextSupport
BUG= http://code.google.com/p/nativeclient/issues/detail?id=1711
Review URL: https://codereview.chromium.org/11280172
| -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 |