RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-26 21:00:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Making the e_machine configurable by the target backend in ELFObjectWriter.

Browse Source 
llvm-svn: 117099
This commit is contained in:
Wesley Peck 2010-10-22 15:52:49 +00:00
parent 4c7d031a0d
commit 488027efa3
5 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/llvm/MC/ELFObjectWriter.h
View File

@ -27,7 +27,8 @@ class ELFObjectWriter : public MCObjectWriter {
public:
ELFObjectWriter(raw_ostream &OS, bool Is64Bit, Triple::OSType OSType,
bool IsLittleEndian = true, bool HasRelocationAddend = true);
uint16_t EMachine, bool IsLittleEndian = true,
bool HasRelocationAddend = true);
virtual ~ELFObjectWriter();

14
lib/MC/ELFObjectWriter.cpp
View File

@ -164,6 +164,8 @@ namespace {
Triple::OSType OSType;
uint16_t EMachine;
// This holds the symbol table index of the last local symbol.
unsigned LastLocalSymbolIndex;
// This holds the .strtab section index.
@ -173,10 +175,11 @@ namespace {
public:
ELFObjectWriterImpl(ELFObjectWriter *_Writer, bool _Is64Bit,
bool _HasRelAddend, Triple::OSType _OSType)
uint16_t _EMachine, bool _HasRelAddend,
Triple::OSType _OSType)
: NeedsGOT(false), Writer(_Writer), OS(Writer->getStream()),
Is64Bit(_Is64Bit), HasRelocationAddend(_HasRelAddend),
OSType(_OSType) {
OSType(_OSType), EMachine(_EMachine) {
}
void Write8(uint8_t Value) { Writer->Write8(Value); }
@ -344,8 +347,7 @@ void ELFObjectWriterImpl::WriteHeader(uint64_t SectionDataSize,
Write16(ELF::ET_REL); // e_type
// FIXME: Make this configurable
Write16(Is64Bit ? ELF::EM_X86_64 : ELF::EM_386); // e_machine = target
Write16(EMachine); // e_machine = target
Write32(ELF::EV_CURRENT); // e_version
WriteWord(0); // e_entry, no entry point in .o file
@ -1221,11 +1223,13 @@ void ELFObjectWriterImpl::WriteObject(MCAssembler &Asm,
ELFObjectWriter::ELFObjectWriter(raw_ostream &OS,
bool Is64Bit,
Triple::OSType OSType,
uint16_t EMachine,
bool IsLittleEndian,
bool HasRelocationAddend)
: MCObjectWriter(OS, IsLittleEndian)
{
Impl = new ELFObjectWriterImpl(this, Is64Bit, HasRelocationAddend, OSType);
Impl = new ELFObjectWriterImpl(this, Is64Bit, EMachine,
HasRelocationAddend, OSType);
}
ELFObjectWriter::~ELFObjectWriter() {

3
lib/Target/ARM/ARMAsmBackend.cpp
View File

@ -19,6 +19,7 @@
#include "llvm/MC/MCSectionELF.h"
#include "llvm/MC/MCSectionMachO.h"
#include "llvm/MC/MachObjectWriter.h"
#include "llvm/Support/ELF.h"
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/raw_ostream.h"
#include "llvm/Target/TargetRegistry.h"
@ -90,7 +91,7 @@ public:
MCObjectWriter *createObjectWriter(raw_ostream &OS) const {
return new ELFObjectWriter(OS, /*Is64Bit=*/false,
OSType,
OSType, ELF::EM_ARM,
/*IsLittleEndian=*/true,
/*HasRelocationAddend=*/false);
}

3
lib/Target/MBlaze/MBlazeAsmBackend.cpp
View File

@ -19,6 +19,7 @@
#include "llvm/MC/MCSectionELF.h"
#include "llvm/MC/MCSectionMachO.h"
#include "llvm/MC/MachObjectWriter.h"
#include "llvm/Support/ELF.h"
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/raw_ostream.h"
#include "llvm/Target/TargetRegistry.h"
@ -104,7 +105,7 @@ public:
MCObjectWriter *createObjectWriter(raw_ostream &OS) const {
return new ELFObjectWriter(OS, /*Is64Bit=*/false,
OSType,
OSType, ELF::EM_MBLAZE,
/*IsLittleEndian=*/false,
/*HasRelocationAddend=*/true);
}

5
lib/Target/X86/X86AsmBackend.cpp
View File

@ -20,6 +20,7 @@
#include "llvm/MC/MCSectionELF.h"
#include "llvm/MC/MCSectionMachO.h"
#include "llvm/MC/MachObjectWriter.h"
#include "llvm/Support/ELF.h"
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/raw_ostream.h"
#include "llvm/Target/TargetRegistry.h"
@ -228,7 +229,7 @@ public:
MCObjectWriter *createObjectWriter(raw_ostream &OS) const {
return new ELFObjectWriter(OS, /*Is64Bit=*/false,
OSType,
OSType, ELF::EM_386,
/*IsLittleEndian=*/true,
/*HasRelocationAddend=*/false);
}
@ -245,7 +246,7 @@ public:
MCObjectWriter *createObjectWriter(raw_ostream &OS) const {
return new ELFObjectWriter(OS, /*Is64Bit=*/true,
OSType,
OSType, ELF::EM_X86_64,
/*IsLittleEndian=*/true,
/*HasRelocationAddend=*/true);
}