1 files changed, 21 insertions, 6 deletions
diff --git a/lib/MC/MCELFStreamer.cpp b/lib/MC/MCELFStreamer.cpp
index 14fbc1ec83..cc2c863871 100644
--- a/lib/MC/MCELFStreamer.cpp
+++ b/lib/MC/MCELFStreamer.cpp
@@ -355,6 +355,7 @@ void MCELFStreamer::EmitValueImpl(const MCExpr *Value, unsigned Size,
                                   unsigned AddrSpace) {
   fixSymbolsInTLSFixups(Value);
   MCObjectStreamer::EmitValueImpl(Value, Size, AddrSpace);
+  getCurrentSectionData()->MarkBundleOffsetUnknown();  // @LOCALMOD
 }
 
 
@@ -423,10 +424,10 @@ void MCELFStreamer::EmitInstToFragment(const MCInst &Inst) {
 
   for (unsigned i = 0, e = F.getFixups().size(); i != e; ++i)
     fixSymbolsInTLSFixups(F.getFixups()[i].getValue());
+  getCurrentSectionData()->MarkBundleOffsetUnknown();  // @LOCALMOD
 }
 
 void MCELFStreamer::EmitInstToData(const MCInst &Inst) {
-  MCDataFragment *DF = getOrCreateDataFragment();
 
   SmallVector<MCFixup, 4> Fixups;
   SmallString<256> Code;
@@ -437,12 +438,26 @@ void MCELFStreamer::EmitInstToData(const MCInst &Inst) {
   for (unsigned i = 0, e = Fixups.size(); i != e; ++i)
     fixSymbolsInTLSFixups(Fixups[i].getValue());
 
-  // Add the fixups and data.
-  for (unsigned i = 0, e = Fixups.size(); i != e; ++i) {
-    Fixups[i].setOffset(Fixups[i].getOffset() + DF->getContents().size());
-    DF->addFixup(Fixups[i]);
+  // @LOCALMOD-BEGIN
+  if (Fixups.size() > 0) {
+    MCDataFragment *DF = getOrCreateDataFragment();
+
+    // Add the fixups and data.
+    for (unsigned i = 0, e = Fixups.size(); i != e; ++i) {
+      Fixups[i].setOffset(Fixups[i].getOffset() + DF->getContents().size());
+      DF->addFixup(Fixups[i]);
+    }
+    DF->getContents().append(Code.begin(), Code.end());
+    getCurrentSectionData()->UpdateBundleOffset(Code.size());
+  } else {
+    MCTinyFragment *TF = dyn_cast_or_null<MCTinyFragment>(getCurrentFragment());
+    MCSectionData *SD = getCurrentSectionData();
+    if (!TF || SD->ShouldCreateNewFragment(Code.size()))
+      TF = new MCTinyFragment(SD);
+    TF->getContents().append(Code.begin(), Code.end());
+    SD->UpdateBundleOffset(Code.size());
   }
-  DF->getContents().append(Code.begin(), Code.end());
+  // @LOCALMOD-END
 }
 
 void MCELFStreamer::FinishImpl() {