maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

COFF: Remove dead code. 

r241647 made Driver to infer machine type, so this code is not actually in use.

llvm-svn: 241720
This commit is contained in:
Rui Ueyama 2015-07-08 20:35:29 +00:00
parent 1c79ce9a4c
commit dcb46d6a74
1 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lld/COFF/Writer.cpp
View File

@ -375,17 +375,6 @@ void Writer::assignAddresses() {
RoundUpToAlignment(FileOff - SizeOfHeaders, FileAlignment); RoundUpToAlignment(FileOff - SizeOfHeaders, FileAlignment);
} }
static MachineTypes
inferMachineType(const std::vector<ObjectFile *> &Files) {
for (ObjectFile *F : Files) {
// Try to infer machine type from the magic byte of the object file.
auto MT = static_cast<MachineTypes>(F->getCOFFObj()->getMachine());
if (MT != IMAGE_FILE_MACHINE_UNKNOWN)
return MT;
}
return IMAGE_FILE_MACHINE_UNKNOWN;
}
template <typename PEHeaderTy> void Writer::writeHeader() { template <typename PEHeaderTy> void Writer::writeHeader() {
// Write DOS stub // Write DOS stub
uint8_t *Buf = Buffer->getBufferStart(); uint8_t *Buf = Buffer->getBufferStart();
@ -400,15 +389,10 @@ template <typename PEHeaderTy> void Writer::writeHeader() {
memcpy(Buf, PEMagic, sizeof(PEMagic)); memcpy(Buf, PEMagic, sizeof(PEMagic));
Buf += sizeof(PEMagic); Buf += sizeof(PEMagic);
// Determine machine type, infer if needed. TODO: diagnose conflicts.
MachineTypes MachineType = Config->MachineType;
if (MachineType == IMAGE_FILE_MACHINE_UNKNOWN)
MachineType = inferMachineType(Symtab->ObjectFiles);
// Write COFF header // Write COFF header
auto *COFF = reinterpret_cast<coff_file_header *>(Buf); auto *COFF = reinterpret_cast<coff_file_header *>(Buf);
Buf += sizeof(*COFF); Buf += sizeof(*COFF);
COFF->Machine = MachineType; COFF->Machine = Config->MachineType;
COFF->NumberOfSections = OutputSections.size(); COFF->NumberOfSections = OutputSections.size();
COFF->Characteristics = IMAGE_FILE_EXECUTABLE_IMAGE; COFF->Characteristics = IMAGE_FILE_EXECUTABLE_IMAGE;
if (Is64) if (Is64)