Don't pass target name into TargetData anymore, it is never used or needed.

Remove explicit casts to std::string now that there is no overload resolution
issues in the TargetData ctors.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@28830 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Target/ARM/ARMTargetMachine.cpp b/lib/Target/ARM/ARMTargetMachine.cpp
index 45d72419100d9ac81ccc60a12a6c3becb06d04cf..f4824da71eb7b593dc11b582dd3ee34b18bab008 100644 (file)
--- 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 f7fd8e0e1669ee022ec1a48de3c6649137f29dc6..df94d6fa348b4c10be13f5918f6c192591e587d3 100644 (file)
--- 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 ad0959f48211797326a529e1bef320d8e51846a7..eec2b16483ebd4ffd90a6a22eca762dc739d1fca 100644 (file)
--- 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 f51da17564ca5da556c77934879431ab52a97e28..0c5ae0d67c64474610bff2a51c0a79a71a198af3 100644 (file)
--- 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 a518f9d69c1dc9540bb38470127daf912f05512a..78ea48197e8d0f11f586af987f78a861e4892e80 100644 (file)
--- 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 83cd3866e415e058f19d920c82b02e1bcc67d884..bf3b343112c062d47e775bd1494fee018afa97a0 100644 (file)
--- 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 d2b6a54ecd32efe4e401ed0d7aae1eb19a2e8d40..cb602a635255a9c8f9bf3e7a42035aed807f1e45 100644 (file)
--- 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 8ab0073633dac0dd51bf610abe095b4f774f2628..2c3c5306847cda4a966630448621b5053582d3a6 100644 (file)
--- 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) {