diff options
| -rw-r--r-- | lib/Target/ARM/ARMTargetMachine.cpp | 4 | ||||
| -rw-r--r-- | lib/Target/Alpha/AlphaTargetMachine.cpp | 3 | ||||
| -rw-r--r-- | lib/Target/CBackend/CTargetMachine.h | 3 | ||||
| -rw-r--r-- | lib/Target/IA64/IA64TargetMachine.cpp | 2 | ||||
| -rw-r--r-- | lib/Target/PowerPC/PPCTargetMachine.cpp | 3 | ||||
| -rw-r--r-- | lib/Target/Sparc/SparcTargetMachine.cpp | 3 | ||||
| -rw-r--r-- | lib/Target/TargetData.cpp | 2 | ||||
| -rw-r--r-- | lib/Target/X86/X86TargetMachine.cpp | 2 |
8 files changed, 8 insertions, 14 deletions
diff --git a/lib/Target/ARM/ARMTargetMachine.cpp b/lib/Target/ARM/ARMTargetMachine.cpp index 45d7241910..f4824da71e 100644 --- a/lib/Target/ARM/ARMTargetMachine.cpp +++ b/lib/Target/ARM/ARMTargetMachine.cpp @@ -32,9 +32,7 @@ namespace { /// TargetMachine ctor - Create an ILP32 architecture model /// ARMTargetMachine::ARMTargetMachine(const Module &M, const std::string &FS) - : TargetMachine("ARM"), - DataLayout(std::string("ARM"), std::string("E-p:32:32")), - InstrInfo(), + : TargetMachine("ARM"), DataLayout("E-p:32:32"), FrameInfo(TargetFrameInfo::StackGrowsDown, 8, 0) { } diff --git a/lib/Target/Alpha/AlphaTargetMachine.cpp b/lib/Target/Alpha/AlphaTargetMachine.cpp index f7fd8e0e16..df94d6fa34 100644 --- a/lib/Target/Alpha/AlphaTargetMachine.cpp +++ b/lib/Target/Alpha/AlphaTargetMachine.cpp @@ -54,8 +54,7 @@ unsigned AlphaTargetMachine::getJITMatchQuality() { } AlphaTargetMachine::AlphaTargetMachine(const Module &M, const std::string &FS) - : TargetMachine("alpha"), - DataLayout(std::string("alpha"), std::string("e")), + : TargetMachine("alpha"), DataLayout("e"), FrameInfo(TargetFrameInfo::StackGrowsDown, 16, 0), JITInfo(*this), Subtarget(M, FS) diff --git a/lib/Target/CBackend/CTargetMachine.h b/lib/Target/CBackend/CTargetMachine.h index ad0959f482..eec2b16483 100644 --- a/lib/Target/CBackend/CTargetMachine.h +++ b/lib/Target/CBackend/CTargetMachine.h @@ -23,8 +23,7 @@ struct CTargetMachine : public TargetMachine { const TargetData DataLayout; // Calculates type size & alignment CTargetMachine(const Module &M, const std::string &FS) - : TargetMachine("CBackend", M), - DataLayout("CBackend", &M) {} + : TargetMachine("CBackend", M), DataLayout(&M) {} // This is the only thing that actually does anything here. virtual bool addPassesToEmitFile(PassManager &PM, std::ostream &Out, diff --git a/lib/Target/IA64/IA64TargetMachine.cpp b/lib/Target/IA64/IA64TargetMachine.cpp index f51da17564..0c5ae0d67c 100644 --- a/lib/Target/IA64/IA64TargetMachine.cpp +++ b/lib/Target/IA64/IA64TargetMachine.cpp @@ -76,7 +76,7 @@ unsigned IA64TargetMachine::getModuleMatchQuality(const Module &M) { /// IA64TargetMachine ctor - Create an LP64 architecture model /// IA64TargetMachine::IA64TargetMachine(const Module &M, const std::string &FS) - : TargetMachine("IA64"), DataLayout(std::string("IA64"), std::string("e")), + : TargetMachine("IA64"), DataLayout("e"), FrameInfo(TargetFrameInfo::StackGrowsDown, 16, 0), TLInfo(*this) { // FIXME? check this stuff } diff --git a/lib/Target/PowerPC/PPCTargetMachine.cpp b/lib/Target/PowerPC/PPCTargetMachine.cpp index a518f9d69c..78ea48197e 100644 --- a/lib/Target/PowerPC/PPCTargetMachine.cpp +++ b/lib/Target/PowerPC/PPCTargetMachine.cpp @@ -87,8 +87,7 @@ unsigned PPC64TargetMachine::getModuleMatchQuality(const Module &M) { PPCTargetMachine::PPCTargetMachine(const Module &M, const std::string &FS, bool is64Bit) : TargetMachine("PowerPC"), Subtarget(M, FS, is64Bit), - DataLayout(std::string("PowerPC"), - std::string(Subtarget.getTargetDataString())), + DataLayout(Subtarget.getTargetDataString()), FrameInfo(*this, false), JITInfo(*this), TLInfo(*this), InstrItins(Subtarget.getInstrItineraryData()) { diff --git a/lib/Target/Sparc/SparcTargetMachine.cpp b/lib/Target/Sparc/SparcTargetMachine.cpp index 83cd3866e4..bf3b343112 100644 --- a/lib/Target/Sparc/SparcTargetMachine.cpp +++ b/lib/Target/Sparc/SparcTargetMachine.cpp @@ -31,8 +31,7 @@ namespace { /// SparcTargetMachine ctor - Create an ILP32 architecture model /// SparcTargetMachine::SparcTargetMachine(const Module &M, const std::string &FS) - : TargetMachine("Sparc"), - DataLayout(std::string("Sparc"), std::string("E-p:32:32")), + : TargetMachine("Sparc"), DataLayout("E-p:32:32"), Subtarget(M, FS), InstrInfo(Subtarget), FrameInfo(TargetFrameInfo::StackGrowsDown, 8, 0) { } diff --git a/lib/Target/TargetData.cpp b/lib/Target/TargetData.cpp index d2b6a54ecd..cb602a6352 100644 --- a/lib/Target/TargetData.cpp +++ b/lib/Target/TargetData.cpp @@ -152,7 +152,7 @@ void TargetData::init(const std::string &TargetDescription) { } } -TargetData::TargetData(const std::string &ToolName, const Module *M) { +TargetData::TargetData(const Module *M) { LittleEndian = M->getEndianness() != Module::BigEndian; PointerSize = M->getPointerSize() != Module::Pointer64 ? 4 : 8; PointerAlignment = PointerSize; diff --git a/lib/Target/X86/X86TargetMachine.cpp b/lib/Target/X86/X86TargetMachine.cpp index 8ab0073633..2c3c530684 100644 --- a/lib/Target/X86/X86TargetMachine.cpp +++ b/lib/Target/X86/X86TargetMachine.cpp @@ -70,7 +70,7 @@ unsigned X86TargetMachine::getModuleMatchQuality(const Module &M) { X86TargetMachine::X86TargetMachine(const Module &M, const std::string &FS) : TargetMachine("X86"), Subtarget(M, FS), - DataLayout(std::string("X86"), std::string("e-p:32:32-d:32-l:32")), + DataLayout("e-p:32:32-d:32-l:32"), FrameInfo(TargetFrameInfo::StackGrowsDown, Subtarget.getStackAlignment(), -4), InstrInfo(*this), JITInfo(*this), TLInfo(*this) { |