diff options
| author | Derek Schuff <dschuff@chromium.org> | 2012-11-29 09:34:05 -0800 |
|---|---|---|
| committer | Derek Schuff <dschuff@chromium.org> | 2012-11-29 09:34:05 -0800 |
| commit | f9b328eacabf0920770d3ef87bcd5682b10dd502 (patch) | |
| tree | f0e40a430c619f82f87b13443a398f02ce3fa099 /lib/Target/ARM/ARMAsmPrinter.cpp | |
| parent | 3c4392af7177f4bd64bdc8659de729b9e65716e8 (diff) | |
| parent | e350258e338f6221519be441d2f27a507e3eb367 (diff) | |
Merge remote-tracking branch 'origin/master' into merge168633
Diffstat (limited to 'lib/Target/ARM/ARMAsmPrinter.cpp')
| -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 2b2662e0a6..50e01b33b2 100644 --- a/lib/Target/ARM/ARMAsmPrinter.cpp +++ b/lib/Target/ARM/ARMAsmPrinter.cpp @@ -379,9 +379,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 |