<div dir="ltr">Hi Rafael,<div><br></div><div>Sorry about the delay in testing this. Your patch fixes the issue on my test case. I think is is good to go back in.</div><div><br></div><div>Cheers,</div><div>Lang.</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Jan 5, 2015 at 6:16 PM, Rafael Espíndola <span dir="ltr"><<a href="mailto:rafael.espindola@gmail.com" target="_blank">rafael.espindola@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Hi Lang,<br>
<br>
Sorry I missed this earlier.<br>
<br>
For context, the patch is based on the discussion in<br>
<a href="http://lists.cs.uiuc.edu/pipermail/llvm-commits/Week-of-Mon-20140203/204111.html" target="_blank">http://lists.cs.uiuc.edu/pipermail/llvm-commits/Week-of-Mon-20140203/204111.html</a><br>
but it clearly missed an AArch64 case.<br>
<br>
Note that the general structure is generic. A target can force any<br>
used symbol to be kept. In fact, the attached patch is a revised<br>
version that avoids the crash you reported by forcing relocations with<br>
cstrigs to be external.<br>
<br>
I don't have an AArch64 device, but is there a way to at least cross<br>
compile and link the test-suite? If not, would you mind giving the<br>
patch a try?<br>
<div class="HOEnZb"><div class="h5"><br>
<br>
On 5 January 2015 at 19:54, Lang Hames <<a href="mailto:lhames@gmail.com">lhames@gmail.com</a>> wrote:<br>
> Author: lhames<br>
> Date: Mon Jan 5 18:54:32 2015<br>
> New Revision: 225228<br>
><br>
> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=225228&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=225228&view=rev</a><br>
> Log:<br>
> Revert r225048: It broke ObjC on AArch64.<br>
><br>
> I've filed <a href="http://llvm.org/PR22100" target="_blank">http://llvm.org/PR22100</a> to track this issue.<br>
><br>
> Removed:<br>
> llvm/trunk/test/MC/MachO/AArch64/mergeable.s<br>
> llvm/trunk/test/MC/MachO/x86_64-mergeable.s<br>
> Modified:<br>
> llvm/trunk/include/llvm/MC/MCAsmBackend.h<br>
> llvm/trunk/include/llvm/MC/MCAssembler.h<br>
> llvm/trunk/include/llvm/MC/MCMachObjectWriter.h<br>
> llvm/trunk/include/llvm/MC/MCObjectWriter.h<br>
> llvm/trunk/lib/MC/ELFObjectWriter.cpp<br>
> llvm/trunk/lib/MC/MCAsmInfoDarwin.cpp<br>
> llvm/trunk/lib/MC/MCAssembler.cpp<br>
> llvm/trunk/lib/MC/MachObjectWriter.cpp<br>
> llvm/trunk/lib/MC/WinCOFFObjectWriter.cpp<br>
> llvm/trunk/lib/Target/AArch64/MCTargetDesc/AArch64AsmBackend.cpp<br>
> llvm/trunk/lib/Target/AArch64/MCTargetDesc/AArch64MachObjectWriter.cpp<br>
> llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMMachObjectWriter.cpp<br>
> llvm/trunk/lib/Target/PowerPC/MCTargetDesc/PPCMachObjectWriter.cpp<br>
> llvm/trunk/lib/Target/R600/MCTargetDesc/AMDGPUAsmBackend.cpp<br>
> llvm/trunk/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp<br>
> llvm/trunk/lib/Target/X86/MCTargetDesc/X86MachObjectWriter.cpp<br>
> llvm/trunk/test/MC/MachO/x86_64-symbols.s<br>
><br>
> Modified: llvm/trunk/include/llvm/MC/MCAsmBackend.h<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/MCAsmBackend.h?rev=225228&r1=225227&r2=225228&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/MCAsmBackend.h?rev=225228&r1=225227&r2=225228&view=diff</a><br>
> ==============================================================================<br>
> --- llvm/trunk/include/llvm/MC/MCAsmBackend.h (original)<br>
> +++ llvm/trunk/include/llvm/MC/MCAsmBackend.h Mon Jan 5 18:54:32 2015<br>
> @@ -61,6 +61,12 @@ public:<br>
> /// markers. If not, data region directives will be ignored.<br>
> bool hasDataInCodeSupport() const { return HasDataInCodeSupport; }<br>
><br>
> + /// doesSectionRequireSymbols - Check whether the given section requires that<br>
> + /// all symbols (even temporaries) have symbol table entries.<br>
> + virtual bool doesSectionRequireSymbols(const MCSection &Section) const {<br>
> + return false;<br>
> + }<br>
> +<br>
> /// @name Target Fixup Interfaces<br>
> /// @{<br>
><br>
><br>
> Modified: llvm/trunk/include/llvm/MC/MCAssembler.h<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/MCAssembler.h?rev=225228&r1=225227&r2=225228&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/MCAssembler.h?rev=225228&r1=225227&r2=225228&view=diff</a><br>
> ==============================================================================<br>
> --- llvm/trunk/include/llvm/MC/MCAssembler.h (original)<br>
> +++ llvm/trunk/include/llvm/MC/MCAssembler.h Mon Jan 5 18:54:32 2015<br>
> @@ -11,7 +11,6 @@<br>
> #define LLVM_MC_MCASSEMBLER_H<br>
><br>
> #include "llvm/ADT/DenseMap.h"<br>
> -#include "llvm/ADT/DenseSet.h"<br>
> #include "llvm/ADT/PointerIntPair.h"<br>
> #include "llvm/ADT/SmallPtrSet.h"<br>
> #include "llvm/ADT/SmallString.h"<br>
> @@ -882,8 +881,6 @@ private:<br>
><br>
> iplist<MCSymbolData> Symbols;<br>
><br>
> - DenseSet<const MCSymbol *> LocalsUsedInReloc;<br>
> -<br>
> /// The map of sections to their associated assembler backend data.<br>
> //<br>
> // FIXME: Avoid this indirection?<br>
> @@ -983,9 +980,6 @@ private:<br>
> MCFragment &F, const MCFixup &Fixup);<br>
><br>
> public:<br>
> - void addLocalUsedInReloc(const MCSymbol &Sym);<br>
> - bool isLocalUsedInReloc(const MCSymbol &Sym) const;<br>
> -<br>
> /// Compute the effective fragment size assuming it is laid out at the given<br>
> /// \p SectionAddress and \p FragmentOffset.<br>
> uint64_t computeFragmentSize(const MCAsmLayout &Layout,<br>
><br>
> Modified: llvm/trunk/include/llvm/MC/MCMachObjectWriter.h<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/MCMachObjectWriter.h?rev=225228&r1=225227&r2=225228&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/MCMachObjectWriter.h?rev=225228&r1=225227&r2=225228&view=diff</a><br>
> ==============================================================================<br>
> --- llvm/trunk/include/llvm/MC/MCMachObjectWriter.h (original)<br>
> +++ llvm/trunk/include/llvm/MC/MCMachObjectWriter.h Mon Jan 5 18:54:32 2015<br>
> @@ -68,10 +68,12 @@ public:<br>
> /// @name API<br>
> /// @{<br>
><br>
> - virtual void RecordRelocation(MachObjectWriter *Writer, MCAssembler &Asm,<br>
> + virtual void RecordRelocation(MachObjectWriter *Writer,<br>
> + const MCAssembler &Asm,<br>
> const MCAsmLayout &Layout,<br>
> const MCFragment *Fragment,<br>
> - const MCFixup &Fixup, MCValue Target,<br>
> + const MCFixup &Fixup,<br>
> + MCValue Target,<br>
> uint64_t &FixedValue) = 0;<br>
><br>
> /// @}<br>
> @@ -95,14 +97,8 @@ class MachObjectWriter : public MCObject<br>
> /// @name Relocation Data<br>
> /// @{<br>
><br>
> - struct RelAndSymbol {<br>
> - const MCSymbolData *Sym;<br>
> - MachO::any_relocation_info MRE;<br>
> - RelAndSymbol(const MCSymbolData *Sym, const MachO::any_relocation_info &MRE)<br>
> - : Sym(Sym), MRE(MRE) {}<br>
> - };<br>
> -<br>
> - llvm::DenseMap<const MCSectionData *, std::vector<RelAndSymbol>> Relocations;<br>
> + llvm::DenseMap<const MCSectionData*,<br>
> + std::vector<MachO::any_relocation_info> > Relocations;<br>
> llvm::DenseMap<const MCSectionData*, unsigned> IndirectSymBase;<br>
><br>
> /// @}<br>
> @@ -217,15 +213,9 @@ public:<br>
> // - Input errors, where something cannot be correctly encoded. 'as' allows<br>
> // these through in many cases.<br>
><br>
> - // Add a relocation to be output in the object file. At the time this is<br>
> - // called, the symbol indexes are not know, so if the relocation refers<br>
> - // to a symbol it should be passed as \p RelSymbol so that it can be updated<br>
> - // afterwards. If the relocation doesn't refer to a symbol, nullptr should be<br>
> - // used.<br>
> - void addRelocation(const MCSymbolData *RelSymbol, const MCSectionData *SD,<br>
> + void addRelocation(const MCSectionData *SD,<br>
> MachO::any_relocation_info &MRE) {<br>
> - RelAndSymbol P(RelSymbol, MRE);<br>
> - Relocations[SD].push_back(P);<br>
> + Relocations[SD].push_back(MRE);<br>
> }<br>
><br>
> void RecordScatteredRelocation(const MCAssembler &Asm,<br>
> @@ -241,7 +231,7 @@ public:<br>
> const MCFixup &Fixup, MCValue Target,<br>
> uint64_t &FixedValue);<br>
><br>
> - void RecordRelocation(MCAssembler &Asm, const MCAsmLayout &Layout,<br>
> + void RecordRelocation(const MCAssembler &Asm, const MCAsmLayout &Layout,<br>
> const MCFragment *Fragment, const MCFixup &Fixup,<br>
> MCValue Target, bool &IsPCRel,<br>
> uint64_t &FixedValue) override;<br>
><br>
> Modified: llvm/trunk/include/llvm/MC/MCObjectWriter.h<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/MCObjectWriter.h?rev=225228&r1=225227&r2=225228&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/MCObjectWriter.h?rev=225228&r1=225227&r2=225228&view=diff</a><br>
> ==============================================================================<br>
> --- llvm/trunk/include/llvm/MC/MCObjectWriter.h (original)<br>
> +++ llvm/trunk/include/llvm/MC/MCObjectWriter.h Mon Jan 5 18:54:32 2015<br>
> @@ -76,10 +76,12 @@ public:<br>
> /// post layout binding. The implementation is responsible for storing<br>
> /// information about the relocation so that it can be emitted during<br>
> /// WriteObject().<br>
> - virtual void RecordRelocation(MCAssembler &Asm, const MCAsmLayout &Layout,<br>
> + virtual void RecordRelocation(const MCAssembler &Asm,<br>
> + const MCAsmLayout &Layout,<br>
> const MCFragment *Fragment,<br>
> const MCFixup &Fixup, MCValue Target,<br>
> - bool &IsPCRel, uint64_t &FixedValue) = 0;<br>
> + bool &IsPCRel,<br>
> + uint64_t &FixedValue) = 0;<br>
><br>
> /// \brief Check whether the difference (A - B) between two symbol<br>
> /// references is fully resolved.<br>
><br>
> Modified: llvm/trunk/lib/MC/ELFObjectWriter.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/ELFObjectWriter.cpp?rev=225228&r1=225227&r2=225228&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/ELFObjectWriter.cpp?rev=225228&r1=225227&r2=225228&view=diff</a><br>
> ==============================================================================<br>
> --- llvm/trunk/lib/MC/ELFObjectWriter.cpp (original)<br>
> +++ llvm/trunk/lib/MC/ELFObjectWriter.cpp Mon Jan 5 18:54:32 2015<br>
> @@ -219,7 +219,7 @@ class ELFObjectWriter : public MCObjectW<br>
> const MCSymbolData *SD, uint64_t C,<br>
> unsigned Type) const;<br>
><br>
> - void RecordRelocation(MCAssembler &Asm, const MCAsmLayout &Layout,<br>
> + void RecordRelocation(const MCAssembler &Asm, const MCAsmLayout &Layout,<br>
> const MCFragment *Fragment, const MCFixup &Fixup,<br>
> MCValue Target, bool &IsPCRel,<br>
> uint64_t &FixedValue) override;<br>
> @@ -789,11 +789,13 @@ static const MCSymbol *getWeakRef(const<br>
> return nullptr;<br>
> }<br>
><br>
> -void ELFObjectWriter::RecordRelocation(MCAssembler &Asm,<br>
> +void ELFObjectWriter::RecordRelocation(const MCAssembler &Asm,<br>
> const MCAsmLayout &Layout,<br>
> const MCFragment *Fragment,<br>
> - const MCFixup &Fixup, MCValue Target,<br>
> - bool &IsPCRel, uint64_t &FixedValue) {<br>
> + const MCFixup &Fixup,<br>
> + MCValue Target,<br>
> + bool &IsPCRel,<br>
> + uint64_t &FixedValue) {<br>
> const MCSectionData *FixupSection = Fragment->getParent();<br>
> uint64_t C = Target.getConstant();<br>
> uint64_t FixupOffset = Layout.getFragmentOffset(Fragment) + Fixup.getOffset();<br>
><br>
> Modified: llvm/trunk/lib/MC/MCAsmInfoDarwin.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCAsmInfoDarwin.cpp?rev=225228&r1=225227&r2=225228&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCAsmInfoDarwin.cpp?rev=225228&r1=225227&r2=225228&view=diff</a><br>
> ==============================================================================<br>
> --- llvm/trunk/lib/MC/MCAsmInfoDarwin.cpp (original)<br>
> +++ llvm/trunk/lib/MC/MCAsmInfoDarwin.cpp Mon Jan 5 18:54:32 2015<br>
> @@ -27,7 +27,22 @@ bool MCAsmInfoDarwin::isSectionAtomizabl<br>
> // contain.<br>
> // Sections holding 2 byte strings require symbols in order to be atomized.<br>
> // There is no dedicated section for 4 byte strings.<br>
> - if (SMO.getType() == MachO::S_CSTRING_LITERALS)<br>
> + if (SMO.getKind().isMergeable1ByteCString())<br>
> + return false;<br>
> +<br>
> + if (SMO.getSegmentName() == "__TEXT" &&<br>
> + SMO.getSectionName() == "__objc_classname" &&<br>
> + SMO.getType() == MachO::S_CSTRING_LITERALS)<br>
> + return false;<br>
> +<br>
> + if (SMO.getSegmentName() == "__TEXT" &&<br>
> + SMO.getSectionName() == "__objc_methname" &&<br>
> + SMO.getType() == MachO::S_CSTRING_LITERALS)<br>
> + return false;<br>
> +<br>
> + if (SMO.getSegmentName() == "__TEXT" &&<br>
> + SMO.getSectionName() == "__objc_methtype" &&<br>
> + SMO.getType() == MachO::S_CSTRING_LITERALS)<br>
> return false;<br>
><br>
> if (SMO.getSegmentName() == "__DATA" && SMO.getSectionName() == "__cfstring")<br>
><br>
> Modified: llvm/trunk/lib/MC/MCAssembler.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCAssembler.cpp?rev=225228&r1=225227&r2=225228&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCAssembler.cpp?rev=225228&r1=225227&r2=225228&view=diff</a><br>
> ==============================================================================<br>
> --- llvm/trunk/lib/MC/MCAssembler.cpp (original)<br>
> +++ llvm/trunk/lib/MC/MCAssembler.cpp Mon Jan 5 18:54:32 2015<br>
> @@ -425,16 +425,6 @@ bool MCAssembler::isThumbFunc(const MCSy<br>
> return true;<br>
> }<br>
><br>
> -void MCAssembler::addLocalUsedInReloc(const MCSymbol &Sym) {<br>
> - assert(Sym.isTemporary());<br>
> - LocalsUsedInReloc.insert(&Sym);<br>
> -}<br>
> -<br>
> -bool MCAssembler::isLocalUsedInReloc(const MCSymbol &Sym) const {<br>
> - assert(Sym.isTemporary());<br>
> - return LocalsUsedInReloc.count(&Sym);<br>
> -}<br>
> -<br>
> bool MCAssembler::isSymbolLinkerVisible(const MCSymbol &Symbol) const {<br>
> // Non-temporary labels should always be visible to the linker.<br>
> if (!Symbol.isTemporary())<br>
> @@ -444,10 +434,8 @@ bool MCAssembler::isSymbolLinkerVisible(<br>
> if (!Symbol.isInSection())<br>
> return false;<br>
><br>
> - if (isLocalUsedInReloc(Symbol))<br>
> - return true;<br>
> -<br>
> - return false;<br>
> + // Otherwise, check if the section requires symbols even for temporary labels.<br>
> + return getBackend().doesSectionRequireSymbols(Symbol.getSection());<br>
> }<br>
><br>
> const MCSymbolData *MCAssembler::getAtom(const MCSymbolData *SD) const {<br>
><br>
> Modified: llvm/trunk/lib/MC/MachObjectWriter.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MachObjectWriter.cpp?rev=225228&r1=225227&r2=225228&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MachObjectWriter.cpp?rev=225228&r1=225227&r2=225228&view=diff</a><br>
> ==============================================================================<br>
> --- llvm/trunk/lib/MC/MachObjectWriter.cpp (original)<br>
> +++ llvm/trunk/lib/MC/MachObjectWriter.cpp Mon Jan 5 18:54:32 2015<br>
> @@ -448,11 +448,14 @@ void MachObjectWriter::WriteLinkerOption<br>
> assert(OS.tell() - Start == Size);<br>
> }<br>
><br>
> -void MachObjectWriter::RecordRelocation(MCAssembler &Asm,<br>
> +<br>
> +void MachObjectWriter::RecordRelocation(const MCAssembler &Asm,<br>
> const MCAsmLayout &Layout,<br>
> const MCFragment *Fragment,<br>
> - const MCFixup &Fixup, MCValue Target,<br>
> - bool &IsPCRel, uint64_t &FixedValue) {<br>
> + const MCFixup &Fixup,<br>
> + MCValue Target,<br>
> + bool &IsPCRel,<br>
> + uint64_t &FixedValue) {<br>
> TargetObjectWriter->RecordRelocation(this, Asm, Layout, Fragment, Fixup,<br>
> Target, FixedValue);<br>
> }<br>
> @@ -613,22 +616,6 @@ void MachObjectWriter::ComputeSymbolTabl<br>
> ExternalSymbolData[i].SymbolData->setIndex(Index++);<br>
> for (unsigned i = 0, e = UndefinedSymbolData.size(); i != e; ++i)<br>
> UndefinedSymbolData[i].SymbolData->setIndex(Index++);<br>
> -<br>
> - for (const MCSectionData &SD : Asm) {<br>
> - std::vector<RelAndSymbol> &Relocs = Relocations[&SD];<br>
> - for (RelAndSymbol &Rel : Relocs) {<br>
> - if (!Rel.Sym)<br>
> - continue;<br>
> -<br>
> - // Set the Index and the IsExtern bit.<br>
> - unsigned Index = Rel.Sym->getIndex();<br>
> - assert(isInt<24>(Index));<br>
> - if (IsLittleEndian)<br>
> - Rel.MRE.r_word1 = (Rel.MRE.r_word1 & (-1 << 24)) | Index | (1 << 27);<br>
> - else<br>
> - Rel.MRE.r_word1 = (Rel.MRE.r_word1 & 0xff) | Index << 8 | (1 << 4);<br>
> - }<br>
> - }<br>
> }<br>
><br>
> void MachObjectWriter::computeSectionAddresses(const MCAssembler &Asm,<br>
> @@ -675,6 +662,10 @@ void MachObjectWriter::ExecutePostLayout<br>
> // Mark symbol difference expressions in variables (from .set or = directives)<br>
> // as absolute.<br>
> markAbsoluteVariableSymbols(Asm, Layout);<br>
> +<br>
> + // Compute symbol table information and bind symbol indices.<br>
> + ComputeSymbolTable(Asm, LocalSymbolData, ExternalSymbolData,<br>
> + UndefinedSymbolData);<br>
> }<br>
><br>
> bool MachObjectWriter::<br>
> @@ -758,10 +749,6 @@ IsSymbolRefDifferenceFullyResolvedImpl(c<br>
><br>
> void MachObjectWriter::WriteObject(MCAssembler &Asm,<br>
> const MCAsmLayout &Layout) {<br>
> - // Compute symbol table information and bind symbol indices.<br>
> - ComputeSymbolTable(Asm, LocalSymbolData, ExternalSymbolData,<br>
> - UndefinedSymbolData);<br>
> -<br>
> unsigned NumSections = Asm.size();<br>
> const MCAssembler::VersionMinInfoType &VersionInfo =<br>
> Layout.getAssembler().getVersionMinInfo();<br>
> @@ -852,7 +839,7 @@ void MachObjectWriter::WriteObject(MCAss<br>
> uint64_t RelocTableEnd = SectionDataStart + SectionDataFileSize;<br>
> for (MCAssembler::const_iterator it = Asm.begin(),<br>
> ie = Asm.end(); it != ie; ++it) {<br>
> - std::vector<RelAndSymbol> &Relocs = Relocations[it];<br>
> + std::vector<MachO::any_relocation_info> &Relocs = Relocations[it];<br>
> unsigned NumRelocs = Relocs.size();<br>
> uint64_t SectionStart = SectionDataStart + getSectionAddress(it);<br>
> WriteSection(Asm, Layout, *it, SectionStart, RelocTableEnd, NumRelocs);<br>
> @@ -946,10 +933,10 @@ void MachObjectWriter::WriteObject(MCAss<br>
> ie = Asm.end(); it != ie; ++it) {<br>
> // Write the section relocation entries, in reverse order to match 'as'<br>
> // (approximately, the exact algorithm is more complicated than this).<br>
> - std::vector<RelAndSymbol> &Relocs = Relocations[it];<br>
> + std::vector<MachO::any_relocation_info> &Relocs = Relocations[it];<br>
> for (unsigned i = 0, e = Relocs.size(); i != e; ++i) {<br>
> - Write32(Relocs[e - i - 1].MRE.r_word0);<br>
> - Write32(Relocs[e - i - 1].MRE.r_word1);<br>
> + Write32(Relocs[e - i - 1].r_word0);<br>
> + Write32(Relocs[e - i - 1].r_word1);<br>
> }<br>
> }<br>
><br>
><br>
> Modified: llvm/trunk/lib/MC/WinCOFFObjectWriter.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/WinCOFFObjectWriter.cpp?rev=225228&r1=225227&r2=225228&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/WinCOFFObjectWriter.cpp?rev=225228&r1=225227&r2=225228&view=diff</a><br>
> ==============================================================================<br>
> --- llvm/trunk/lib/MC/WinCOFFObjectWriter.cpp (original)<br>
> +++ llvm/trunk/lib/MC/WinCOFFObjectWriter.cpp Mon Jan 5 18:54:32 2015<br>
> @@ -175,7 +175,7 @@ public:<br>
> const MCFragment &FB, bool InSet,<br>
> bool IsPCRel) const override;<br>
><br>
> - void RecordRelocation(MCAssembler &Asm, const MCAsmLayout &Layout,<br>
> + void RecordRelocation(const MCAssembler &Asm, const MCAsmLayout &Layout,<br>
> const MCFragment *Fragment, const MCFixup &Fixup,<br>
> MCValue Target, bool &IsPCRel,<br>
> uint64_t &FixedValue) override;<br>
> @@ -661,9 +661,13 @@ bool WinCOFFObjectWriter::IsSymbolRefDif<br>
> InSet, IsPCRel);<br>
> }<br>
><br>
> -void WinCOFFObjectWriter::RecordRelocation(<br>
> - MCAssembler &Asm, const MCAsmLayout &Layout, const MCFragment *Fragment,<br>
> - const MCFixup &Fixup, MCValue Target, bool &IsPCRel, uint64_t &FixedValue) {<br>
> +void WinCOFFObjectWriter::RecordRelocation(const MCAssembler &Asm,<br>
> + const MCAsmLayout &Layout,<br>
> + const MCFragment *Fragment,<br>
> + const MCFixup &Fixup,<br>
> + MCValue Target,<br>
> + bool &IsPCRel,<br>
> + uint64_t &FixedValue) {<br>
> assert(Target.getSymA() && "Relocation must reference a symbol!");<br>
><br>
> const MCSymbol &Symbol = Target.getSymA()->getSymbol();<br>
><br>
> Modified: llvm/trunk/lib/Target/AArch64/MCTargetDesc/AArch64AsmBackend.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AArch64/MCTargetDesc/AArch64AsmBackend.cpp?rev=225228&r1=225227&r2=225228&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AArch64/MCTargetDesc/AArch64AsmBackend.cpp?rev=225228&r1=225227&r2=225228&view=diff</a><br>
> ==============================================================================<br>
> --- llvm/trunk/lib/Target/AArch64/MCTargetDesc/AArch64AsmBackend.cpp (original)<br>
> +++ llvm/trunk/lib/Target/AArch64/MCTargetDesc/AArch64AsmBackend.cpp Mon Jan 5 18:54:32 2015<br>
> @@ -317,6 +317,42 @@ public:<br>
> MachO::CPU_SUBTYPE_ARM64_ALL);<br>
> }<br>
><br>
> + bool doesSectionRequireSymbols(const MCSection &Section) const override {<br>
> + // Any section for which the linker breaks things into atoms needs to<br>
> + // preserve symbols, including assembler local symbols, to identify<br>
> + // those atoms. These sections are:<br>
> + // Sections of type:<br>
> + //<br>
> + // S_CSTRING_LITERALS (e.g. __cstring)<br>
> + // S_LITERAL_POINTERS (e.g. objc selector pointers)<br>
> + // S_16BYTE_LITERALS, S_8BYTE_LITERALS, S_4BYTE_LITERALS<br>
> + //<br>
> + // Sections named:<br>
> + //<br>
> + // __TEXT,__eh_frame<br>
> + // __TEXT,__ustring<br>
> + // __DATA,__cfstring<br>
> + // __DATA,__objc_classrefs<br>
> + // __DATA,__objc_catlist<br>
> + //<br>
> + // FIXME: It would be better if the compiler used actual linker local<br>
> + // symbols for each of these sections rather than preserving what<br>
> + // are ostensibly assembler local symbols.<br>
> + const MCSectionMachO &SMO = static_cast<const MCSectionMachO &>(Section);<br>
> + return (SMO.getType() == MachO::S_CSTRING_LITERALS ||<br>
> + SMO.getType() == MachO::S_4BYTE_LITERALS ||<br>
> + SMO.getType() == MachO::S_8BYTE_LITERALS ||<br>
> + SMO.getType() == MachO::S_16BYTE_LITERALS ||<br>
> + SMO.getType() == MachO::S_LITERAL_POINTERS ||<br>
> + (SMO.getSegmentName() == "__TEXT" &&<br>
> + (SMO.getSectionName() == "__eh_frame" ||<br>
> + SMO.getSectionName() == "__ustring")) ||<br>
> + (SMO.getSegmentName() == "__DATA" &&<br>
> + (SMO.getSectionName() == "__cfstring" ||<br>
> + SMO.getSectionName() == "__objc_classrefs" ||<br>
> + SMO.getSectionName() == "__objc_catlist")));<br>
> + }<br>
> +<br>
> /// \brief Generate the compact unwind encoding from the CFI directives.<br>
> uint32_t generateCompactUnwindEncoding(<br>
> ArrayRef<MCCFIInstruction> Instrs) const override {<br>
><br>
> Modified: llvm/trunk/lib/Target/AArch64/MCTargetDesc/AArch64MachObjectWriter.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AArch64/MCTargetDesc/AArch64MachObjectWriter.cpp?rev=225228&r1=225227&r2=225228&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AArch64/MCTargetDesc/AArch64MachObjectWriter.cpp?rev=225228&r1=225227&r2=225228&view=diff</a><br>
> ==============================================================================<br>
> --- llvm/trunk/lib/Target/AArch64/MCTargetDesc/AArch64MachObjectWriter.cpp (original)<br>
> +++ llvm/trunk/lib/Target/AArch64/MCTargetDesc/AArch64MachObjectWriter.cpp Mon Jan 5 18:54:32 2015<br>
> @@ -10,7 +10,6 @@<br>
> #include "MCTargetDesc/AArch64FixupKinds.h"<br>
> #include "MCTargetDesc/AArch64MCTargetDesc.h"<br>
> #include "llvm/ADT/Twine.h"<br>
> -#include "llvm/MC/MCAsmInfo.h"<br>
> #include "llvm/MC/MCAsmLayout.h"<br>
> #include "llvm/MC/MCAssembler.h"<br>
> #include "llvm/MC/MCContext.h"<br>
> @@ -34,7 +33,7 @@ public:<br>
> : MCMachObjectTargetWriter(true /* is64Bit */, CPUType, CPUSubtype,<br>
> /*UseAggressiveSymbolFolding=*/true) {}<br>
><br>
> - void RecordRelocation(MachObjectWriter *Writer, MCAssembler &Asm,<br>
> + void RecordRelocation(MachObjectWriter *Writer, const MCAssembler &Asm,<br>
> const MCAsmLayout &Layout, const MCFragment *Fragment,<br>
> const MCFixup &Fixup, MCValue Target,<br>
> uint64_t &FixedValue) override;<br>
> @@ -114,7 +113,7 @@ bool AArch64MachObjectWriter::getAArch64<br>
> }<br>
><br>
> void AArch64MachObjectWriter::RecordRelocation(<br>
> - MachObjectWriter *Writer, MCAssembler &Asm, const MCAsmLayout &Layout,<br>
> + MachObjectWriter *Writer, const MCAssembler &Asm, const MCAsmLayout &Layout,<br>
> const MCFragment *Fragment, const MCFixup &Fixup, MCValue Target,<br>
> uint64_t &FixedValue) {<br>
> unsigned IsPCRel = Writer->isFixupKindPCRel(Asm, Fixup.getKind());<br>
> @@ -124,9 +123,9 @@ void AArch64MachObjectWriter::RecordRelo<br>
> unsigned Log2Size = 0;<br>
> int64_t Value = 0;<br>
> unsigned Index = 0;<br>
> + unsigned IsExtern = 0;<br>
> unsigned Type = 0;<br>
> unsigned Kind = Fixup.getKind();<br>
> - const MCSymbolData *RelSymbol = nullptr;<br>
><br>
> FixupOffset += Fixup.getOffset();<br>
><br>
> @@ -172,8 +171,10 @@ void AArch64MachObjectWriter::RecordRelo<br>
> // FIXME: Should this always be extern?<br>
> // SymbolNum of 0 indicates the absolute section.<br>
> Type = MachO::ARM64_RELOC_UNSIGNED;<br>
> + Index = 0;<br>
><br>
> if (IsPCRel) {<br>
> + IsExtern = 1;<br>
> Asm.getContext().FatalError(Fixup.getLoc(),<br>
> "PC relative absolute relocation!");<br>
><br>
> @@ -197,12 +198,15 @@ void AArch64MachObjectWriter::RecordRelo<br>
> Layout.getSymbolOffset(&B_SD) ==<br>
> Layout.getFragmentOffset(Fragment) + Fixup.getOffset()) {<br>
> // SymB is the PC, so use a PC-rel pointer-to-GOT relocation.<br>
> + Index = A_Base->getIndex();<br>
> + IsExtern = 1;<br>
> Type = MachO::ARM64_RELOC_POINTER_TO_GOT;<br>
> IsPCRel = 1;<br>
> MachO::any_relocation_info MRE;<br>
> MRE.r_word0 = FixupOffset;<br>
> - MRE.r_word1 = (IsPCRel << 24) | (Log2Size << 25) | (Type << 28);<br>
> - Writer->addRelocation(A_Base, Fragment->getParent(), MRE);<br>
> + MRE.r_word1 = ((Index << 0) | (IsPCRel << 24) | (Log2Size << 25) |<br>
> + (IsExtern << 27) | (Type << 28));<br>
> + Writer->addRelocation(Fragment->getParent(), MRE);<br>
> return;<br>
> } else if (Target.getSymA()->getKind() != MCSymbolRefExpr::VK_None ||<br>
> Target.getSymB()->getKind() != MCSymbolRefExpr::VK_None)<br>
> @@ -248,33 +252,25 @@ void AArch64MachObjectWriter::RecordRelo<br>
> ? 0<br>
> : Writer->getSymbolAddress(B_Base, Layout));<br>
><br>
> + Index = A_Base->getIndex();<br>
> + IsExtern = 1;<br>
> Type = MachO::ARM64_RELOC_UNSIGNED;<br>
><br>
> MachO::any_relocation_info MRE;<br>
> MRE.r_word0 = FixupOffset;<br>
> - MRE.r_word1 = (IsPCRel << 24) | (Log2Size << 25) | (Type << 28);<br>
> - Writer->addRelocation(A_Base, Fragment->getParent(), MRE);<br>
> + MRE.r_word1 = ((Index << 0) | (IsPCRel << 24) | (Log2Size << 25) |<br>
> + (IsExtern << 27) | (Type << 28));<br>
> + Writer->addRelocation(Fragment->getParent(), MRE);<br>
><br>
> - RelSymbol = B_Base;<br>
> + Index = B_Base->getIndex();<br>
> + IsExtern = 1;<br>
> Type = MachO::ARM64_RELOC_SUBTRACTOR;<br>
> } else { // A + constant<br>
> const MCSymbol *Symbol = &Target.getSymA()->getSymbol();<br>
> - const MCSectionMachO &Section = static_cast<const MCSectionMachO &>(<br>
> - Fragment->getParent()->getSection());<br>
> -<br>
> - // Pointer-sized relocations can use a local relocation. Otherwise,<br>
> - // we have to be in a debug info section.<br>
> - bool CanUseLocalRelocation =<br>
> - Section.hasAttribute(MachO::S_ATTR_DEBUG) || Log2Size == 3;<br>
> -<br>
> - if (Symbol->isTemporary() && (Value || !CanUseLocalRelocation)) {<br>
> - const MCSection &Sec = Symbol->getSection();<br>
> - if (!Asm.getContext().getAsmInfo()->isSectionAtomizableBySymbols(Sec))<br>
> - Asm.addLocalUsedInReloc(*Symbol);<br>
> - }<br>
> -<br>
> const MCSymbolData &SD = Asm.getSymbolData(*Symbol);<br>
> const MCSymbolData *Base = Asm.getAtom(&SD);<br>
> + const MCSectionMachO &Section = static_cast<const MCSectionMachO &>(<br>
> + Fragment->getParent()->getSection());<br>
><br>
> // If the symbol is a variable and we weren't able to get a Base for it<br>
> // (i.e., it's not in the symbol table associated with a section) resolve<br>
> @@ -314,13 +310,16 @@ void AArch64MachObjectWriter::RecordRelo<br>
> // sections, and for pointer-sized relocations (.quad), we allow section<br>
> // relocations. It's code sections that run into trouble.<br>
> if (Base) {<br>
> - RelSymbol = Base;<br>
> + Index = Base->getIndex();<br>
> + IsExtern = 1;<br>
><br>
> // Add the local offset, if needed.<br>
> if (Base != &SD)<br>
> Value += Layout.getSymbolOffset(&SD) - Layout.getSymbolOffset(Base);<br>
> } else if (Symbol->isInSection()) {<br>
> - if (!CanUseLocalRelocation)<br>
> + // Pointer-sized relocations can use a local relocation. Otherwise,<br>
> + // we have to be in a debug info section.<br>
> + if (!Section.hasAttribute(MachO::S_ATTR_DEBUG) && Log2Size != 3)<br>
> Asm.getContext().FatalError(<br>
> Fixup.getLoc(),<br>
> "unsupported relocation of local symbol '" + Symbol->getName() +<br>
> @@ -330,6 +329,7 @@ void AArch64MachObjectWriter::RecordRelo<br>
> const MCSectionData &SymSD =<br>
> Asm.getSectionData(SD.getSymbol().getSection());<br>
> Index = SymSD.getOrdinal() + 1;<br>
> + IsExtern = 0;<br>
> Value += Writer->getSymbolAddress(&SD, Layout);<br>
><br>
> if (IsPCRel)<br>
> @@ -362,16 +362,16 @@ void AArch64MachObjectWriter::RecordRelo<br>
><br>
> MachO::any_relocation_info MRE;<br>
> MRE.r_word0 = FixupOffset;<br>
> - MRE.r_word1 =<br>
> - (Index << 0) | (IsPCRel << 24) | (Log2Size << 25) | (Type << 28);<br>
> - Writer->addRelocation(RelSymbol, Fragment->getParent(), MRE);<br>
> + MRE.r_word1 = ((Index << 0) | (IsPCRel << 24) | (Log2Size << 25) |<br>
> + (IsExtern << 27) | (Type << 28));<br>
> + Writer->addRelocation(Fragment->getParent(), MRE);<br>
><br>
> // Now set up the Addend relocation.<br>
> Type = MachO::ARM64_RELOC_ADDEND;<br>
> Index = Value;<br>
> - RelSymbol = nullptr;<br>
> IsPCRel = 0;<br>
> Log2Size = 2;<br>
> + IsExtern = 0;<br>
><br>
> // Put zero into the instruction itself. The addend is in the relocation.<br>
> Value = 0;<br>
> @@ -383,9 +383,9 @@ void AArch64MachObjectWriter::RecordRelo<br>
> // struct relocation_info (8 bytes)<br>
> MachO::any_relocation_info MRE;<br>
> MRE.r_word0 = FixupOffset;<br>
> - MRE.r_word1 =<br>
> - (Index << 0) | (IsPCRel << 24) | (Log2Size << 25) | (Type << 28);<br>
> - Writer->addRelocation(RelSymbol, Fragment->getParent(), MRE);<br>
> + MRE.r_word1 = ((Index << 0) | (IsPCRel << 24) | (Log2Size << 25) |<br>
> + (IsExtern << 27) | (Type << 28));<br>
> + Writer->addRelocation(Fragment->getParent(), MRE);<br>
> }<br>
><br>
> MCObjectWriter *llvm::createAArch64MachObjectWriter(raw_ostream &OS,<br>
><br>
> Modified: llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMMachObjectWriter.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMMachObjectWriter.cpp?rev=225228&r1=225227&r2=225228&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMMachObjectWriter.cpp?rev=225228&r1=225227&r2=225228&view=diff</a><br>
> ==============================================================================<br>
> --- llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMMachObjectWriter.cpp (original)<br>
> +++ llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMMachObjectWriter.cpp Mon Jan 5 18:54:32 2015<br>
> @@ -54,10 +54,10 @@ public:<br>
> : MCMachObjectTargetWriter(Is64Bit, CPUType, CPUSubtype,<br>
> /*UseAggressiveSymbolFolding=*/true) {}<br>
><br>
> - void RecordRelocation(MachObjectWriter *Writer, MCAssembler &Asm,<br>
> - const MCAsmLayout &Layout, const MCFragment *Fragment,<br>
> - const MCFixup &Fixup, MCValue Target,<br>
> - uint64_t &FixedValue) override;<br>
> + void RecordRelocation(MachObjectWriter *Writer,<br>
> + const MCAssembler &Asm, const MCAsmLayout &Layout,<br>
> + const MCFragment *Fragment, const MCFixup &Fixup,<br>
> + MCValue Target, uint64_t &FixedValue) override;<br>
> };<br>
> }<br>
><br>
> @@ -232,7 +232,7 @@ RecordARMScatteredHalfRelocation(MachObj<br>
> (IsPCRel << 30) |<br>
> MachO::R_SCATTERED);<br>
> MRE.r_word1 = Value2;<br>
> - Writer->addRelocation(nullptr, Fragment->getParent(), MRE);<br>
> + Writer->addRelocation(Fragment->getParent(), MRE);<br>
> }<br>
><br>
> MachO::any_relocation_info MRE;<br>
> @@ -243,7 +243,7 @@ RecordARMScatteredHalfRelocation(MachObj<br>
> (IsPCRel << 30) |<br>
> MachO::R_SCATTERED);<br>
> MRE.r_word1 = Value;<br>
> - Writer->addRelocation(nullptr, Fragment->getParent(), MRE);<br>
> + Writer->addRelocation(Fragment->getParent(), MRE);<br>
> }<br>
><br>
> void ARMMachObjectWriter::RecordARMScatteredRelocation(MachObjectWriter *Writer,<br>
> @@ -297,7 +297,7 @@ void ARMMachObjectWriter::RecordARMScatt<br>
> (IsPCRel << 30) |<br>
> MachO::R_SCATTERED);<br>
> MRE.r_word1 = Value2;<br>
> - Writer->addRelocation(nullptr, Fragment->getParent(), MRE);<br>
> + Writer->addRelocation(Fragment->getParent(), MRE);<br>
> }<br>
><br>
> MachO::any_relocation_info MRE;<br>
> @@ -307,7 +307,7 @@ void ARMMachObjectWriter::RecordARMScatt<br>
> (IsPCRel << 30) |<br>
> MachO::R_SCATTERED);<br>
> MRE.r_word1 = Value;<br>
> - Writer->addRelocation(nullptr, Fragment->getParent(), MRE);<br>
> + Writer->addRelocation(Fragment->getParent(), MRE);<br>
> }<br>
><br>
> bool ARMMachObjectWriter::requiresExternRelocation(MachObjectWriter *Writer,<br>
> @@ -351,10 +351,11 @@ bool ARMMachObjectWriter::requiresExtern<br>
> }<br>
><br>
> void ARMMachObjectWriter::RecordRelocation(MachObjectWriter *Writer,<br>
> - MCAssembler &Asm,<br>
> + const MCAssembler &Asm,<br>
> const MCAsmLayout &Layout,<br>
> const MCFragment *Fragment,<br>
> - const MCFixup &Fixup, MCValue Target,<br>
> + const MCFixup &Fixup,<br>
> + MCValue Target,<br>
> uint64_t &FixedValue) {<br>
> unsigned IsPCRel = Writer->isFixupKindPCRel(Asm, Fixup.getKind());<br>
> unsigned Log2Size;<br>
> @@ -400,8 +401,8 @@ void ARMMachObjectWriter::RecordRelocati<br>
> // See <reloc.h>.<br>
> uint32_t FixupOffset = Layout.getFragmentOffset(Fragment)+Fixup.getOffset();<br>
> unsigned Index = 0;<br>
> + unsigned IsExtern = 0;<br>
> unsigned Type = 0;<br>
> - const MCSymbolData *RelSymbol = nullptr;<br>
><br>
> if (Target.isAbsolute()) { // constant<br>
> // FIXME!<br>
> @@ -421,7 +422,8 @@ void ARMMachObjectWriter::RecordRelocati<br>
> // Check whether we need an external or internal relocation.<br>
> if (requiresExternRelocation(Writer, Asm, *Fragment, RelocType, SD,<br>
> FixedValue)) {<br>
> - RelSymbol = SD;<br>
> + IsExtern = 1;<br>
> + Index = SD->getIndex();<br>
><br>
> // For external relocations, make sure to offset the fixup value to<br>
> // compensate for the addend of the symbol address, if it was<br>
> @@ -445,8 +447,11 @@ void ARMMachObjectWriter::RecordRelocati<br>
> // struct relocation_info (8 bytes)<br>
> MachO::any_relocation_info MRE;<br>
> MRE.r_word0 = FixupOffset;<br>
> - MRE.r_word1 =<br>
> - (Index << 0) | (IsPCRel << 24) | (Log2Size << 25) | (Type << 28);<br>
> + MRE.r_word1 = ((Index << 0) |<br>
> + (IsPCRel << 24) |<br>
> + (Log2Size << 25) |<br>
> + (IsExtern << 27) |<br>
> + (Type << 28));<br>
><br>
> // Even when it's not a scattered relocation, movw/movt always uses<br>
> // a PAIR relocation.<br>
> @@ -471,10 +476,10 @@ void ARMMachObjectWriter::RecordRelocati<br>
> (Log2Size << 25) |<br>
> (MachO::ARM_RELOC_PAIR << 28));<br>
><br>
> - Writer->addRelocation(nullptr, Fragment->getParent(), MREPair);<br>
> + Writer->addRelocation(Fragment->getParent(), MREPair);<br>
> }<br>
><br>
> - Writer->addRelocation(RelSymbol, Fragment->getParent(), MRE);<br>
> + Writer->addRelocation(Fragment->getParent(), MRE);<br>
> }<br>
><br>
> MCObjectWriter *llvm::createARMMachObjectWriter(raw_ostream &OS,<br>
><br>
> Modified: llvm/trunk/lib/Target/PowerPC/MCTargetDesc/PPCMachObjectWriter.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/MCTargetDesc/PPCMachObjectWriter.cpp?rev=225228&r1=225227&r2=225228&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/MCTargetDesc/PPCMachObjectWriter.cpp?rev=225228&r1=225227&r2=225228&view=diff</a><br>
> ==============================================================================<br>
> --- llvm/trunk/lib/Target/PowerPC/MCTargetDesc/PPCMachObjectWriter.cpp (original)<br>
> +++ llvm/trunk/lib/Target/PowerPC/MCTargetDesc/PPCMachObjectWriter.cpp Mon Jan 5 18:54:32 2015<br>
> @@ -41,7 +41,7 @@ public:<br>
> : MCMachObjectTargetWriter(Is64Bit, CPUType, CPUSubtype,<br>
> /*UseAggressiveSymbolFolding=*/Is64Bit) {}<br>
><br>
> - void RecordRelocation(MachObjectWriter *Writer, MCAssembler &Asm,<br>
> + void RecordRelocation(MachObjectWriter *Writer, const MCAssembler &Asm,<br>
> const MCAsmLayout &Layout, const MCFragment *Fragment,<br>
> const MCFixup &Fixup, MCValue Target,<br>
> uint64_t &FixedValue) override {<br>
> @@ -282,7 +282,7 @@ bool PPCMachObjectWriter::RecordScattere<br>
> MachO::any_relocation_info MRE;<br>
> makeScatteredRelocationInfo(MRE, other_half, MachO::GENERIC_RELOC_PAIR,<br>
> Log2Size, IsPCRel, Value2);<br>
> - Writer->addRelocation(nullptr, Fragment->getParent(), MRE);<br>
> + Writer->addRelocation(Fragment->getParent(), MRE);<br>
> } else {<br>
> // If the offset is more than 24-bits, it won't fit in a scattered<br>
> // relocation offset field, so we fall back to using a non-scattered<br>
> @@ -296,7 +296,7 @@ bool PPCMachObjectWriter::RecordScattere<br>
> }<br>
> MachO::any_relocation_info MRE;<br>
> makeScatteredRelocationInfo(MRE, FixupOffset, Type, Log2Size, IsPCRel, Value);<br>
> - Writer->addRelocation(nullptr, Fragment->getParent(), MRE);<br>
> + Writer->addRelocation(Fragment->getParent(), MRE);<br>
> return true;<br>
> }<br>
><br>
> @@ -331,9 +331,9 @@ void PPCMachObjectWriter::RecordPPCReloc<br>
> // See <reloc.h>.<br>
> const uint32_t FixupOffset = getFixupOffset(Layout, Fragment, Fixup);<br>
> unsigned Index = 0;<br>
> + unsigned IsExtern = 0;<br>
> unsigned Type = RelocType;<br>
><br>
> - const MCSymbolData *RelSymbol = nullptr;<br>
> if (Target.isAbsolute()) { // constant<br>
> // SymbolNum of 0 indicates the absolute section.<br>
> //<br>
> @@ -355,7 +355,8 @@ void PPCMachObjectWriter::RecordPPCReloc<br>
><br>
> // Check whether we need an external or internal relocation.<br>
> if (Writer->doesSymbolRequireExternRelocation(SD)) {<br>
> - RelSymbol = SD;<br>
> + IsExtern = 1;<br>
> + Index = SD->getIndex();<br>
> // For external relocations, make sure to offset the fixup value to<br>
> // compensate for the addend of the symbol address, if it was<br>
> // undefined. This occurs with weak definitions, for example.<br>
> @@ -374,8 +375,9 @@ void PPCMachObjectWriter::RecordPPCReloc<br>
><br>
> // struct relocation_info (8 bytes)<br>
> MachO::any_relocation_info MRE;<br>
> - makeRelocationInfo(MRE, FixupOffset, Index, IsPCRel, Log2Size, false, Type);<br>
> - Writer->addRelocation(RelSymbol, Fragment->getParent(), MRE);<br>
> + makeRelocationInfo(MRE, FixupOffset, Index, IsPCRel, Log2Size, IsExtern,<br>
> + Type);<br>
> + Writer->addRelocation(Fragment->getParent(), MRE);<br>
> }<br>
><br>
> MCObjectWriter *llvm::createPPCMachObjectWriter(raw_ostream &OS, bool Is64Bit,<br>
><br>
> Modified: llvm/trunk/lib/Target/R600/MCTargetDesc/AMDGPUAsmBackend.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/R600/MCTargetDesc/AMDGPUAsmBackend.cpp?rev=225228&r1=225227&r2=225228&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/R600/MCTargetDesc/AMDGPUAsmBackend.cpp?rev=225228&r1=225227&r2=225228&view=diff</a><br>
> ==============================================================================<br>
> --- llvm/trunk/lib/Target/R600/MCTargetDesc/AMDGPUAsmBackend.cpp (original)<br>
> +++ llvm/trunk/lib/Target/R600/MCTargetDesc/AMDGPUAsmBackend.cpp Mon Jan 5 18:54:32 2015<br>
> @@ -29,7 +29,7 @@ public:<br>
> const MCAsmLayout &Layout) override {<br>
> //XXX: Implement if necessary.<br>
> }<br>
> - void RecordRelocation(MCAssembler &Asm, const MCAsmLayout &Layout,<br>
> + void RecordRelocation(const MCAssembler &Asm, const MCAsmLayout &Layout,<br>
> const MCFragment *Fragment, const MCFixup &Fixup,<br>
> MCValue Target, bool &IsPCRel,<br>
> uint64_t &FixedValue) override {<br>
><br>
> Modified: llvm/trunk/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp?rev=225228&r1=225227&r2=225228&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp?rev=225228&r1=225227&r2=225228&view=diff</a><br>
> ==============================================================================<br>
> --- llvm/trunk/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp (original)<br>
> +++ llvm/trunk/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp Mon Jan 5 18:54:32 2015<br>
> @@ -777,6 +777,19 @@ public:<br>
> MachO::CPU_TYPE_X86_64, Subtype);<br>
> }<br>
><br>
> + bool doesSectionRequireSymbols(const MCSection &Section) const override {<br>
> + // Temporary labels in the string literals sections require symbols. The<br>
> + // issue is that the x86_64 relocation format does not allow symbol +<br>
> + // offset, and so the linker does not have enough information to resolve the<br>
> + // access to the appropriate atom unless an external relocation is used. For<br>
> + // non-cstring sections, we expect the compiler to use a non-temporary label<br>
> + // for anything that could have an addend pointing outside the symbol.<br>
> + //<br>
> + // See <rdar://problem/4765733>.<br>
> + const MCSectionMachO &SMO = static_cast<const MCSectionMachO&>(Section);<br>
> + return SMO.getType() == MachO::S_CSTRING_LITERALS;<br>
> + }<br>
> +<br>
> /// \brief Generate the compact unwind encoding for the CFI instructions.<br>
> uint32_t generateCompactUnwindEncoding(<br>
> ArrayRef<MCCFIInstruction> Instrs) const override {<br>
><br>
> Modified: llvm/trunk/lib/Target/X86/MCTargetDesc/X86MachObjectWriter.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/MCTargetDesc/X86MachObjectWriter.cpp?rev=225228&r1=225227&r2=225228&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/MCTargetDesc/X86MachObjectWriter.cpp?rev=225228&r1=225227&r2=225228&view=diff</a><br>
> ==============================================================================<br>
> --- llvm/trunk/lib/Target/X86/MCTargetDesc/X86MachObjectWriter.cpp (original)<br>
> +++ llvm/trunk/lib/Target/X86/MCTargetDesc/X86MachObjectWriter.cpp Mon Jan 5 18:54:32 2015<br>
> @@ -10,7 +10,6 @@<br>
> #include "MCTargetDesc/X86MCTargetDesc.h"<br>
> #include "MCTargetDesc/X86FixupKinds.h"<br>
> #include "llvm/ADT/Twine.h"<br>
> -#include "llvm/MC/MCAsmInfo.h"<br>
> #include "llvm/MC/MCAsmLayout.h"<br>
> #include "llvm/MC/MCAssembler.h"<br>
> #include "llvm/MC/MCContext.h"<br>
> @@ -48,21 +47,23 @@ class X86MachObjectWriter : public MCMac<br>
> const MCFixup &Fixup,<br>
> MCValue Target,<br>
> uint64_t &FixedValue);<br>
> - void RecordX86_64Relocation(MachObjectWriter *Writer, MCAssembler &Asm,<br>
> + void RecordX86_64Relocation(MachObjectWriter *Writer,<br>
> + const MCAssembler &Asm,<br>
> const MCAsmLayout &Layout,<br>
> - const MCFragment *Fragment, const MCFixup &Fixup,<br>
> - MCValue Target, uint64_t &FixedValue);<br>
> -<br>
> + const MCFragment *Fragment,<br>
> + const MCFixup &Fixup,<br>
> + MCValue Target,<br>
> + uint64_t &FixedValue);<br>
> public:<br>
> X86MachObjectWriter(bool Is64Bit, uint32_t CPUType,<br>
> uint32_t CPUSubtype)<br>
> : MCMachObjectTargetWriter(Is64Bit, CPUType, CPUSubtype,<br>
> /*UseAggressiveSymbolFolding=*/Is64Bit) {}<br>
><br>
> - void RecordRelocation(MachObjectWriter *Writer, MCAssembler &Asm,<br>
> - const MCAsmLayout &Layout, const MCFragment *Fragment,<br>
> - const MCFixup &Fixup, MCValue Target,<br>
> - uint64_t &FixedValue) override {<br>
> + void RecordRelocation(MachObjectWriter *Writer,<br>
> + const MCAssembler &Asm, const MCAsmLayout &Layout,<br>
> + const MCFragment *Fragment, const MCFixup &Fixup,<br>
> + MCValue Target, uint64_t &FixedValue) override {<br>
> if (Writer->is64Bit())<br>
> RecordX86_64Relocation(Writer, Asm, Layout, Fragment, Fixup, Target,<br>
> FixedValue);<br>
> @@ -96,10 +97,13 @@ static unsigned getFixupKindLog2Size(uns<br>
> }<br>
> }<br>
><br>
> -void X86MachObjectWriter::RecordX86_64Relocation(<br>
> - MachObjectWriter *Writer, MCAssembler &Asm, const MCAsmLayout &Layout,<br>
> - const MCFragment *Fragment, const MCFixup &Fixup, MCValue Target,<br>
> - uint64_t &FixedValue) {<br>
> +void X86MachObjectWriter::RecordX86_64Relocation(MachObjectWriter *Writer,<br>
> + const MCAssembler &Asm,<br>
> + const MCAsmLayout &Layout,<br>
> + const MCFragment *Fragment,<br>
> + const MCFixup &Fixup,<br>
> + MCValue Target,<br>
> + uint64_t &FixedValue) {<br>
> unsigned IsPCRel = Writer->isFixupKindPCRel(Asm, Fixup.getKind());<br>
> unsigned IsRIPRel = isFixupKindRIPRel(Fixup.getKind());<br>
> unsigned Log2Size = getFixupKindLog2Size(Fixup.getKind());<br>
> @@ -113,7 +117,6 @@ void X86MachObjectWriter::RecordX86_64Re<br>
> unsigned Index = 0;<br>
> unsigned IsExtern = 0;<br>
> unsigned Type = 0;<br>
> - const MCSymbolData *RelSymbol = nullptr;<br>
><br>
> Value = Target.getConstant();<br>
><br>
> @@ -129,6 +132,7 @@ void X86MachObjectWriter::RecordX86_64Re<br>
> if (Target.isAbsolute()) { // constant<br>
> // SymbolNum of 0 indicates the absolute section.<br>
> Type = MachO::X86_64_RELOC_UNSIGNED;<br>
> + Index = 0;<br>
><br>
> // FIXME: I believe this is broken, I don't think the linker can understand<br>
> // it. I think it would require a local relocation, but I'm not sure if that<br>
> @@ -189,30 +193,36 @@ void X86MachObjectWriter::RecordX86_64Re<br>
> Value -= Writer->getSymbolAddress(&B_SD, Layout) -<br>
> (!B_Base ? 0 : Writer->getSymbolAddress(B_Base, Layout));<br>
><br>
> - if (!A_Base)<br>
> + if (A_Base) {<br>
> + Index = A_Base->getIndex();<br>
> + IsExtern = 1;<br>
> + } else {<br>
> Index = A_SD.getFragment()->getParent()->getOrdinal() + 1;<br>
> + IsExtern = 0;<br>
> + }<br>
> Type = MachO::X86_64_RELOC_UNSIGNED;<br>
><br>
> MachO::any_relocation_info MRE;<br>
> MRE.r_word0 = FixupOffset;<br>
> - MRE.r_word1 =<br>
> - (Index << 0) | (IsPCRel << 24) | (Log2Size << 25) | (Type << 28);<br>
> - Writer->addRelocation(A_Base, Fragment->getParent(), MRE);<br>
> + MRE.r_word1 = ((Index << 0) |<br>
> + (IsPCRel << 24) |<br>
> + (Log2Size << 25) |<br>
> + (IsExtern << 27) |<br>
> + (Type << 28));<br>
> + Writer->addRelocation(Fragment->getParent(), MRE);<br>
><br>
> - if (B_Base)<br>
> - RelSymbol = B_Base;<br>
> - else<br>
> + if (B_Base) {<br>
> + Index = B_Base->getIndex();<br>
> + IsExtern = 1;<br>
> + } else {<br>
> Index = B_SD.getFragment()->getParent()->getOrdinal() + 1;<br>
> + IsExtern = 0;<br>
> + }<br>
> Type = MachO::X86_64_RELOC_SUBTRACTOR;<br>
> } else {<br>
> const MCSymbol *Symbol = &Target.getSymA()->getSymbol();<br>
> - if (Symbol->isTemporary() && Value) {<br>
> - const MCSection &Sec = Symbol->getSection();<br>
> - if (!Asm.getContext().getAsmInfo()->isSectionAtomizableBySymbols(Sec))<br>
> - Asm.addLocalUsedInReloc(*Symbol);<br>
> - }<br>
> const MCSymbolData &SD = Asm.getSymbolData(*Symbol);<br>
> - RelSymbol = Asm.getAtom(&SD);<br>
> + const MCSymbolData *Base = Asm.getAtom(&SD);<br>
><br>
> // Relocations inside debug sections always use local relocations when<br>
> // possible. This seems to be done because the debugger doesn't fully<br>
> @@ -222,20 +232,23 @@ void X86MachObjectWriter::RecordX86_64Re<br>
> const MCSectionMachO &Section = static_cast<const MCSectionMachO&>(<br>
> Fragment->getParent()->getSection());<br>
> if (Section.hasAttribute(MachO::S_ATTR_DEBUG))<br>
> - RelSymbol = nullptr;<br>
> + Base = nullptr;<br>
> }<br>
><br>
> // x86_64 almost always uses external relocations, except when there is no<br>
> // symbol to use as a base address (a local symbol with no preceding<br>
> // non-local symbol).<br>
> - if (RelSymbol) {<br>
> + if (Base) {<br>
> + Index = Base->getIndex();<br>
> + IsExtern = 1;<br>
> +<br>
> // Add the local offset, if needed.<br>
> - if (RelSymbol != &SD)<br>
> - Value +=<br>
> - Layout.getSymbolOffset(&SD) - Layout.getSymbolOffset(RelSymbol);<br>
> + if (Base != &SD)<br>
> + Value += Layout.getSymbolOffset(&SD) - Layout.getSymbolOffset(Base);<br>
> } else if (Symbol->isInSection() && !Symbol->isVariable()) {<br>
> // The index is the section ordinal (1-based).<br>
> Index = SD.getFragment()->getParent()->getOrdinal() + 1;<br>
> + IsExtern = 0;<br>
> Value += Writer->getSymbolAddress(&SD, Layout);<br>
><br>
> if (IsPCRel)<br>
> @@ -334,9 +347,12 @@ void X86MachObjectWriter::RecordX86_64Re<br>
> // struct relocation_info (8 bytes)<br>
> MachO::any_relocation_info MRE;<br>
> MRE.r_word0 = FixupOffset;<br>
> - MRE.r_word1 = (Index << 0) | (IsPCRel << 24) | (Log2Size << 25) |<br>
> - (IsExtern << 27) | (Type << 28);<br>
> - Writer->addRelocation(RelSymbol, Fragment->getParent(), MRE);<br>
> + MRE.r_word1 = ((Index << 0) |<br>
> + (IsPCRel << 24) |<br>
> + (Log2Size << 25) |<br>
> + (IsExtern << 27) |<br>
> + (Type << 28));<br>
> + Writer->addRelocation(Fragment->getParent(), MRE);<br>
> }<br>
><br>
> bool X86MachObjectWriter::RecordScatteredRelocation(MachObjectWriter *Writer,<br>
> @@ -408,7 +424,7 @@ bool X86MachObjectWriter::RecordScattere<br>
> (IsPCRel << 30) |<br>
> MachO::R_SCATTERED);<br>
> MRE.r_word1 = Value2;<br>
> - Writer->addRelocation(nullptr, Fragment->getParent(), MRE);<br>
> + Writer->addRelocation(Fragment->getParent(), MRE);<br>
> } else {<br>
> // If the offset is more than 24-bits, it won't fit in a scattered<br>
> // relocation offset field, so we fall back to using a non-scattered<br>
> @@ -430,7 +446,7 @@ bool X86MachObjectWriter::RecordScattere<br>
> (IsPCRel << 30) |<br>
> MachO::R_SCATTERED);<br>
> MRE.r_word1 = Value;<br>
> - Writer->addRelocation(nullptr, Fragment->getParent(), MRE);<br>
> + Writer->addRelocation(Fragment->getParent(), MRE);<br>
> return true;<br>
> }<br>
><br>
> @@ -451,6 +467,7 @@ void X86MachObjectWriter::RecordTLVPRelo<br>
><br>
> // Get the symbol data.<br>
> const MCSymbolData *SD_A = &Asm.getSymbolData(Target.getSymA()->getSymbol());<br>
> + unsigned Index = SD_A->getIndex();<br>
><br>
> // We're only going to have a second symbol in pic mode and it'll be a<br>
> // subtraction from the picbase. For 32-bit pic the addend is the difference<br>
> @@ -473,9 +490,12 @@ void X86MachObjectWriter::RecordTLVPRelo<br>
> // struct relocation_info (8 bytes)<br>
> MachO::any_relocation_info MRE;<br>
> MRE.r_word0 = Value;<br>
> - MRE.r_word1 =<br>
> - (IsPCRel << 24) | (Log2Size << 25) | (MachO::GENERIC_RELOC_TLV << 28);<br>
> - Writer->addRelocation(SD_A, Fragment->getParent(), MRE);<br>
> + MRE.r_word1 = ((Index << 0) |<br>
> + (IsPCRel << 24) |<br>
> + (Log2Size << 25) |<br>
> + (1 << 27) | // r_extern<br>
> + (MachO::GENERIC_RELOC_TLV << 28)); // r_type<br>
> + Writer->addRelocation(Fragment->getParent(), MRE);<br>
> }<br>
><br>
> void X86MachObjectWriter::RecordX86Relocation(MachObjectWriter *Writer,<br>
> @@ -526,8 +546,8 @@ void X86MachObjectWriter::RecordX86Reloc<br>
> // See <reloc.h>.<br>
> uint32_t FixupOffset = Layout.getFragmentOffset(Fragment)+Fixup.getOffset();<br>
> unsigned Index = 0;<br>
> + unsigned IsExtern = 0;<br>
> unsigned Type = 0;<br>
> - const MCSymbolData *RelSymbol = nullptr;<br>
><br>
> if (Target.isAbsolute()) { // constant<br>
> // SymbolNum of 0 indicates the absolute section.<br>
> @@ -548,7 +568,8 @@ void X86MachObjectWriter::RecordX86Reloc<br>
><br>
> // Check whether we need an external or internal relocation.<br>
> if (Writer->doesSymbolRequireExternRelocation(SD)) {<br>
> - RelSymbol = SD;<br>
> + IsExtern = 1;<br>
> + Index = SD->getIndex();<br>
> // For external relocations, make sure to offset the fixup value to<br>
> // compensate for the addend of the symbol address, if it was<br>
> // undefined. This occurs with weak definitions, for example.<br>
> @@ -570,9 +591,12 @@ void X86MachObjectWriter::RecordX86Reloc<br>
> // struct relocation_info (8 bytes)<br>
> MachO::any_relocation_info MRE;<br>
> MRE.r_word0 = FixupOffset;<br>
> - MRE.r_word1 =<br>
> - (Index << 0) | (IsPCRel << 24) | (Log2Size << 25) | (Type << 28);<br>
> - Writer->addRelocation(RelSymbol, Fragment->getParent(), MRE);<br>
> + MRE.r_word1 = ((Index << 0) |<br>
> + (IsPCRel << 24) |<br>
> + (Log2Size << 25) |<br>
> + (IsExtern << 27) |<br>
> + (Type << 28));<br>
> + Writer->addRelocation(Fragment->getParent(), MRE);<br>
> }<br>
><br>
> MCObjectWriter *llvm::createX86MachObjectWriter(raw_ostream &OS,<br>
><br>
> Removed: llvm/trunk/test/MC/MachO/AArch64/mergeable.s<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/MachO/AArch64/mergeable.s?rev=225227&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/MachO/AArch64/mergeable.s?rev=225227&view=auto</a><br>
> ==============================================================================<br>
> --- llvm/trunk/test/MC/MachO/AArch64/mergeable.s (original)<br>
> +++ llvm/trunk/test/MC/MachO/AArch64/mergeable.s (removed)<br>
> @@ -1,59 +0,0 @@<br>
> -// RUN: llvm-mc -triple aarch64-apple-darwin14 %s -filetype=obj -o - | llvm-readobj -r --expand-relocs | FileCheck %s<br>
> -<br>
> -// Test that we "S + K" produce a relocation with a symbol, but just S produces<br>
> -// a relocation with the section.<br>
> -<br>
> - .section __TEXT,__literal4,4byte_literals<br>
> -L0:<br>
> - .long 42<br>
> -<br>
> - .section __TEXT,__cstring,cstring_literals<br>
> -L1:<br>
> - .asciz "42"<br>
> -<br>
> - .section __DATA,__data<br>
> - .quad L0<br>
> - .quad L0 + 1<br>
> - .quad L1<br>
> - .quad L1 + 1<br>
> -<br>
> -// CHECK: Relocations [<br>
> -// CHECK-NEXT: Section __data {<br>
> -// CHECK-NEXT: Relocation {<br>
> -// CHECK-NEXT: Offset: 0x18<br>
> -// CHECK-NEXT: PCRel: 0<br>
> -// CHECK-NEXT: Length: 3<br>
> -// CHECK-NEXT: Extern: 1<br>
> -// CHECK-NEXT: Type: ARM64_RELOC_UNSIGNED (0)<br>
> -// CHECK-NEXT: Symbol: L1<br>
> -// CHECK-NEXT: Scattered: 0<br>
> -// CHECK-NEXT: }<br>
> -// CHECK-NEXT: Relocation {<br>
> -// CHECK-NEXT: Offset: 0x10<br>
> -// CHECK-NEXT: PCRel: 0<br>
> -// CHECK-NEXT: Length: 3<br>
> -// CHECK-NEXT: Extern: 0<br>
> -// CHECK-NEXT: Type: ARM64_RELOC_UNSIGNED (0)<br>
> -// CHECK-NEXT: Symbol: 0x3<br>
> -// CHECK-NEXT: Scattered: 0<br>
> -// CHECK-NEXT: }<br>
> -// CHECK-NEXT: Relocation {<br>
> -// CHECK-NEXT: Offset: 0x8<br>
> -// CHECK-NEXT: PCRel: 0<br>
> -// CHECK-NEXT: Length: 3<br>
> -// CHECK-NEXT: Extern: 1<br>
> -// CHECK-NEXT: Type: ARM64_RELOC_UNSIGNED (0)<br>
> -// CHECK-NEXT: Symbol: L0<br>
> -// CHECK-NEXT: Scattered: 0<br>
> -// CHECK-NEXT: }<br>
> -// CHECK-NEXT: Relocation {<br>
> -// CHECK-NEXT: Offset: 0x0<br>
> -// CHECK-NEXT: PCRel: 0<br>
> -// CHECK-NEXT: Length: 3<br>
> -// CHECK-NEXT: Extern: 0<br>
> -// CHECK-NEXT: Type: ARM64_RELOC_UNSIGNED (0)<br>
> -// CHECK-NEXT: Symbol: 0x2<br>
> -// CHECK-NEXT: Scattered: 0<br>
> -// CHECK-NEXT: }<br>
> -// CHECK-NEXT: }<br>
> -// CHECK-NEXT: ]<br>
><br>
> Removed: llvm/trunk/test/MC/MachO/x86_64-mergeable.s<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/MachO/x86_64-mergeable.s?rev=225227&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/MachO/x86_64-mergeable.s?rev=225227&view=auto</a><br>
> ==============================================================================<br>
> --- llvm/trunk/test/MC/MachO/x86_64-mergeable.s (original)<br>
> +++ llvm/trunk/test/MC/MachO/x86_64-mergeable.s (removed)<br>
> @@ -1,59 +0,0 @@<br>
> -// RUN: llvm-mc -triple x86_64-apple-darwin14 %s -filetype=obj -o - | llvm-readobj -r --expand-relocs | FileCheck %s<br>
> -<br>
> -// Test that we "S + K" produce a relocation with a symbol, but just S produces<br>
> -// a relocation with the section.<br>
> -<br>
> - .section __TEXT,__literal4,4byte_literals<br>
> -L0:<br>
> - .long 42<br>
> -<br>
> - .section __TEXT,__cstring,cstring_literals<br>
> -L1:<br>
> - .asciz "42"<br>
> -<br>
> - .section __DATA,__data<br>
> - .quad L0<br>
> - .quad L0 + 1<br>
> - .quad L1<br>
> - .quad L1 + 1<br>
> -<br>
> -// CHECK: Relocations [<br>
> -// CHECK-NEXT: Section __data {<br>
> -// CHECK-NEXT: Relocation {<br>
> -// CHECK-NEXT: Offset: 0x18<br>
> -// CHECK-NEXT: PCRel: 0<br>
> -// CHECK-NEXT: Length: 3<br>
> -// CHECK-NEXT: Extern: 1<br>
> -// CHECK-NEXT: Type: X86_64_RELOC_UNSIGNED (0)<br>
> -// CHECK-NEXT: Symbol: L1<br>
> -// CHECK-NEXT: Scattered: 0<br>
> -// CHECK-NEXT: }<br>
> -// CHECK-NEXT: Relocation {<br>
> -// CHECK-NEXT: Offset: 0x10<br>
> -// CHECK-NEXT: PCRel: 0<br>
> -// CHECK-NEXT: Length: 3<br>
> -// CHECK-NEXT: Extern: 0<br>
> -// CHECK-NEXT: Type: X86_64_RELOC_UNSIGNED (0)<br>
> -// CHECK-NEXT: Symbol: 0x3<br>
> -// CHECK-NEXT: Scattered: 0<br>
> -// CHECK-NEXT: }<br>
> -// CHECK-NEXT: Relocation {<br>
> -// CHECK-NEXT: Offset: 0x8<br>
> -// CHECK-NEXT: PCRel: 0<br>
> -// CHECK-NEXT: Length: 3<br>
> -// CHECK-NEXT: Extern: 1<br>
> -// CHECK-NEXT: Type: X86_64_RELOC_UNSIGNED (0)<br>
> -// CHECK-NEXT: Symbol: L0<br>
> -// CHECK-NEXT: Scattered: 0<br>
> -// CHECK-NEXT: }<br>
> -// CHECK-NEXT: Relocation {<br>
> -// CHECK-NEXT: Offset: 0x0<br>
> -// CHECK-NEXT: PCRel: 0<br>
> -// CHECK-NEXT: Length: 3<br>
> -// CHECK-NEXT: Extern: 0<br>
> -// CHECK-NEXT: Type: X86_64_RELOC_UNSIGNED (0)<br>
> -// CHECK-NEXT: Symbol: 0x2<br>
> -// CHECK-NEXT: Scattered: 0<br>
> -// CHECK-NEXT: }<br>
> -// CHECK-NEXT: }<br>
> -// CHECK-NEXT: ]<br>
><br>
> Modified: llvm/trunk/test/MC/MachO/x86_64-symbols.s<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/MachO/x86_64-symbols.s?rev=225228&r1=225227&r2=225228&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/MachO/x86_64-symbols.s?rev=225228&r1=225227&r2=225228&view=diff</a><br>
> ==============================================================================<br>
> --- llvm/trunk/test/MC/MachO/x86_64-symbols.s (original)<br>
> +++ llvm/trunk/test/MC/MachO/x86_64-symbols.s Mon Jan 5 18:54:32 2015<br>
> @@ -121,12 +121,6 @@ D38:<br>
> //L39:<br>
> //D39:<br>
><br>
> - .section foo, bar<br>
> - .long L4 + 1<br>
> - .long L35 + 1<br>
> - .long L36 + 1<br>
> - .long L37 + 1<br>
> - .long L38 + 1<br>
><br>
> // CHECK: Symbols [<br>
> // CHECK-NEXT: Symbol {<br>
><br>
><br>
> _______________________________________________<br>
> llvm-commits mailing list<br>
> <a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
> <a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</div></div></blockquote></div><br></div>