6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-02-07 14:33:15 +00:00
Code Issues Projects Releases Wiki Activity

MC: Move COFF enumeration constants to llvm/Support/COFF.h, patch by Michael

Browse Source 
Spencer!

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@107418 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Daniel Dunbar 2010-07-01 20:07:24 +00:00
parent c1874b7a7c
commit 94610588af
4 changed files with 247 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
include/llvm/MC/MCSectionCOFF.h
View File

@ -16,6 +16,8 @@
#include "llvm/MC/MCSection.h" #include "llvm/MC/MCSection.h"
#include "llvm/Support/COFF.h"
namespace llvm { namespace llvm {
/// MCSectionCOFF - This represents a section on Windows /// MCSectionCOFF - This represents a section on Windows
@ -47,56 +49,6 @@ namespace llvm {
/// should be printed before the section name /// should be printed before the section name
bool ShouldOmitSectionDirective(StringRef Name, const MCAsmInfo &MAI) const; bool ShouldOmitSectionDirective(StringRef Name, const MCAsmInfo &MAI) const;
//FIXME: all COFF enumerations/flags should be standardized into one place...
// Target/X86COFF.h doesn't seem right as COFF can be used for other targets,
// MC/WinCOFF.h maybe right as it isn't target or entity specific, and it is
// pretty low on the dependancy graph (is there any need to support non
// windows COFF?)
// here is good for section stuff, but others should go elsewhere
/// Valid section flags.
enum {
IMAGE_SCN_TYPE_NO_PAD = 0x00000008,
IMAGE_SCN_CNT_CODE = 0x00000020,
IMAGE_SCN_CNT_INITIALIZED_DATA = 0x00000040,
IMAGE_SCN_CNT_UNINITIALIZED_DATA = 0x00000080,
IMAGE_SCN_LNK_OTHER = 0x00000100,
IMAGE_SCN_LNK_INFO = 0x00000200,
IMAGE_SCN_LNK_REMOVE = 0x00000800,
IMAGE_SCN_LNK_COMDAT = 0x00001000,
IMAGE_SCN_MEM_FARDATA = 0x00008000,
IMAGE_SCN_MEM_PURGEABLE = 0x00020000,
IMAGE_SCN_MEM_16BIT = 0x00020000,
IMAGE_SCN_MEM_LOCKED = 0x00040000,
IMAGE_SCN_MEM_PRELOAD = 0x00080000,
/* these are handled elsewhere
IMAGE_SCN_ALIGN_1BYTES = 0x00100000,
IMAGE_SCN_ALIGN_2BYTES = 0x00200000,
IMAGE_SCN_ALIGN_4BYTES = 0x00300000,
IMAGE_SCN_ALIGN_8BYTES = 0x00400000,
IMAGE_SCN_ALIGN_16BYTES = 0x00500000,
IMAGE_SCN_ALIGN_32BYTES = 0x00600000,
IMAGE_SCN_ALIGN_64BYTES = 0x00700000,
*/
IMAGE_SCN_LNK_NRELOC_OVFL = 0x01000000,
IMAGE_SCN_MEM_DISCARDABLE = 0x02000000,
IMAGE_SCN_MEM_NOT_CACHED = 0x04000000,
IMAGE_SCN_MEM_NOT_PAGED = 0x08000000,
IMAGE_SCN_MEM_SHARED = 0x10000000,
IMAGE_SCN_MEM_EXECUTE = 0x20000000,
IMAGE_SCN_MEM_READ = 0x40000000,
IMAGE_SCN_MEM_WRITE = 0x80000000
};
enum {
IMAGE_COMDAT_SELECT_NODUPLICATES = 1,
IMAGE_COMDAT_SELECT_ANY,
IMAGE_COMDAT_SELECT_SAME_SIZE,
IMAGE_COMDAT_SELECT_EXACT_MATCH,
IMAGE_COMDAT_SELECT_ASSOCIATIVE,
IMAGE_COMDAT_SELECT_LARGEST
};
StringRef getSectionName() const { return SectionName; } StringRef getSectionName() const { return SectionName; }
unsigned getCharacteristics() const { return Characteristics; } unsigned getCharacteristics() const { return Characteristics; }
int getSelection () const { return Selection; } int getSelection () const { return Selection; }

183
include/llvm/Support/COFF.h Normal file
View File

@ -0,0 +1,183 @@
//===-- llvm/Support/COFF.h -------------------------------------*- C++ -*-===//
//
// The LLVM Compiler Infrastructure
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
// This file contains an definitions used in Windows COFF Files.
//
// Structures and enums defined within this file where created using
// information from Microsofts publicly available PE/COFF format document:
//
// Microsoft Portable Executable and Common Object File Format Specification
// Revision 8.1 - February 15, 2008
//
// As of 5/2/2010, hosted by microsoft at:
// http://www.microsoft.com/whdc/system/platform/firmware/pecoff.mspx
//
//===----------------------------------------------------------------------===//
#ifndef LLVM_SUPPORT_WIN_COFF_H
#define LLVM_SUPPORT_WIN_COFF_H
#include "llvm/System/DataTypes.h"
#include <cstring>
namespace llvm {
namespace COFF {
// Sizes in bytes of various things in the COFF format.
enum {
HeaderSize = 20,
NameSize = 8,
SymbolSize = 18,
SectionSize = 40,
RelocationSize = 10
};
struct header {
uint16_t Machine;
uint16_t NumberOfSections;
uint32_t TimeDateStamp;
uint32_t PointerToSymbolTable;
uint32_t NumberOfSymbols;
uint16_t SizeOfOptionalHeader;
uint16_t Characteristics;
};
struct symbol {
char Name[NameSize];
uint32_t Value;
uint16_t Type;
uint8_t StorageClass;
uint16_t SectionNumber;
uint8_t NumberOfAuxSymbols;
};
enum symbol_flags {
SF_TypeMask = 0x0000FFFF,
SF_TypeShift = 0,
SF_ClassMask = 0x00FF0000,
SF_ClassShift = 16,
SF_WeakReference = 0x01000000,
};
enum symbol_storage_class {
IMAGE_SYM_CLASS_END_OF_FUNCTION = -1,
IMAGE_SYM_CLASS_NULL = 0,
IMAGE_SYM_CLASS_AUTOMATIC = 1,
IMAGE_SYM_CLASS_EXTERNAL = 2,
IMAGE_SYM_CLASS_STATIC = 3,
IMAGE_SYM_CLASS_REGISTER = 4,
IMAGE_SYM_CLASS_EXTERNAL_DEF = 5,
IMAGE_SYM_CLASS_LABEL = 6,
IMAGE_SYM_CLASS_UNDEFINED_LABEL = 7,
IMAGE_SYM_CLASS_MEMBER_OF_STRUCT = 8,
IMAGE_SYM_CLASS_ARGUMENT = 9,
IMAGE_SYM_CLASS_STRUCT_TAG = 10,
IMAGE_SYM_CLASS_MEMBER_OF_UNION = 11,
IMAGE_SYM_CLASS_UNION_TAG = 12,
IMAGE_SYM_CLASS_TYPE_DEFINITION = 13,
IMAGE_SYM_CLASS_UNDEFINED_STATIC = 14,
IMAGE_SYM_CLASS_ENUM_TAG = 15,
IMAGE_SYM_CLASS_MEMBER_OF_ENUM = 16,
IMAGE_SYM_CLASS_REGISTER_PARAM = 17,
IMAGE_SYM_CLASS_BIT_FIELD = 18,
IMAGE_SYM_CLASS_BLOCK = 100,
IMAGE_SYM_CLASS_FUNCTION = 101,
IMAGE_SYM_CLASS_END_OF_STRUCT = 102,
IMAGE_SYM_CLASS_FILE = 103,
IMAGE_SYM_CLASS_SECTION = 104,
IMAGE_SYM_CLASS_WEAK_EXTERNAL = 105,
IMAGE_SYM_CLASS_CLR_TOKEN = 107
};
struct section {
char Name[NameSize];
uint32_t VirtualSize;
uint32_t VirtualAddress;
uint32_t SizeOfRawData;
uint32_t PointerToRawData;
uint32_t PointerToRelocations;
uint32_t PointerToLineNumbers;
uint16_t NumberOfRelocations;
uint16_t NumberOfLineNumbers;
uint32_t Characteristics;
};
enum section_characteristics {
IMAGE_SCN_TYPE_NO_PAD = 0x00000008,
IMAGE_SCN_CNT_CODE = 0x00000020,
IMAGE_SCN_CNT_INITIALIZED_DATA = 0x00000040,
IMAGE_SCN_CNT_UNINITIALIZED_DATA = 0x00000080,
IMAGE_SCN_LNK_OTHER = 0x00000100,
IMAGE_SCN_LNK_INFO = 0x00000200,
IMAGE_SCN_LNK_REMOVE = 0x00000800,
IMAGE_SCN_LNK_COMDAT = 0x00001000,
IMAGE_SCN_GPREL = 0x00008000,
IMAGE_SCN_MEM_PURGEABLE = 0x00020000,
IMAGE_SCN_MEM_16BIT = 0x00020000,
IMAGE_SCN_MEM_LOCKED = 0x00040000,
IMAGE_SCN_MEM_PRELOAD = 0x00080000,
IMAGE_SCN_ALIGN_1BYTES = 0x00100000,
IMAGE_SCN_ALIGN_2BYTES = 0x00200000,
IMAGE_SCN_ALIGN_4BYTES = 0x00300000,
IMAGE_SCN_ALIGN_8BYTES = 0x00400000,
IMAGE_SCN_ALIGN_16BYTES = 0x00500000,
IMAGE_SCN_ALIGN_32BYTES = 0x00600000,
IMAGE_SCN_ALIGN_64BYTES = 0x00700000,
IMAGE_SCN_ALIGN_128BYTES = 0x00800000,
IMAGE_SCN_ALIGN_256BYTES = 0x00900000,
IMAGE_SCN_ALIGN_512BYTES = 0x00A00000,
IMAGE_SCN_ALIGN_1024BYTES = 0x00B00000,
IMAGE_SCN_ALIGN_2048BYTES = 0x00C00000,
IMAGE_SCN_ALIGN_4096BYTES = 0x00D00000,
IMAGE_SCN_ALIGN_8192BYTES = 0x00E00000,
IMAGE_SCN_LNK_NRELOC_OVFL = 0x01000000,
IMAGE_SCN_MEM_DISCARDABLE = 0x02000000,
IMAGE_SCN_MEM_NOT_CACHED = 0x04000000,
IMAGE_SCN_MEM_NOT_PAGED = 0x08000000,
IMAGE_SCN_MEM_SHARED = 0x10000000,
IMAGE_SCN_MEM_EXECUTE = 0x20000000,
IMAGE_SCN_MEM_READ = 0x40000000,
IMAGE_SCN_MEM_WRITE = 0x80000000
};
struct relocation {
uint32_t VirtualAddress;
uint32_t SymbolTableIndex;
uint16_t Type;
};
enum relocation_type_x86 {
IMAGE_REL_I386_ABSOLUTE = 0x0000,
IMAGE_REL_I386_DIR16 = 0x0001,
IMAGE_REL_I386_REL16 = 0x0002,
IMAGE_REL_I386_DIR32 = 0x0006,
IMAGE_REL_I386_DIR32NB = 0x0007,
IMAGE_REL_I386_SEG12 = 0x0009,
IMAGE_REL_I386_SECTION = 0x000A,
IMAGE_REL_I386_SECREL = 0x000B,
IMAGE_REL_I386_TOKEN = 0x000C,
IMAGE_REL_I386_SECREL7 = 0x000D,
IMAGE_REL_I386_REL32 = 0x0014
};
enum {
IMAGE_COMDAT_SELECT_NODUPLICATES = 1,
IMAGE_COMDAT_SELECT_ANY,
IMAGE_COMDAT_SELECT_SAME_SIZE,
IMAGE_COMDAT_SELECT_EXACT_MATCH,
IMAGE_COMDAT_SELECT_ASSOCIATIVE,
IMAGE_COMDAT_SELECT_LARGEST
};
} // End namespace llvm.
} // End namespace COFF.
#endif

110
lib/CodeGen/TargetLoweringObjectFileImpl.cpp
View File

@ -825,32 +825,32 @@ void TargetLoweringObjectFileCOFF::Initialize(MCContext &Ctx,
TargetLoweringObjectFile::Initialize(Ctx, TM); TargetLoweringObjectFile::Initialize(Ctx, TM);
TextSection = TextSection =
getContext().getCOFFSection(".text", getContext().getCOFFSection(".text",
MCSectionCOFF::IMAGE_SCN_CNT_CODE | COFF::IMAGE_SCN_CNT_CODE |
MCSectionCOFF::IMAGE_SCN_MEM_EXECUTE | COFF::IMAGE_SCN_MEM_EXECUTE |
MCSectionCOFF::IMAGE_SCN_MEM_READ, COFF::IMAGE_SCN_MEM_READ,
SectionKind::getText()); SectionKind::getText());
DataSection = DataSection =
getContext().getCOFFSection(".data", getContext().getCOFFSection(".data",
MCSectionCOFF::IMAGE_SCN_CNT_INITIALIZED_DATA | COFF::IMAGE_SCN_CNT_INITIALIZED_DATA |
MCSectionCOFF::IMAGE_SCN_MEM_READ | COFF::IMAGE_SCN_MEM_READ |
MCSectionCOFF::IMAGE_SCN_MEM_WRITE, COFF::IMAGE_SCN_MEM_WRITE,
SectionKind::getDataRel()); SectionKind::getDataRel());
ReadOnlySection = ReadOnlySection =
getContext().getCOFFSection(".rdata", getContext().getCOFFSection(".rdata",
MCSectionCOFF::IMAGE_SCN_CNT_INITIALIZED_DATA | COFF::IMAGE_SCN_CNT_INITIALIZED_DATA |
MCSectionCOFF::IMAGE_SCN_MEM_READ, COFF::IMAGE_SCN_MEM_READ,
SectionKind::getReadOnly()); SectionKind::getReadOnly());
StaticCtorSection = StaticCtorSection =
getContext().getCOFFSection(".ctors", getContext().getCOFFSection(".ctors",
MCSectionCOFF::IMAGE_SCN_CNT_INITIALIZED_DATA | COFF::IMAGE_SCN_CNT_INITIALIZED_DATA |
MCSectionCOFF::IMAGE_SCN_MEM_READ | COFF::IMAGE_SCN_MEM_READ |
MCSectionCOFF::IMAGE_SCN_MEM_WRITE, COFF::IMAGE_SCN_MEM_WRITE,
SectionKind::getDataRel()); SectionKind::getDataRel());
StaticDtorSection = StaticDtorSection =
getContext().getCOFFSection(".dtors", getContext().getCOFFSection(".dtors",
MCSectionCOFF::IMAGE_SCN_CNT_INITIALIZED_DATA | COFF::IMAGE_SCN_CNT_INITIALIZED_DATA |
MCSectionCOFF::IMAGE_SCN_MEM_READ | COFF::IMAGE_SCN_MEM_READ |
MCSectionCOFF::IMAGE_SCN_MEM_WRITE, COFF::IMAGE_SCN_MEM_WRITE,
SectionKind::getDataRel()); SectionKind::getDataRel());
// FIXME: We're emitting LSDA info into a readonly section on COFF, even // FIXME: We're emitting LSDA info into a readonly section on COFF, even
@ -859,76 +859,76 @@ void TargetLoweringObjectFileCOFF::Initialize(MCContext &Ctx,
// adjusted or this should be a data section. // adjusted or this should be a data section.
LSDASection = LSDASection =
getContext().getCOFFSection(".gcc_except_table", getContext().getCOFFSection(".gcc_except_table",
MCSectionCOFF::IMAGE_SCN_CNT_INITIALIZED_DATA | COFF::IMAGE_SCN_CNT_INITIALIZED_DATA |
MCSectionCOFF::IMAGE_SCN_MEM_READ, COFF::IMAGE_SCN_MEM_READ,
SectionKind::getReadOnly()); SectionKind::getReadOnly());
EHFrameSection = EHFrameSection =
getContext().getCOFFSection(".eh_frame", getContext().getCOFFSection(".eh_frame",
MCSectionCOFF::IMAGE_SCN_CNT_INITIALIZED_DATA | COFF::IMAGE_SCN_CNT_INITIALIZED_DATA |
MCSectionCOFF::IMAGE_SCN_MEM_READ | COFF::IMAGE_SCN_MEM_READ |
MCSectionCOFF::IMAGE_SCN_MEM_WRITE, COFF::IMAGE_SCN_MEM_WRITE,
SectionKind::getDataRel()); SectionKind::getDataRel());
// Debug info. // Debug info.
DwarfAbbrevSection = DwarfAbbrevSection =
getContext().getCOFFSection(".debug_abbrev", getContext().getCOFFSection(".debug_abbrev",
MCSectionCOFF::IMAGE_SCN_MEM_DISCARDABLE | COFF::IMAGE_SCN_MEM_DISCARDABLE |
MCSectionCOFF::IMAGE_SCN_MEM_READ, COFF::IMAGE_SCN_MEM_READ,
SectionKind::getMetadata()); SectionKind::getMetadata());
DwarfInfoSection = DwarfInfoSection =
getContext().getCOFFSection(".debug_info", getContext().getCOFFSection(".debug_info",
MCSectionCOFF::IMAGE_SCN_MEM_DISCARDABLE | COFF::IMAGE_SCN_MEM_DISCARDABLE |
MCSectionCOFF::IMAGE_SCN_MEM_READ, COFF::IMAGE_SCN_MEM_READ,
SectionKind::getMetadata()); SectionKind::getMetadata());
DwarfLineSection = DwarfLineSection =
getContext().getCOFFSection(".debug_line", getContext().getCOFFSection(".debug_line",
MCSectionCOFF::IMAGE_SCN_MEM_DISCARDABLE | COFF::IMAGE_SCN_MEM_DISCARDABLE |
MCSectionCOFF::IMAGE_SCN_MEM_READ, COFF::IMAGE_SCN_MEM_READ,
SectionKind::getMetadata()); SectionKind::getMetadata());
DwarfFrameSection = DwarfFrameSection =
getContext().getCOFFSection(".debug_frame", getContext().getCOFFSection(".debug_frame",
MCSectionCOFF::IMAGE_SCN_MEM_DISCARDABLE | COFF::IMAGE_SCN_MEM_DISCARDABLE |
MCSectionCOFF::IMAGE_SCN_MEM_READ, COFF::IMAGE_SCN_MEM_READ,
SectionKind::getMetadata()); SectionKind::getMetadata());
DwarfPubNamesSection = DwarfPubNamesSection =
getContext().getCOFFSection(".debug_pubnames", getContext().getCOFFSection(".debug_pubnames",
MCSectionCOFF::IMAGE_SCN_MEM_DISCARDABLE | COFF::IMAGE_SCN_MEM_DISCARDABLE |
MCSectionCOFF::IMAGE_SCN_MEM_READ, COFF::IMAGE_SCN_MEM_READ,
SectionKind::getMetadata()); SectionKind::getMetadata());
DwarfPubTypesSection = DwarfPubTypesSection =
getContext().getCOFFSection(".debug_pubtypes", getContext().getCOFFSection(".debug_pubtypes",
MCSectionCOFF::IMAGE_SCN_MEM_DISCARDABLE | COFF::IMAGE_SCN_MEM_DISCARDABLE |
MCSectionCOFF::IMAGE_SCN_MEM_READ, COFF::IMAGE_SCN_MEM_READ,
SectionKind::getMetadata()); SectionKind::getMetadata());
DwarfStrSection = DwarfStrSection =
getContext().getCOFFSection(".debug_str", getContext().getCOFFSection(".debug_str",
MCSectionCOFF::IMAGE_SCN_MEM_DISCARDABLE | COFF::IMAGE_SCN_MEM_DISCARDABLE |
MCSectionCOFF::IMAGE_SCN_MEM_READ, COFF::IMAGE_SCN_MEM_READ,
SectionKind::getMetadata()); SectionKind::getMetadata());
DwarfLocSection = DwarfLocSection =
getContext().getCOFFSection(".debug_loc", getContext().getCOFFSection(".debug_loc",
MCSectionCOFF::IMAGE_SCN_MEM_DISCARDABLE | COFF::IMAGE_SCN_MEM_DISCARDABLE |
MCSectionCOFF::IMAGE_SCN_MEM_READ, COFF::IMAGE_SCN_MEM_READ,
SectionKind::getMetadata()); SectionKind::getMetadata());
DwarfARangesSection = DwarfARangesSection =
getContext().getCOFFSection(".debug_aranges", getContext().getCOFFSection(".debug_aranges",
MCSectionCOFF::IMAGE_SCN_MEM_DISCARDABLE | COFF::IMAGE_SCN_MEM_DISCARDABLE |
MCSectionCOFF::IMAGE_SCN_MEM_READ, COFF::IMAGE_SCN_MEM_READ,
SectionKind::getMetadata()); SectionKind::getMetadata());
DwarfRangesSection = DwarfRangesSection =
getContext().getCOFFSection(".debug_ranges", getContext().getCOFFSection(".debug_ranges",
MCSectionCOFF::IMAGE_SCN_MEM_DISCARDABLE | COFF::IMAGE_SCN_MEM_DISCARDABLE |
MCSectionCOFF::IMAGE_SCN_MEM_READ, COFF::IMAGE_SCN_MEM_READ,
SectionKind::getMetadata()); SectionKind::getMetadata());
DwarfMacroInfoSection = DwarfMacroInfoSection =
getContext().getCOFFSection(".debug_macinfo", getContext().getCOFFSection(".debug_macinfo",
MCSectionCOFF::IMAGE_SCN_MEM_DISCARDABLE | COFF::IMAGE_SCN_MEM_DISCARDABLE |
MCSectionCOFF::IMAGE_SCN_MEM_READ, COFF::IMAGE_SCN_MEM_READ,
SectionKind::getMetadata()); SectionKind::getMetadata());
DrectveSection = DrectveSection =
getContext().getCOFFSection(".drectve", getContext().getCOFFSection(".drectve",
MCSectionCOFF::IMAGE_SCN_LNK_INFO, COFF::IMAGE_SCN_LNK_INFO,
SectionKind::getMetadata()); SectionKind::getMetadata());
} }
@ -938,25 +938,25 @@ getCOFFSectionFlags(SectionKind K) {
if (!K.isMetadata()) if (!K.isMetadata())
Flags |= Flags |=
MCSectionCOFF::IMAGE_SCN_MEM_DISCARDABLE; COFF::IMAGE_SCN_MEM_DISCARDABLE;
else if (K.isText()) else if (K.isText())
Flags |= Flags |=
MCSectionCOFF::IMAGE_SCN_MEM_EXECUTE | COFF::IMAGE_SCN_MEM_EXECUTE |
MCSectionCOFF::IMAGE_SCN_CNT_CODE; COFF::IMAGE_SCN_CNT_CODE;
else if (K.isBSS ()) else if (K.isBSS ())
Flags |= Flags |=
MCSectionCOFF::IMAGE_SCN_CNT_UNINITIALIZED_DATA | COFF::IMAGE_SCN_CNT_UNINITIALIZED_DATA |
MCSectionCOFF::IMAGE_SCN_MEM_READ | COFF::IMAGE_SCN_MEM_READ |
MCSectionCOFF::IMAGE_SCN_MEM_WRITE; COFF::IMAGE_SCN_MEM_WRITE;
else if (K.isReadOnly()) else if (K.isReadOnly())
Flags |= Flags |=
MCSectionCOFF::IMAGE_SCN_CNT_INITIALIZED_DATA | COFF::IMAGE_SCN_CNT_INITIALIZED_DATA |
MCSectionCOFF::IMAGE_SCN_MEM_READ; COFF::IMAGE_SCN_MEM_READ;
else if (K.isWriteable()) else if (K.isWriteable())
Flags |= Flags |=
MCSectionCOFF::IMAGE_SCN_CNT_INITIALIZED_DATA | COFF::IMAGE_SCN_CNT_INITIALIZED_DATA |
MCSectionCOFF::IMAGE_SCN_MEM_READ | COFF::IMAGE_SCN_MEM_READ |
MCSectionCOFF::IMAGE_SCN_MEM_WRITE; COFF::IMAGE_SCN_MEM_WRITE;
return Flags; return Flags;
} }
@ -995,10 +995,10 @@ SelectSectionForGlobal(const GlobalValue *GV, SectionKind Kind,
unsigned Characteristics = getCOFFSectionFlags(Kind); unsigned Characteristics = getCOFFSectionFlags(Kind);
Characteristics |= MCSectionCOFF::IMAGE_SCN_LNK_COMDAT; Characteristics |= COFF::IMAGE_SCN_LNK_COMDAT;
return getContext().getCOFFSection(Name.str(), Characteristics, return getContext().getCOFFSection(Name.str(), Characteristics,
MCSectionCOFF::IMAGE_COMDAT_SELECT_EXACT_MATCH, Kind); COFF::IMAGE_COMDAT_SELECT_EXACT_MATCH, Kind);
} }
if (Kind.isText()) if (Kind.isText())

14
lib/MC/MCSectionCOFF.cpp
View File

@ -44,28 +44,28 @@ void MCSectionCOFF::PrintSwitchToSection(const MCAsmInfo &MAI,
OS << 'w'; OS << 'w';
else else
OS << 'r'; OS << 'r';
if (getCharacteristics() & MCSectionCOFF::IMAGE_SCN_MEM_DISCARDABLE) if (getCharacteristics() & COFF::IMAGE_SCN_MEM_DISCARDABLE)
OS << 'n'; OS << 'n';
OS << "\"\n"; OS << "\"\n";
if (getCharacteristics() & MCSectionCOFF::IMAGE_SCN_LNK_COMDAT) { if (getCharacteristics() & COFF::IMAGE_SCN_LNK_COMDAT) {
switch (Selection) { switch (Selection) {
case IMAGE_COMDAT_SELECT_NODUPLICATES: case COFF::IMAGE_COMDAT_SELECT_NODUPLICATES:
OS << "\t.linkonce one_only\n"; OS << "\t.linkonce one_only\n";
break; break;
case IMAGE_COMDAT_SELECT_ANY: case COFF::IMAGE_COMDAT_SELECT_ANY:
OS << "\t.linkonce discard\n"; OS << "\t.linkonce discard\n";
break; break;
case IMAGE_COMDAT_SELECT_SAME_SIZE: case COFF::IMAGE_COMDAT_SELECT_SAME_SIZE:
OS << "\t.linkonce same_size\n"; OS << "\t.linkonce same_size\n";
break; break;
case IMAGE_COMDAT_SELECT_EXACT_MATCH: case COFF::IMAGE_COMDAT_SELECT_EXACT_MATCH:
OS << "\t.linkonce same_contents\n"; OS << "\t.linkonce same_contents\n";
break; break;
//NOTE: as of binutils 2.20, there is no way to specifiy select largest //NOTE: as of binutils 2.20, there is no way to specifiy select largest
// with the .linkonce directive. For now, we treat it as an invalid // with the .linkonce directive. For now, we treat it as an invalid
// comdat selection value. // comdat selection value.
case IMAGE_COMDAT_SELECT_LARGEST: case COFF::IMAGE_COMDAT_SELECT_LARGEST:
// OS << "\t.linkonce largest\n"; // OS << "\t.linkonce largest\n";
// break; // break;
default: default: