X-Git-Url: http://plrg.eecs.uci.edu/git/?p=oota-llvm.git;a=blobdiff_plain;f=lib%2FMC%2FWinCOFFObjectWriter.cpp;h=81facc01eed4160fe731693d43b979dbd20c56ab;hp=396683ffceadbbaa194bc795f66b05f575bb77dc;hb=25059fcca033e9a9e65a31c1209d4ab3d354e38f;hpb=4edcbaec90380a60f278988b2ffc8ecc8fd2d762 diff --git a/lib/MC/WinCOFFObjectWriter.cpp b/lib/MC/WinCOFFObjectWriter.cpp index 396683ffcea..81facc01eed 100644 --- a/lib/MC/WinCOFFObjectWriter.cpp +++ b/lib/MC/WinCOFFObjectWriter.cpp @@ -13,26 +13,29 @@ #include "llvm/MC/MCWinCOFFObjectWriter.h" #include "llvm/ADT/DenseMap.h" +#include "llvm/ADT/STLExtras.h" #include "llvm/ADT/StringMap.h" #include "llvm/ADT/StringRef.h" -#include "llvm/ADT/STLExtras.h" #include "llvm/ADT/Twine.h" #include "llvm/MC/MCAsmLayout.h" #include "llvm/MC/MCAssembler.h" #include "llvm/MC/MCContext.h" #include "llvm/MC/MCExpr.h" +#include "llvm/MC/MCObjectFileInfo.h" #include "llvm/MC/MCObjectWriter.h" #include "llvm/MC/MCSection.h" #include "llvm/MC/MCSectionCOFF.h" -#include "llvm/MC/MCSymbol.h" +#include "llvm/MC/MCSymbolCOFF.h" #include "llvm/MC/MCValue.h" #include "llvm/MC/StringTableBuilder.h" #include "llvm/Support/COFF.h" #include "llvm/Support/Debug.h" #include "llvm/Support/Endian.h" #include "llvm/Support/ErrorHandling.h" +#include "llvm/Support/JamCRC.h" #include "llvm/Support/TimeValue.h" #include +#include using namespace llvm; @@ -50,7 +53,7 @@ enum AuxiliaryType { }; struct AuxSymbol { - AuxiliaryType AuxType; + AuxiliaryType AuxType; COFF::Auxiliary Aux; }; @@ -63,25 +66,32 @@ public: typedef SmallVector AuxiliarySymbols; - name Name; - int Index; + name Name; + int Index; AuxiliarySymbols Aux; - COFFSymbol *Other; - COFFSection *Section; - int Relocations; + COFFSymbol *Other; + COFFSection *Section; + int Relocations; - MCSymbolData const *MCData; + const MCSymbol *MC; COFFSymbol(StringRef name); void set_name_offset(uint32_t Offset); bool should_keep() const; + + int64_t getIndex() const { return Index; } + void setIndex(int Value) { + Index = Value; + if (MC) + MC->setIndex(static_cast(Value)); + } }; // This class contains staging data for a COFF relocation entry. struct COFFRelocation { COFF::relocation Data; - COFFSymbol *Symb; + COFFSymbol *Symb; COFFRelocation() : Symb(nullptr) {} static size_t size() { return COFF::RelocationSize; } @@ -93,11 +103,11 @@ class COFFSection { public: COFF::section Header; - std::string Name; - int Number; - MCSectionData const *MCData; - COFFSymbol *Symbol; - relocations Relocations; + std::string Name; + int Number; + MCSectionCOFF const *MCSection; + COFFSymbol *Symbol; + relocations Relocations; COFFSection(StringRef name); static size_t size(); @@ -105,29 +115,28 @@ public: class WinCOFFObjectWriter : public MCObjectWriter { public: - - typedef std::vector> symbols; + typedef std::vector> symbols; typedef std::vector> sections; - typedef DenseMap symbol_map; + typedef DenseMap symbol_map; typedef DenseMap section_map; std::unique_ptr TargetObjectWriter; // Root level file contents. COFF::header Header; - sections Sections; - symbols Symbols; + sections Sections; + symbols Symbols; StringTableBuilder Strings; // Maps used during object file creation. section_map SectionMap; - symbol_map SymbolMap; + symbol_map SymbolMap; bool UseBigObj; - WinCOFFObjectWriter(MCWinCOFFObjectTargetWriter *MOTW, raw_ostream &OS); - + WinCOFFObjectWriter(MCWinCOFFObjectTargetWriter *MOTW, raw_pwrite_stream &OS); + void reset() override { memset(&Header, 0, sizeof(Header)); Header.Machine = TargetObjectWriter->getMachine(); @@ -140,14 +149,14 @@ public: } COFFSymbol *createSymbol(StringRef Name); - COFFSymbol *GetOrCreateCOFFSymbol(const MCSymbol * Symbol); + COFFSymbol *GetOrCreateCOFFSymbol(const MCSymbol *Symbol); COFFSection *createSection(StringRef Name); template object_t *createCOFFEntity(StringRef Name, list_t &List); - void DefineSection(MCSectionData const &SectionData); - void DefineSymbol(MCSymbolData const &SymbolData, MCAssembler &Assembler, + void defineSection(MCSectionCOFF const &Sec); + void DefineSymbol(const MCSymbol &Symbol, MCAssembler &Assembler, const MCAsmLayout &Layout); void SetSymbolName(COFFSymbol &S); @@ -162,20 +171,27 @@ public: void WriteFileHeader(const COFF::header &Header); void WriteSymbol(const COFFSymbol &S); void WriteAuxiliarySymbols(const COFFSymbol::AuxiliarySymbols &S); - void WriteSectionHeader(const COFF::section &S); + void writeSectionHeader(const COFF::section &S); void WriteRelocation(const COFF::relocation &R); // MCObjectWriter interface implementation. - void ExecutePostLayoutBinding(MCAssembler &Asm, + void executePostLayoutBinding(MCAssembler &Asm, const MCAsmLayout &Layout) override; - void RecordRelocation(const MCAssembler &Asm, const MCAsmLayout &Layout, + bool isSymbolRefDifferenceFullyResolvedImpl(const MCAssembler &Asm, + const MCSymbol &SymA, + const MCFragment &FB, bool InSet, + bool IsPCRel) const override; + + bool isWeak(const MCSymbol &Sym) const override; + + void recordRelocation(MCAssembler &Asm, const MCAsmLayout &Layout, const MCFragment *Fragment, const MCFixup &Fixup, MCValue Target, bool &IsPCRel, uint64_t &FixedValue) override; - void WriteObject(MCAssembler &Asm, const MCAsmLayout &Layout) override; + void writeObject(MCAssembler &Asm, const MCAsmLayout &Layout) override; }; } @@ -188,11 +204,8 @@ static inline void write_uint32_le(void *Data, uint32_t Value) { // Symbol class implementation COFFSymbol::COFFSymbol(StringRef name) - : Name(name.begin(), name.end()) - , Other(nullptr) - , Section(nullptr) - , Relocations(0) - , MCData(nullptr) { + : Name(name.begin(), name.end()), Other(nullptr), Section(nullptr), + Relocations(0), MC(nullptr) { memset(&Data, 0, sizeof(Data)); } @@ -211,22 +224,26 @@ bool COFFSymbol::should_keep() const { return true; // if it has relocations pointing at it, keep it - if (Relocations > 0) { + if (Relocations > 0) { assert(Section->Number != -1 && "Sections with relocations must be real!"); return true; } + // if this is a safeseh handler, keep it + if (MC && (cast(MC)->isSafeSEH())) + return true; + // if the section its in is being droped, drop it if (Section->Number == -1) - return false; + return false; // if it is the section symbol, keep it if (Section->Symbol == this) return true; // if its temporary, drop it - if (MCData && MCData->getSymbol().isTemporary()) - return false; + if (MC && MC->isTemporary()) + return false; // otherwise, keep it return true; @@ -236,21 +253,17 @@ bool COFFSymbol::should_keep() const { // Section class implementation COFFSection::COFFSection(StringRef name) - : Name(name) - , MCData(nullptr) - , Symbol(nullptr) { + : Name(name), MCSection(nullptr), Symbol(nullptr) { memset(&Header, 0, sizeof(Header)); } -size_t COFFSection::size() { - return COFF::SectionSize; -} +size_t COFFSection::size() { return COFF::SectionSize; } //------------------------------------------------------------------------------ // WinCOFFObjectWriter class implementation WinCOFFObjectWriter::WinCOFFObjectWriter(MCWinCOFFObjectTargetWriter *MOTW, - raw_ostream &OS) + raw_pwrite_stream &OS) : MCObjectWriter(OS, true), TargetObjectWriter(MOTW) { memset(&Header, 0, sizeof(Header)); @@ -261,12 +274,12 @@ COFFSymbol *WinCOFFObjectWriter::createSymbol(StringRef Name) { return createCOFFEntity(Name, Symbols); } -COFFSymbol *WinCOFFObjectWriter::GetOrCreateCOFFSymbol(const MCSymbol * Symbol){ +COFFSymbol *WinCOFFObjectWriter::GetOrCreateCOFFSymbol(const MCSymbol *Symbol) { symbol_map::iterator i = SymbolMap.find(Symbol); if (i != SymbolMap.end()) return i->second; - COFFSymbol *RetSymbol - = createCOFFEntity(Symbol->getName(), Symbols); + COFFSymbol *RetSymbol = + createCOFFEntity(Symbol->getName(), Symbols); SymbolMap[Symbol] = RetSymbol; return RetSymbol; } @@ -278,8 +291,7 @@ COFFSection *WinCOFFObjectWriter::createSection(StringRef Name) { /// A template used to lookup or create a symbol/section, and initialize it if /// needed. template -object_t *WinCOFFObjectWriter::createCOFFEntity(StringRef Name, - list_t &List) { +object_t *WinCOFFObjectWriter::createCOFFEntity(StringRef Name, list_t &List) { List.push_back(make_unique(Name)); return List.back().get(); @@ -287,15 +299,9 @@ object_t *WinCOFFObjectWriter::createCOFFEntity(StringRef Name, /// This function takes a section data object from the assembler /// and creates the associated COFF section staging object. -void WinCOFFObjectWriter::DefineSection(MCSectionData const &SectionData) { - assert(SectionData.getSection().getVariant() == MCSection::SV_COFF - && "Got non-COFF section in the COFF backend!"); - // FIXME: Not sure how to verify this (at least in a debug build). - MCSectionCOFF const &Sec = - static_cast(SectionData.getSection()); - +void WinCOFFObjectWriter::defineSection(MCSectionCOFF const &Sec) { COFFSection *coff_section = createSection(Sec.getSectionName()); - COFFSymbol *coff_symbol = createSymbol(Sec.getSectionName()); + COFFSymbol *coff_symbol = createSymbol(Sec.getSectionName()); if (Sec.getSelection() != COFF::IMAGE_COMDAT_SELECT_ASSOCIATIVE) { if (const MCSymbol *S = Sec.getCOMDATSymbol()) { COFFSymbol *COMDATSymbol = GetOrCreateCOFFSymbol(S); @@ -318,37 +324,65 @@ void WinCOFFObjectWriter::DefineSection(MCSectionData const &SectionData) { coff_section->Header.Characteristics = Sec.getCharacteristics(); uint32_t &Characteristics = coff_section->Header.Characteristics; - switch (SectionData.getAlignment()) { - case 1: Characteristics |= COFF::IMAGE_SCN_ALIGN_1BYTES; break; - case 2: Characteristics |= COFF::IMAGE_SCN_ALIGN_2BYTES; break; - case 4: Characteristics |= COFF::IMAGE_SCN_ALIGN_4BYTES; break; - case 8: Characteristics |= COFF::IMAGE_SCN_ALIGN_8BYTES; break; - case 16: Characteristics |= COFF::IMAGE_SCN_ALIGN_16BYTES; break; - case 32: Characteristics |= COFF::IMAGE_SCN_ALIGN_32BYTES; break; - case 64: Characteristics |= COFF::IMAGE_SCN_ALIGN_64BYTES; break; - case 128: Characteristics |= COFF::IMAGE_SCN_ALIGN_128BYTES; break; - case 256: Characteristics |= COFF::IMAGE_SCN_ALIGN_256BYTES; break; - case 512: Characteristics |= COFF::IMAGE_SCN_ALIGN_512BYTES; break; - case 1024: Characteristics |= COFF::IMAGE_SCN_ALIGN_1024BYTES; break; - case 2048: Characteristics |= COFF::IMAGE_SCN_ALIGN_2048BYTES; break; - case 4096: Characteristics |= COFF::IMAGE_SCN_ALIGN_4096BYTES; break; - case 8192: Characteristics |= COFF::IMAGE_SCN_ALIGN_8192BYTES; break; + switch (Sec.getAlignment()) { + case 1: + Characteristics |= COFF::IMAGE_SCN_ALIGN_1BYTES; + break; + case 2: + Characteristics |= COFF::IMAGE_SCN_ALIGN_2BYTES; + break; + case 4: + Characteristics |= COFF::IMAGE_SCN_ALIGN_4BYTES; + break; + case 8: + Characteristics |= COFF::IMAGE_SCN_ALIGN_8BYTES; + break; + case 16: + Characteristics |= COFF::IMAGE_SCN_ALIGN_16BYTES; + break; + case 32: + Characteristics |= COFF::IMAGE_SCN_ALIGN_32BYTES; + break; + case 64: + Characteristics |= COFF::IMAGE_SCN_ALIGN_64BYTES; + break; + case 128: + Characteristics |= COFF::IMAGE_SCN_ALIGN_128BYTES; + break; + case 256: + Characteristics |= COFF::IMAGE_SCN_ALIGN_256BYTES; + break; + case 512: + Characteristics |= COFF::IMAGE_SCN_ALIGN_512BYTES; + break; + case 1024: + Characteristics |= COFF::IMAGE_SCN_ALIGN_1024BYTES; + break; + case 2048: + Characteristics |= COFF::IMAGE_SCN_ALIGN_2048BYTES; + break; + case 4096: + Characteristics |= COFF::IMAGE_SCN_ALIGN_4096BYTES; + break; + case 8192: + Characteristics |= COFF::IMAGE_SCN_ALIGN_8192BYTES; + break; default: llvm_unreachable("unsupported section alignment"); } // Bind internal COFF section to MC section. - coff_section->MCData = &SectionData; - SectionMap[&SectionData.getSection()] = coff_section; + coff_section->MCSection = &Sec; + SectionMap[&Sec] = coff_section; } -static uint64_t getSymbolValue(const MCSymbolData &Data, +static uint64_t getSymbolValue(const MCSymbol &Symbol, const MCAsmLayout &Layout) { - if (Data.isCommon() && Data.isExternal()) - return Data.getCommonSize(); + if (Symbol.isCommon() && Symbol.isExternal()) + return Symbol.getCommonSize(); uint64_t Res; - if (!Layout.getSymbolOffset(&Data, Res)) + if (!Layout.getSymbolOffset(Symbol, Res)) return 0; return Res; @@ -356,33 +390,30 @@ static uint64_t getSymbolValue(const MCSymbolData &Data, /// This function takes a symbol data object from the assembler /// and creates the associated COFF symbol staging object. -void WinCOFFObjectWriter::DefineSymbol(MCSymbolData const &SymbolData, +void WinCOFFObjectWriter::DefineSymbol(const MCSymbol &Symbol, MCAssembler &Assembler, const MCAsmLayout &Layout) { - MCSymbol const &Symbol = SymbolData.getSymbol(); COFFSymbol *coff_symbol = GetOrCreateCOFFSymbol(&Symbol); SymbolMap[&Symbol] = coff_symbol; - if (SymbolData.getFlags() & COFF::SF_WeakExternal) { + if (cast(Symbol).isWeakExternal()) { coff_symbol->Data.StorageClass = COFF::IMAGE_SYM_CLASS_WEAK_EXTERNAL; if (Symbol.isVariable()) { const MCSymbolRefExpr *SymRef = - dyn_cast(Symbol.getVariableValue()); + dyn_cast(Symbol.getVariableValue()); if (!SymRef) report_fatal_error("Weak externals may only alias symbols"); coff_symbol->Other = GetOrCreateCOFFSymbol(&SymRef->getSymbol()); } else { - std::string WeakName = std::string(".weak.") - + Symbol.getName().str() - + ".default"; + std::string WeakName = (".weak." + Symbol.getName() + ".default").str(); COFFSymbol *WeakDefault = createSymbol(WeakName); WeakDefault->Data.SectionNumber = COFF::IMAGE_SYM_ABSOLUTE; - WeakDefault->Data.StorageClass = COFF::IMAGE_SYM_CLASS_EXTERNAL; - WeakDefault->Data.Type = 0; - WeakDefault->Data.Value = 0; + WeakDefault->Data.StorageClass = COFF::IMAGE_SYM_CLASS_EXTERNAL; + WeakDefault->Data.Type = 0; + WeakDefault->Data.Value = 0; coff_symbol->Other = WeakDefault; } @@ -392,22 +423,21 @@ void WinCOFFObjectWriter::DefineSymbol(MCSymbolData const &SymbolData, coff_symbol->Aux[0].AuxType = ATWeakExternal; coff_symbol->Aux[0].Aux.WeakExternal.TagIndex = 0; coff_symbol->Aux[0].Aux.WeakExternal.Characteristics = - COFF::IMAGE_WEAK_EXTERN_SEARCH_LIBRARY; + COFF::IMAGE_WEAK_EXTERN_SEARCH_LIBRARY; - coff_symbol->MCData = &SymbolData; + coff_symbol->MC = &Symbol; } else { - const MCSymbolData &ResSymData = Assembler.getSymbolData(Symbol); const MCSymbol *Base = Layout.getBaseSymbol(Symbol); - coff_symbol->Data.Value = getSymbolValue(ResSymData, Layout); + coff_symbol->Data.Value = getSymbolValue(Symbol, Layout); - coff_symbol->Data.Type = (ResSymData.getFlags() & 0x0000FFFF) >> 0; - coff_symbol->Data.StorageClass = (ResSymData.getFlags() & 0x00FF0000) >> 16; + const MCSymbolCOFF &SymbolCOFF = cast(Symbol); + coff_symbol->Data.Type = SymbolCOFF.getType(); + coff_symbol->Data.StorageClass = SymbolCOFF.getClass(); // If no storage class was specified in the streamer, define it here. - if (coff_symbol->Data.StorageClass == 0) { - bool IsExternal = - ResSymData.isExternal() || - (!ResSymData.getFragment() && !ResSymData.getSymbol().isVariable()); + if (coff_symbol->Data.StorageClass == COFF::IMAGE_SYM_CLASS_NULL) { + bool IsExternal = Symbol.isExternal() || + (!Symbol.getFragment() && !Symbol.isVariable()); coff_symbol->Data.StorageClass = IsExternal ? COFF::IMAGE_SYM_CLASS_EXTERNAL @@ -417,10 +447,8 @@ void WinCOFFObjectWriter::DefineSymbol(MCSymbolData const &SymbolData, if (!Base) { coff_symbol->Data.SectionNumber = COFF::IMAGE_SYM_ABSOLUTE; } else { - const MCSymbolData &BaseData = Assembler.getSymbolData(*Base); - if (BaseData.Fragment) { - COFFSection *Sec = - SectionMap[&BaseData.Fragment->getParent()->getSection()]; + if (Base->getFragment()) { + COFFSection *Sec = SectionMap[Base->getFragment()->getParent()]; if (coff_symbol->Section && coff_symbol->Section != Sec) report_fatal_error("conflicting sections for symbol"); @@ -429,7 +457,7 @@ void WinCOFFObjectWriter::DefineSymbol(MCSymbolData const &SymbolData, } } - coff_symbol->MCData = &ResSymData; + coff_symbol->MC = &Symbol; } } @@ -441,7 +469,7 @@ static const uint64_t MaxBase64Offset = 0xFFFFFFFFFULL; // 64^6, including 0 // Encode a string table entry offset in base 64, padded to 6 chars, and // prefixed with a double slash: '//AAAAAA', '//AAAAAB', ... // Buffer must be at least 8 bytes large. No terminating null appended. -static void encodeBase64StringEntry(char* Buffer, uint64_t Value) { +static void encodeBase64StringEntry(char *Buffer, uint64_t Value) { assert(Value > Max7DecimalOffset && Value <= MaxBase64Offset && "Illegal section name encoding for value"); @@ -452,7 +480,7 @@ static void encodeBase64StringEntry(char* Buffer, uint64_t Value) { Buffer[0] = '/'; Buffer[1] = '/'; - char* Ptr = Buffer + 7; + char *Ptr = Buffer + 7; for (unsigned i = 0; i < 6; ++i) { unsigned Rem = Value % 64; Value /= 64; @@ -469,7 +497,7 @@ void WinCOFFObjectWriter::SetSectionName(COFFSection &S) { } else if (StringTableEntry <= Max7DecimalOffset) { // With seven digits, we have to skip the terminating null. Because // sprintf always appends it, we use a larger temporary buffer. - char buffer[9] = { }; + char buffer[9] = {}; std::sprintf(buffer, "/%d", unsigned(StringTableEntry)); std::memcpy(S.Header.Name, buffer, 8); } else if (StringTableEntry <= MaxBase64Offset) { @@ -500,18 +528,17 @@ bool WinCOFFObjectWriter::ExportSymbol(const MCSymbol &Symbol, if (!Symbol.isTemporary()) return true; - // Absolute temporary labels are never visible. - if (!Symbol.isInSection()) + // Temporary variable symbols are invisible. + if (Symbol.isVariable()) return false; - // For now, all non-variable symbols are exported, - // the linker will sort the rest out for us. - return !Symbol.isVariable(); + // Absolute temporary labels are never visible. + return !Symbol.isAbsolute(); } bool WinCOFFObjectWriter::IsPhysicalSection(COFFSection *S) { - return (S->Header.Characteristics - & COFF::IMAGE_SCN_CNT_UNINITIALIZED_DATA) == 0; + return (S->Header.Characteristics & COFF::IMAGE_SCN_CNT_UNINITIALIZED_DATA) == + 0; } //------------------------------------------------------------------------------ @@ -519,88 +546,87 @@ bool WinCOFFObjectWriter::IsPhysicalSection(COFFSection *S) { void WinCOFFObjectWriter::WriteFileHeader(const COFF::header &Header) { if (UseBigObj) { - WriteLE16(COFF::IMAGE_FILE_MACHINE_UNKNOWN); - WriteLE16(0xFFFF); - WriteLE16(COFF::BigObjHeader::MinBigObjectVersion); - WriteLE16(Header.Machine); - WriteLE32(Header.TimeDateStamp); - for (uint8_t MagicChar : COFF::BigObjMagic) - Write8(MagicChar); - WriteLE32(0); - WriteLE32(0); - WriteLE32(0); - WriteLE32(0); - WriteLE32(Header.NumberOfSections); - WriteLE32(Header.PointerToSymbolTable); - WriteLE32(Header.NumberOfSymbols); + writeLE16(COFF::IMAGE_FILE_MACHINE_UNKNOWN); + writeLE16(0xFFFF); + writeLE16(COFF::BigObjHeader::MinBigObjectVersion); + writeLE16(Header.Machine); + writeLE32(Header.TimeDateStamp); + writeBytes(StringRef(COFF::BigObjMagic, sizeof(COFF::BigObjMagic))); + writeLE32(0); + writeLE32(0); + writeLE32(0); + writeLE32(0); + writeLE32(Header.NumberOfSections); + writeLE32(Header.PointerToSymbolTable); + writeLE32(Header.NumberOfSymbols); } else { - WriteLE16(Header.Machine); - WriteLE16(static_cast(Header.NumberOfSections)); - WriteLE32(Header.TimeDateStamp); - WriteLE32(Header.PointerToSymbolTable); - WriteLE32(Header.NumberOfSymbols); - WriteLE16(Header.SizeOfOptionalHeader); - WriteLE16(Header.Characteristics); + writeLE16(Header.Machine); + writeLE16(static_cast(Header.NumberOfSections)); + writeLE32(Header.TimeDateStamp); + writeLE32(Header.PointerToSymbolTable); + writeLE32(Header.NumberOfSymbols); + writeLE16(Header.SizeOfOptionalHeader); + writeLE16(Header.Characteristics); } } void WinCOFFObjectWriter::WriteSymbol(const COFFSymbol &S) { - WriteBytes(StringRef(S.Data.Name, COFF::NameSize)); - WriteLE32(S.Data.Value); + writeBytes(StringRef(S.Data.Name, COFF::NameSize)); + writeLE32(S.Data.Value); if (UseBigObj) - WriteLE32(S.Data.SectionNumber); + writeLE32(S.Data.SectionNumber); else - WriteLE16(static_cast(S.Data.SectionNumber)); - WriteLE16(S.Data.Type); - Write8(S.Data.StorageClass); - Write8(S.Data.NumberOfAuxSymbols); + writeLE16(static_cast(S.Data.SectionNumber)); + writeLE16(S.Data.Type); + write8(S.Data.StorageClass); + write8(S.Data.NumberOfAuxSymbols); WriteAuxiliarySymbols(S.Aux); } void WinCOFFObjectWriter::WriteAuxiliarySymbols( - const COFFSymbol::AuxiliarySymbols &S) { - for(COFFSymbol::AuxiliarySymbols::const_iterator i = S.begin(), e = S.end(); - i != e; ++i) { - switch(i->AuxType) { + const COFFSymbol::AuxiliarySymbols &S) { + for (COFFSymbol::AuxiliarySymbols::const_iterator i = S.begin(), e = S.end(); + i != e; ++i) { + switch (i->AuxType) { case ATFunctionDefinition: - WriteLE32(i->Aux.FunctionDefinition.TagIndex); - WriteLE32(i->Aux.FunctionDefinition.TotalSize); - WriteLE32(i->Aux.FunctionDefinition.PointerToLinenumber); - WriteLE32(i->Aux.FunctionDefinition.PointerToNextFunction); + writeLE32(i->Aux.FunctionDefinition.TagIndex); + writeLE32(i->Aux.FunctionDefinition.TotalSize); + writeLE32(i->Aux.FunctionDefinition.PointerToLinenumber); + writeLE32(i->Aux.FunctionDefinition.PointerToNextFunction); WriteZeros(sizeof(i->Aux.FunctionDefinition.unused)); if (UseBigObj) WriteZeros(COFF::Symbol32Size - COFF::Symbol16Size); break; case ATbfAndefSymbol: WriteZeros(sizeof(i->Aux.bfAndefSymbol.unused1)); - WriteLE16(i->Aux.bfAndefSymbol.Linenumber); + writeLE16(i->Aux.bfAndefSymbol.Linenumber); WriteZeros(sizeof(i->Aux.bfAndefSymbol.unused2)); - WriteLE32(i->Aux.bfAndefSymbol.PointerToNextFunction); + writeLE32(i->Aux.bfAndefSymbol.PointerToNextFunction); WriteZeros(sizeof(i->Aux.bfAndefSymbol.unused3)); if (UseBigObj) WriteZeros(COFF::Symbol32Size - COFF::Symbol16Size); break; case ATWeakExternal: - WriteLE32(i->Aux.WeakExternal.TagIndex); - WriteLE32(i->Aux.WeakExternal.Characteristics); + writeLE32(i->Aux.WeakExternal.TagIndex); + writeLE32(i->Aux.WeakExternal.Characteristics); WriteZeros(sizeof(i->Aux.WeakExternal.unused)); if (UseBigObj) WriteZeros(COFF::Symbol32Size - COFF::Symbol16Size); break; case ATFile: - WriteBytes( + writeBytes( StringRef(reinterpret_cast(&i->Aux), UseBigObj ? COFF::Symbol32Size : COFF::Symbol16Size)); break; case ATSectionDefinition: - WriteLE32(i->Aux.SectionDefinition.Length); - WriteLE16(i->Aux.SectionDefinition.NumberOfRelocations); - WriteLE16(i->Aux.SectionDefinition.NumberOfLinenumbers); - WriteLE32(i->Aux.SectionDefinition.CheckSum); - WriteLE16(static_cast(i->Aux.SectionDefinition.Number)); - Write8(i->Aux.SectionDefinition.Selection); + writeLE32(i->Aux.SectionDefinition.Length); + writeLE16(i->Aux.SectionDefinition.NumberOfRelocations); + writeLE16(i->Aux.SectionDefinition.NumberOfLinenumbers); + writeLE32(i->Aux.SectionDefinition.CheckSum); + writeLE16(static_cast(i->Aux.SectionDefinition.Number)); + write8(i->Aux.SectionDefinition.Selection); WriteZeros(sizeof(i->Aux.SectionDefinition.unused)); - WriteLE16(static_cast(i->Aux.SectionDefinition.Number >> 16)); + writeLE16(static_cast(i->Aux.SectionDefinition.Number >> 16)); if (UseBigObj) WriteZeros(COFF::Symbol32Size - COFF::Symbol16Size); break; @@ -608,83 +634,106 @@ void WinCOFFObjectWriter::WriteAuxiliarySymbols( } } -void WinCOFFObjectWriter::WriteSectionHeader(const COFF::section &S) { - WriteBytes(StringRef(S.Name, COFF::NameSize)); - - WriteLE32(S.VirtualSize); - WriteLE32(S.VirtualAddress); - WriteLE32(S.SizeOfRawData); - WriteLE32(S.PointerToRawData); - WriteLE32(S.PointerToRelocations); - WriteLE32(S.PointerToLineNumbers); - WriteLE16(S.NumberOfRelocations); - WriteLE16(S.NumberOfLineNumbers); - WriteLE32(S.Characteristics); +void WinCOFFObjectWriter::writeSectionHeader(const COFF::section &S) { + writeBytes(StringRef(S.Name, COFF::NameSize)); + + writeLE32(S.VirtualSize); + writeLE32(S.VirtualAddress); + writeLE32(S.SizeOfRawData); + writeLE32(S.PointerToRawData); + writeLE32(S.PointerToRelocations); + writeLE32(S.PointerToLineNumbers); + writeLE16(S.NumberOfRelocations); + writeLE16(S.NumberOfLineNumbers); + writeLE32(S.Characteristics); } void WinCOFFObjectWriter::WriteRelocation(const COFF::relocation &R) { - WriteLE32(R.VirtualAddress); - WriteLE32(R.SymbolTableIndex); - WriteLE16(R.Type); + writeLE32(R.VirtualAddress); + writeLE32(R.SymbolTableIndex); + writeLE16(R.Type); } //////////////////////////////////////////////////////////////////////////////// // MCObjectWriter interface implementations -void WinCOFFObjectWriter::ExecutePostLayoutBinding(MCAssembler &Asm, +void WinCOFFObjectWriter::executePostLayoutBinding(MCAssembler &Asm, const MCAsmLayout &Layout) { // "Define" each section & symbol. This creates section & symbol // entries in the staging area. - for (const auto & Section : Asm) - DefineSection(Section); + for (const auto &Section : Asm) + defineSection(static_cast(Section)); + + for (const MCSymbol &Symbol : Asm.symbols()) + if (ExportSymbol(Symbol, Asm)) + DefineSymbol(Symbol, Asm, Layout); +} + +bool WinCOFFObjectWriter::isSymbolRefDifferenceFullyResolvedImpl( + const MCAssembler &Asm, const MCSymbol &SymA, const MCFragment &FB, + bool InSet, bool IsPCRel) const { + // MS LINK expects to be able to replace all references to a function with a + // thunk to implement their /INCREMENTAL feature. Make sure we don't optimize + // away any relocations to functions. + uint16_t Type = cast(SymA).getType(); + if ((Type >> COFF::SCT_COMPLEX_TYPE_SHIFT) == COFF::IMAGE_SYM_DTYPE_FUNCTION) + return false; + return MCObjectWriter::isSymbolRefDifferenceFullyResolvedImpl(Asm, SymA, FB, + InSet, IsPCRel); +} + +bool WinCOFFObjectWriter::isWeak(const MCSymbol &Sym) const { + if (!Sym.isExternal()) + return false; + + if (!Sym.isInSection()) + return false; - for (MCSymbolData &SD : Asm.symbols()) - if (ExportSymbol(SD.getSymbol(), Asm)) - DefineSymbol(SD, Asm, Layout); + const auto &Sec = cast(Sym.getSection()); + if (!Sec.getCOMDATSymbol()) + return false; + + // It looks like for COFF it is invalid to replace a reference to a global + // in a comdat with a reference to a local. + // FIXME: Add a specification reference if available. + return true; } -void WinCOFFObjectWriter::RecordRelocation(const MCAssembler &Asm, - const MCAsmLayout &Layout, - const MCFragment *Fragment, - const MCFixup &Fixup, - MCValue Target, - bool &IsPCRel, - uint64_t &FixedValue) { +void WinCOFFObjectWriter::recordRelocation( + MCAssembler &Asm, const MCAsmLayout &Layout, const MCFragment *Fragment, + const MCFixup &Fixup, MCValue Target, bool &IsPCRel, uint64_t &FixedValue) { assert(Target.getSymA() && "Relocation must reference a symbol!"); const MCSymbol &Symbol = Target.getSymA()->getSymbol(); - const MCSymbol &A = Symbol.AliasedSymbol(); - if (!Asm.hasSymbolData(A)) - Asm.getContext().FatalError( - Fixup.getLoc(), - Twine("symbol '") + A.getName() + "' can not be undefined"); + const MCSymbol &A = Symbol; + if (!A.isRegistered()) + Asm.getContext().reportFatalError(Fixup.getLoc(), + Twine("symbol '") + A.getName() + + "' can not be undefined"); - const MCSymbolData &A_SD = Asm.getSymbolData(A); - - MCSectionData const *SectionData = Fragment->getParent(); + MCSection *Section = Fragment->getParent(); // Mark this symbol as requiring an entry in the symbol table. - assert(SectionMap.find(&SectionData->getSection()) != SectionMap.end() && - "Section must already have been defined in ExecutePostLayoutBinding!"); - assert(SymbolMap.find(&A_SD.getSymbol()) != SymbolMap.end() && - "Symbol must already have been defined in ExecutePostLayoutBinding!"); + assert(SectionMap.find(Section) != SectionMap.end() && + "Section must already have been defined in executePostLayoutBinding!"); + assert(SymbolMap.find(&A) != SymbolMap.end() && + "Symbol must already have been defined in executePostLayoutBinding!"); - COFFSection *coff_section = SectionMap[&SectionData->getSection()]; - COFFSymbol *coff_symbol = SymbolMap[&A_SD.getSymbol()]; + COFFSection *coff_section = SectionMap[Section]; + COFFSymbol *coff_symbol = SymbolMap[&A]; const MCSymbolRefExpr *SymB = Target.getSymB(); bool CrossSection = false; if (SymB) { const MCSymbol *B = &SymB->getSymbol(); - const MCSymbolData &B_SD = Asm.getSymbolData(*B); - if (!B_SD.getFragment()) - Asm.getContext().FatalError( + if (!B->getFragment()) + Asm.getContext().reportFatalError( Fixup.getLoc(), Twine("symbol '") + B->getName() + "' can not be undefined in a subtraction expression"); - if (!A_SD.getFragment()) - Asm.getContext().FatalError( + if (!A.getFragment()) + Asm.getContext().reportFatalError( Fixup.getLoc(), Twine("symbol '") + Symbol.getName() + "' can not be undefined in a subtraction expression"); @@ -692,17 +741,22 @@ void WinCOFFObjectWriter::RecordRelocation(const MCAssembler &Asm, CrossSection = &Symbol.getSection() != &B->getSection(); // Offset of the symbol in the section - int64_t a = Layout.getSymbolOffset(&B_SD); - - // Ofeset of the relocation in the section - int64_t b = Layout.getFragmentOffset(Fragment) + Fixup.getOffset(); + int64_t OffsetOfB = Layout.getSymbolOffset(*B); - FixedValue = b - a; // In the case where we have SymbA and SymB, we just need to store the delta // between the two symbols. Update FixedValue to account for the delta, and // skip recording the relocation. - if (!CrossSection) + if (!CrossSection) { + int64_t OffsetOfA = Layout.getSymbolOffset(A); + FixedValue = (OffsetOfA - OffsetOfB) + Target.getConstant(); return; + } + + // Offset of the relocation in the section + int64_t OffsetOfRelocation = + Layout.getFragmentOffset(Fragment) + Fixup.getOffset(); + + FixedValue = (OffsetOfRelocation - OffsetOfB) + Target.getConstant(); } else { FixedValue = Target.getConstant(); } @@ -713,18 +767,18 @@ void WinCOFFObjectWriter::RecordRelocation(const MCAssembler &Asm, Reloc.Data.VirtualAddress = Layout.getFragmentOffset(Fragment); // Turn relocations for temporary symbols into section relocations. - if (coff_symbol->MCData->getSymbol().isTemporary() || CrossSection) { + if (coff_symbol->MC->isTemporary() || CrossSection) { Reloc.Symb = coff_symbol->Section->Symbol; - FixedValue += Layout.getFragmentOffset(coff_symbol->MCData->Fragment) - + coff_symbol->MCData->getOffset(); + FixedValue += Layout.getFragmentOffset(coff_symbol->MC->getFragment()) + + coff_symbol->MC->getOffset(); } else Reloc.Symb = coff_symbol; ++Reloc.Symb->Relocations; Reloc.Data.VirtualAddress += Fixup.getOffset(); - Reloc.Data.Type = TargetObjectWriter->getRelocType(Target, Fixup, - CrossSection); + Reloc.Data.Type = TargetObjectWriter->getRelocType( + Target, Fixup, CrossSection, Asm.getBackend()); // FIXME: Can anyone explain what this does other than adjust for the size // of the offset? @@ -745,9 +799,9 @@ void WinCOFFObjectWriter::RecordRelocation(const MCAssembler &Asm, break; case COFF::IMAGE_REL_ARM_BRANCH11: case COFF::IMAGE_REL_ARM_BLX11: - // IMAGE_REL_ARM_BRANCH11 and IMAGE_REL_ARM_BLX11 are only used for - // pre-ARMv7, which implicitly rules it out of ARMNT (it would be valid - // for Windows CE). + // IMAGE_REL_ARM_BRANCH11 and IMAGE_REL_ARM_BLX11 are only used for + // pre-ARMv7, which implicitly rules it out of ARMNT (it would be valid + // for Windows CE). case COFF::IMAGE_REL_ARM_BRANCH24: case COFF::IMAGE_REL_ARM_BLX24: case COFF::IMAGE_REL_ARM_MOV32A: @@ -776,7 +830,7 @@ void WinCOFFObjectWriter::RecordRelocation(const MCAssembler &Asm, coff_section->Relocations.push_back(Reloc); } -void WinCOFFObjectWriter::WriteObject(MCAssembler &Asm, +void WinCOFFObjectWriter::writeObject(MCAssembler &Asm, const MCAsmLayout &Layout) { size_t SectionsSize = Sections.size(); if (SectionsSize > static_cast(INT32_MAX)) @@ -788,13 +842,9 @@ void WinCOFFObjectWriter::WriteObject(MCAssembler &Asm, UseBigObj = NumberOfSections > COFF::MaxNumberOfSections16; - DenseMap SectionIndices( - NextPowerOf2(NumberOfSections)); - // Assign section numbers. size_t Number = 1; for (const auto &Section : Sections) { - SectionIndices[Section.get()] = Number; Section->Number = Number; Section->Symbol->Data.SectionNumber = Number; Section->Symbol->Aux[0].Aux.SectionDefinition.Number = Number; @@ -804,11 +854,10 @@ void WinCOFFObjectWriter::WriteObject(MCAssembler &Asm, Header.NumberOfSections = NumberOfSections; Header.NumberOfSymbols = 0; - for (auto FI = Asm.file_names_begin(), FE = Asm.file_names_end(); - FI != FE; ++FI) { + for (const std::string &Name : Asm.getFileNames()) { // round up to calculate the number of auxiliary symbols required unsigned SymbolSize = UseBigObj ? COFF::Symbol32Size : COFF::Symbol16Size; - unsigned Count = (FI->size() + SymbolSize - 1) / SymbolSize; + unsigned Count = (Name.size() + SymbolSize - 1) / SymbolSize; COFFSymbol *file = createSymbol(".file"); file->Data.SectionNumber = COFF::IMAGE_SYM_DEBUG; @@ -816,15 +865,15 @@ void WinCOFFObjectWriter::WriteObject(MCAssembler &Asm, file->Aux.resize(Count); unsigned Offset = 0; - unsigned Length = FI->size(); - for (auto & Aux : file->Aux) { + unsigned Length = Name.size(); + for (auto &Aux : file->Aux) { Aux.AuxType = ATFile; if (Length > SymbolSize) { - memcpy(&Aux.Aux, FI->c_str() + Offset, SymbolSize); + memcpy(&Aux.Aux, Name.c_str() + Offset, SymbolSize); Length = Length - SymbolSize; } else { - memcpy(&Aux.Aux, FI->c_str() + Offset, Length); + memcpy(&Aux.Aux, Name.c_str() + Offset, Length); memset((char *)&Aux.Aux + Length, 0, SymbolSize - Length); break; } @@ -838,12 +887,13 @@ void WinCOFFObjectWriter::WriteObject(MCAssembler &Asm, if (Symbol->Section) Symbol->Data.SectionNumber = Symbol->Section->Number; if (Symbol->should_keep()) { - Symbol->Index = Header.NumberOfSymbols++; + Symbol->setIndex(Header.NumberOfSymbols++); // Update auxiliary symbol info. Symbol->Data.NumberOfAuxSymbols = Symbol->Aux.size(); Header.NumberOfSymbols += Symbol->Data.NumberOfAuxSymbols; - } else - Symbol->Index = -1; + } else { + Symbol->setIndex(-1); + } } // Build string table. @@ -863,24 +913,23 @@ void WinCOFFObjectWriter::WriteObject(MCAssembler &Asm, SetSymbolName(*S); // Fixup weak external references. - for (auto & Symbol : Symbols) { + for (auto &Symbol : Symbols) { if (Symbol->Other) { - assert(Symbol->Index != -1); + assert(Symbol->getIndex() != -1); assert(Symbol->Aux.size() == 1 && "Symbol must contain one aux symbol!"); assert(Symbol->Aux[0].AuxType == ATWeakExternal && "Symbol's aux symbol must be a Weak External!"); - Symbol->Aux[0].Aux.WeakExternal.TagIndex = Symbol->Other->Index; + Symbol->Aux[0].Aux.WeakExternal.TagIndex = Symbol->Other->getIndex(); } } // Fixup associative COMDAT sections. - for (auto & Section : Sections) { + for (auto &Section : Sections) { if (Section->Symbol->Aux[0].Aux.SectionDefinition.Selection != COFF::IMAGE_COMDAT_SELECT_ASSOCIATIVE) continue; - const MCSectionCOFF &MCSec = - static_cast(Section->MCData->getSection()); + const MCSectionCOFF &MCSec = *Section->MCSection; const MCSymbol *COMDAT = MCSec.getCOMDATSymbol(); assert(COMDAT); @@ -896,10 +945,9 @@ void WinCOFFObjectWriter::WriteObject(MCAssembler &Asm, if (Assoc->Number == -1) continue; - Section->Symbol->Aux[0].Aux.SectionDefinition.Number = SectionIndices[Assoc]; + Section->Symbol->Aux[0].Aux.SectionDefinition.Number = Assoc->Number; } - // Assign file offsets to COFF object file structures. unsigned offset = 0; @@ -910,8 +958,8 @@ void WinCOFFObjectWriter::WriteObject(MCAssembler &Asm, offset += COFF::Header16Size; offset += COFF::SectionSize * Header.NumberOfSections; - for (const auto & Section : Asm) { - COFFSection *Sec = SectionMap[&Section.getSection()]; + for (const auto &Section : Asm) { + COFFSection *Sec = SectionMap[&Section]; if (Sec->Number == -1) continue; @@ -919,6 +967,8 @@ void WinCOFFObjectWriter::WriteObject(MCAssembler &Asm, Sec->Header.SizeOfRawData = Layout.getSectionAddressSize(&Section); if (IsPhysicalSection(Sec)) { + // Align the section data to a four byte boundary. + offset = RoundUpToAlignment(offset, 4); Sec->Header.PointerToRawData = offset; offset += Sec->Header.SizeOfRawData; @@ -943,9 +993,9 @@ void WinCOFFObjectWriter::WriteObject(MCAssembler &Asm, offset += COFF::RelocationSize * Sec->Relocations.size(); - for (auto & Relocation : Sec->Relocations) { - assert(Relocation.Symb->Index != -1); - Relocation.Data.SymbolTableIndex = Relocation.Symb->Index; + for (auto &Relocation : Sec->Relocations) { + assert(Relocation.Symb->getIndex() != -1); + Relocation.Data.SymbolTableIndex = Relocation.Symb->getIndex(); } } @@ -956,47 +1006,85 @@ void WinCOFFObjectWriter::WriteObject(MCAssembler &Asm, "Section's symbol's aux symbol must be a Section Definition!"); Aux.Aux.SectionDefinition.Length = Sec->Header.SizeOfRawData; Aux.Aux.SectionDefinition.NumberOfRelocations = - Sec->Header.NumberOfRelocations; + Sec->Header.NumberOfRelocations; Aux.Aux.SectionDefinition.NumberOfLinenumbers = - Sec->Header.NumberOfLineNumbers; + Sec->Header.NumberOfLineNumbers; } Header.PointerToSymbolTable = offset; - // We want a deterministic output. It looks like GNU as also writes 0 in here. - Header.TimeDateStamp = 0; + // MS LINK expects to be able to use this timestamp to implement their + // /INCREMENTAL feature. + std::time_t Now = time(nullptr); + if (Now < 0 || (unsigned long)Now > UINT32_MAX) + Now = UINT32_MAX; + Header.TimeDateStamp = Now; // Write it all to disk... WriteFileHeader(Header); { sections::iterator i, ie; - MCAssembler::const_iterator j, je; + MCAssembler::iterator j, je; - for (auto & Section : Sections) { + for (auto &Section : Sections) { if (Section->Number != -1) { if (Section->Relocations.size() >= 0xffff) Section->Header.Characteristics |= COFF::IMAGE_SCN_LNK_NRELOC_OVFL; - WriteSectionHeader(Section->Header); + writeSectionHeader(Section->Header); } } - for (i = Sections.begin(), ie = Sections.end(), - j = Asm.begin(), je = Asm.end(); + SmallVector SectionContents; + for (i = Sections.begin(), ie = Sections.end(), j = Asm.begin(), + je = Asm.end(); (i != ie) && (j != je); ++i, ++j) { if ((*i)->Number == -1) continue; if ((*i)->Header.PointerToRawData != 0) { - assert(OS.tell() == (*i)->Header.PointerToRawData && + assert(getStream().tell() <= (*i)->Header.PointerToRawData && "Section::PointerToRawData is insane!"); - Asm.writeSectionData(j, Layout); + unsigned SectionDataPadding = + (*i)->Header.PointerToRawData - getStream().tell(); + assert(SectionDataPadding < 4 && + "Should only need at most three bytes of padding!"); + + WriteZeros(SectionDataPadding); + + // Save the contents of the section to a temporary buffer, we need this + // to CRC the data before we dump it into the object file. + SectionContents.clear(); + raw_svector_ostream VecOS(SectionContents); + raw_pwrite_stream &OldStream = getStream(); + // Redirect the output stream to our buffer. + setStream(VecOS); + // Fill our buffer with the section data. + Asm.writeSectionData(&*j, Layout); + // Reset the stream back to what it was before. + setStream(OldStream); + + // Calculate our CRC with an initial value of '0', this is not how + // JamCRC is specified but it aligns with the expected output. + JamCRC JC(/*Init=*/0x00000000U); + JC.update(SectionContents); + + // Write the section contents to the object file. + getStream() << SectionContents; + + // Update the section definition auxiliary symbol to record the CRC. + COFFSection *Sec = SectionMap[&*j]; + COFFSymbol::AuxiliarySymbols &AuxSyms = Sec->Symbol->Aux; + assert(AuxSyms.size() == 1 && + AuxSyms[0].AuxType == ATSectionDefinition); + AuxSymbol &SecDef = AuxSyms[0]; + SecDef.Aux.SectionDefinition.CheckSum = JC.getCRC(); } if ((*i)->Relocations.size() > 0) { - assert(OS.tell() == (*i)->Header.PointerToRelocations && + assert(getStream().tell() == (*i)->Header.PointerToRelocations && "Section::PointerToRelocations is insane!"); if ((*i)->Relocations.size() >= 0xffff) { @@ -1009,7 +1097,7 @@ void WinCOFFObjectWriter::WriteObject(MCAssembler &Asm, WriteRelocation(r); } - for (const auto & Relocation : (*i)->Relocations) + for (const auto &Relocation : (*i)->Relocations) WriteRelocation(Relocation.Data); } else assert((*i)->Header.PointerToRelocations == 0 && @@ -1017,19 +1105,18 @@ void WinCOFFObjectWriter::WriteObject(MCAssembler &Asm, } } - assert(OS.tell() == Header.PointerToSymbolTable && + assert(getStream().tell() == Header.PointerToSymbolTable && "Header::PointerToSymbolTable is insane!"); - for (auto & Symbol : Symbols) - if (Symbol->Index != -1) + for (auto &Symbol : Symbols) + if (Symbol->getIndex() != -1) WriteSymbol(*Symbol); - OS.write(Strings.data().data(), Strings.data().size()); + getStream().write(Strings.data().data(), Strings.data().size()); } -MCWinCOFFObjectTargetWriter::MCWinCOFFObjectTargetWriter(unsigned Machine_) : - Machine(Machine_) { -} +MCWinCOFFObjectTargetWriter::MCWinCOFFObjectTargetWriter(unsigned Machine_) + : Machine(Machine_) {} // Pin the vtable to this file. void MCWinCOFFObjectTargetWriter::anchor() {} @@ -1037,9 +1124,8 @@ void MCWinCOFFObjectTargetWriter::anchor() {} //------------------------------------------------------------------------------ // WinCOFFObjectWriter factory function -namespace llvm { - MCObjectWriter *createWinCOFFObjectWriter(MCWinCOFFObjectTargetWriter *MOTW, - raw_ostream &OS) { - return new WinCOFFObjectWriter(MOTW, OS); - } +MCObjectWriter * +llvm::createWinCOFFObjectWriter(MCWinCOFFObjectTargetWriter *MOTW, + raw_pwrite_stream &OS) { + return new WinCOFFObjectWriter(MOTW, OS); }