diff options
| author | Eli Bendersky <eliben@chromium.org> | 2013-03-11 15:38:11 -0700 |
|---|---|---|
| committer | Eli Bendersky <eliben@chromium.org> | 2013-03-20 14:49:21 -0700 |
| commit | d41567d2ffd3413600162653c08b2365bd5bcbbf (patch) | |
| tree | aa1c212bcf816f4011315b80826acfb85ae7d9f3 /lib/MC/MCObjectStreamer.cpp | |
| parent | 23c00401dad33ca247d2818e71540079bed63c5b (diff) | |
Apply after-merge fixes to return to working state.
Diffstat (limited to 'lib/MC/MCObjectStreamer.cpp')
| -rw-r--r-- | lib/MC/MCObjectStreamer.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/MC/MCObjectStreamer.cpp b/lib/MC/MCObjectStreamer.cpp index e835eea7df..1dff3f2977 100644 --- a/lib/MC/MCObjectStreamer.cpp +++ b/lib/MC/MCObjectStreamer.cpp @@ -176,7 +176,8 @@ void MCObjectStreamer::EmitAssignment(MCSymbol *Symbol, const MCExpr *Value) { void MCObjectStreamer::EmitInstruction(const MCInst &Inst) { // @LOCALMOD-BEGIN - if (getAssembler().getBackend().CustomExpandInst(Inst, *this)) { + if (getAssembler().isBundlingEnabled() && + getAssembler().getBackend().CustomExpandInst(Inst, *this)) { return; } // @LOCALMOD-END |