Chromium Code Reviews| Index: lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp |
| diff --git a/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp b/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp |
| index 2c155aaf40dde487d467941d6f5bbb3e0cec5962..818ec34312780cf36238e1ea393333d75c8e57f9 100644 |
| --- a/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp |
| +++ b/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp |
| @@ -208,13 +208,9 @@ static MCStreamer *createMCStreamer(const Target &T, StringRef TT, |
| if (TheTriple.isOSWindows()) { |
| llvm_unreachable("ARM does not support Windows COFF format"); |
| } |
| - // @LOCALMOD-BEGIN |
| - MCStreamer *Streamer = createARMELFStreamer(Ctx, MAB, OS, Emitter, false, |
| - NoExecStack, TheTriple.getArch() == Triple::thumb); |
| - if (TheTriple.isOSNaCl()) |
| - Streamer->EmitBundleAlignMode(4); |
| - return Streamer; |
| - // @LOCALMOD-END |
| + |
| + return createARMELFStreamer(Ctx, MAB, OS, Emitter, false, |
| + NoExecStack, TheTriple.getArch() == Triple::thumb); |
|
Mark Seaborn
2013/05/10 19:52:46
Line >80 chars
Derek Schuff
2013/05/10 22:59:26
Done.
|
| } |
| static MCInstPrinter *createARMMCInstPrinter(const Target &T, |