Sink getSectionPrefixForUniqueGlobal down into the TAI

implementations that need it, rearrange ELFTAI.


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

3 files changed, 7 insertions, 15 deletions

diff --git a/include/llvm/Target/COFFTargetAsmInfo.h b/include/llvm/Target/COFFTargetAsmInfo.h
index 45eef01..4a60c0c 100644
--- a/include/llvm/Target/COFFTargetAsmInfo.h
+++ b/include/llvm/Target/COFFTargetAsmInfo.h
@@ -17,12 +17,12 @@ namespace llvm {
   protected:
     explicit COFFTargetAsmInfo(const TargetMachine &TM);
   public:
-
-    virtual const char *
-    getSectionPrefixForUniqueGlobal(SectionKind kind) const;
-    
     virtual void getSectionFlagsAsString(SectionKind Kind,
                                          SmallVectorImpl<char> &Str) const;
+    
+    virtual const Section *
+    SelectSectionForGlobal(const GlobalValue *GV, SectionKind Kind) const;
+      
   };
 }
 
diff --git a/include/llvm/Target/ELFTargetAsmInfo.h b/include/llvm/Target/ELFTargetAsmInfo.h
index a0cbc8e..1b5bc54 100644
--- a/include/llvm/Target/ELFTargetAsmInfo.h
+++ b/include/llvm/Target/ELFTargetAsmInfo.h
@@ -33,8 +33,6 @@ namespace llvm {
     void getSectionFlagsAsString(SectionKind Kind,
                                  SmallVectorImpl<char> &Str) const;
     
-    const char *getSectionPrefixForUniqueGlobal(SectionKind Kind) const;
-    
     virtual const Section* SelectSectionForGlobal(const GlobalValue *GV,
                                                   SectionKind Kind) const;
     
diff --git a/include/llvm/Target/TargetAsmInfo.h b/include/llvm/Target/TargetAsmInfo.h
index 9ddaf29..9031dd2 100644
--- a/include/llvm/Target/TargetAsmInfo.h
+++ b/include/llvm/Target/TargetAsmInfo.h
@@ -144,6 +144,9 @@ namespace llvm {
     bool ExplicitSection : 1;
   public:
     
+    // FIXME: REMOVE.
+    Kind getKind() const { return K; }
+    
     bool isWeak() const { return Weak; }
     bool hasExplicitSection() const { return ExplicitSection; }
     
@@ -669,15 +672,6 @@ namespace llvm {
     virtual const Section *getSectionForMergeableConstant(SectionKind Kind)const;
 
     
-    /// getSectionPrefixForUniqueGlobal - Return a string that we should prepend
-    /// onto a global's name in order to get the unique section name for the
-    /// global.  This is important for globals that need to be merged across
-    /// translation units.
-    virtual const char *
-    getSectionPrefixForUniqueGlobal(SectionKind Kind) const {
-      return 0;
-    }
-    
     /// getKindForNamedSection - If this target wants to be able to override
     /// section flags based on the name of the section specified for a global
     /// variable, it can implement this.  This is used on ELF systems so that