MC tweak symbol difference resolution for non-local symbols.

[oota-llvm.git] / lib / MC / MachObjectWriter.cpp

diff --git a/lib/MC/MachObjectWriter.cpp b/lib/MC/MachObjectWriter.cpp
index ef0a93d93b257f2f06baec62a3d8cd73abb4ef9d..ce222b75cf4de4b7067645c4aca2c0e3101fbcc4 100644 (file)
--- a/lib/MC/MachObjectWriter.cpp
+++ b/lib/MC/MachObjectWriter.cpp
@@ -584,9 +584,14 @@ IsSymbolRefDifferenceFullyResolvedImpl(const MCAssembler &Asm,
     // requires the compiler to use .set to absolutize the differences between
     // symbols which the compiler knows to be assembly time constants, so we
     // don't need to worry about considering symbol differences fully resolved.
+    //
+    // If the file isn't using sub-sections-via-symbols, we can make the
+    // same assumptions about any symbol that we normally make about
+    // assembler locals.
 
     if (!Asm.getBackend().hasReliableSymbolDifference()) {
-      if (!SA.isTemporary() || !SA.isInSection() || &SecA != &SecB)
+      if (!SA.isInSection() || &SecA != &SecB ||
+          (!SA.isTemporary() && &FB != Asm.getSymbolData(SA).getFragment()))
         return false;
       return true;
     }
@@ -594,7 +599,7 @@ IsSymbolRefDifferenceFullyResolvedImpl(const MCAssembler &Asm,
     // If the fragment with the reference does not have a base symbol but meets
     // the simple way of dealing with this, in that it is a temporary symbol in
     // the same atom then it is assumed to be fully resolved.  This is needed so
-    // a relocation entry is not created and so the staitic linker does not
+    // a relocation entry is not created and so the static linker does not
     // mess up the reference later.
     else if(!FB.getAtom() &&
             SA.isTemporary() && SA.isInSection() && &SecA == &SecB){
@@ -627,7 +632,8 @@ IsSymbolRefDifferenceFullyResolvedImpl(const MCAssembler &Asm,
   return false;
 }
 
-void MachObjectWriter::WriteObject(MCAssembler &Asm, const MCAsmLayout &Layout) {
+void MachObjectWriter::WriteObject(MCAssembler &Asm,
+                                   const MCAsmLayout &Layout) {
   unsigned NumSections = Asm.size();
 
   // The section data starts after the header, the segment load command (and
@@ -730,7 +736,7 @@ void MachObjectWriter::WriteObject(MCAssembler &Asm, const MCAsmLayout &Layout)
   // Write the actual section data.
   for (MCAssembler::const_iterator it = Asm.begin(),
          ie = Asm.end(); it != ie; ++it) {
-    Asm.WriteSectionData(it, Layout);
+    Asm.writeSectionData(it, Layout);
 
     uint64_t Pad = getPaddingSize(it, Layout);
     for (unsigned int i = 0; i < Pad; ++i)