convert ctors/dtors section to be in TLOF instead of

TAI.

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

diff --git a/include/llvm/Target/TargetAsmInfo.h b/include/llvm/Target/TargetAsmInfo.h
index 0facf325777f84b8e392a6566339f5509e5cac38..0eff044c45e39258204558534069f467bf76b212 100644 (file)
--- a/include/llvm/Target/TargetAsmInfo.h
+++ b/include/llvm/Target/TargetAsmInfo.h
@@ -210,16 +210,6 @@ namespace llvm {
     /// table.
     const char *JumpTableDirective;
 
-    /// StaticCtorsSection - This is the directive that is emitted to switch to
-    /// a section to emit the static constructor list.
-    /// Defaults to "\t.section .ctors,\"aw\",@progbits".
-    const char *StaticCtorsSection;
-
-    /// StaticDtorsSection - This is the directive that is emitted to switch to
-    /// a section to emit the static destructor list.
-    /// Defaults to "\t.section .dtors,\"aw\",@progbits".
-    const char *StaticDtorsSection;
-
     //===--- Global Variable Emission Directives --------------------------===//
     
     /// GlobalDirective - This is the directive used to declare a global entity.
@@ -533,12 +523,6 @@ namespace llvm {
     const char *getSectionEndDirectiveSuffix() const {
       return SectionEndDirectiveSuffix;
     }
-    const char *getStaticCtorsSection() const {
-      return StaticCtorsSection;
-    }
-    const char *getStaticDtorsSection() const {
-      return StaticDtorsSection;
-    }
     const char *getGlobalDirective() const {
       return GlobalDirective;
     }

diff --git a/include/llvm/Target/TargetLoweringObjectFile.h b/include/llvm/Target/TargetLoweringObjectFile.h
index f6b1220e6cb8958a7074ff00b59f8c2e2afdb871..ec6b697585500894fbbf9cda9b53dcf59ae4a3b7 100644 (file)
--- a/include/llvm/Target/TargetLoweringObjectFile.h
+++ b/include/llvm/Target/TargetLoweringObjectFile.h
@@ -50,6 +50,14 @@ protected:
   /// section for constants.
   const MCSection *ReadOnlySection;
   
+  /// StaticCtorSection - This section contains the static constructor pointer
+  /// list.
+  const MCSection *StaticCtorSection;
+
+  /// StaticDtorSection - This section contains the static destructor pointer
+  /// list.
+  const MCSection *StaticDtorSection;
+  
 public:
   // FIXME: NONPUB.
   const MCSection *getOrCreateSection(const char *Name,
@@ -69,7 +77,10 @@ public:
   
   const MCSection *getTextSection() const { return TextSection; }
   const MCSection *getDataSection() const { return DataSection; }
-  
+
+  const MCSection *getStaticCtorSection() const { return StaticCtorSection; }
+  const MCSection *getStaticDtorSection() const { return StaticDtorSection; }
+
   /// shouldEmitUsedDirectiveFor - This hook allows targets to selectively
   /// decide not to emit the UsedDirective for some symbols in llvm.used.
   /// FIXME: REMOVE this (rdar://7071300)

diff --git a/lib/CodeGen/AsmPrinter/AsmPrinter.cpp b/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
index 7cb7e07df4d1d5684e6c841017e3799f1c359e7b..0a81bd7c2a82ff57b14822ab9705e310f2368064 100644 (file)
--- a/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
+++ b/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
@@ -532,14 +532,14 @@ bool AsmPrinter::EmitSpecialLLVMGlobal(const GlobalVariable *GV) {
   const TargetData *TD = TM.getTargetData();
   unsigned Align = Log2_32(TD->getPointerPrefAlignment());
   if (GV->getName() == "llvm.global_ctors") {
-    SwitchToDataSection(TAI->getStaticCtorsSection());
+    SwitchToSection(getObjFileLowering().getStaticCtorSection());
     EmitAlignment(Align, 0);
     EmitXXStructorList(GV->getInitializer());
     return true;
   } 
   
   if (GV->getName() == "llvm.global_dtors") {
-    SwitchToDataSection(TAI->getStaticDtorsSection());
+    SwitchToSection(getObjFileLowering().getStaticDtorSection());
     EmitAlignment(Align, 0);
     EmitXXStructorList(GV->getInitializer());
     return true;

diff --git a/lib/Target/ARM/ARMISelLowering.cpp b/lib/Target/ARM/ARMISelLowering.cpp
index 97134ee3d11a2755a688c8ee28628a22ae125877..f0cf943488973705d29bf6de9d4f32dfd42daf84 100644 (file)
--- a/lib/Target/ARM/ARMISelLowering.cpp
+++ b/lib/Target/ARM/ARMISelLowering.cpp
@@ -20,6 +20,7 @@
 #include "ARMRegisterInfo.h"
 #include "ARMSubtarget.h"
 #include "ARMTargetMachine.h"
+#include "ARMTargetObjectFile.h"
 #include "llvm/CallingConv.h"
 #include "llvm/Constants.h"
 #include "llvm/Function.h"
@@ -34,7 +35,6 @@
 #include "llvm/CodeGen/MachineRegisterInfo.h"
 #include "llvm/CodeGen/PseudoSourceValue.h"
 #include "llvm/CodeGen/SelectionDAG.h"
-#include "llvm/Target/TargetLoweringObjectFile.h"
 #include "llvm/Target/TargetOptions.h"
 #include "llvm/ADT/VectorExtras.h"
 #include "llvm/Support/ErrorHandling.h"
@@ -107,7 +107,7 @@ void ARMTargetLowering::addQRTypeForNEON(MVT VT) {
 static TargetLoweringObjectFile *createTLOF(TargetMachine &TM) {
   if (TM.getSubtarget<ARMSubtarget>().isTargetDarwin())
     return new TargetLoweringObjectFileMachO();
-  return new TargetLoweringObjectFileELF(true);
+  return new ARMElfTargetObjectFile();
 }
 
 ARMTargetLowering::ARMTargetLowering(TargetMachine &TM)

diff --git a/lib/Target/ARM/ARMTargetAsmInfo.cpp b/lib/Target/ARM/ARMTargetAsmInfo.cpp
index 2e249fb355ed87a524d74d847a4af534f599f7b9..ac0f6107cc611a5884bfdd1b318b7e090d30631a 100644 (file)
--- a/lib/Target/ARM/ARMTargetAsmInfo.cpp
+++ b/lib/Target/ARM/ARMTargetAsmInfo.cpp
@@ -78,13 +78,6 @@ ARMELFTargetAsmInfo::ARMELFTargetAsmInfo(const ARMBaseTargetMachine &TM):
   DwarfRangesSection =  "\t.section\t.debug_ranges,\"\",%progbits";
   DwarfMacroInfoSection = "\t.section\t.debug_macinfo,\"\",%progbits";
 
-  if (Subtarget->isAAPCS_ABI()) {
-    StaticCtorsSection = "\t.section .init_array,\"aw\",%init_array";
-    StaticDtorsSection = "\t.section .fini_array,\"aw\",%fini_array";
-  } else {
-    StaticCtorsSection = "\t.section .ctors,\"aw\",%progbits";
-    StaticDtorsSection = "\t.section .dtors,\"aw\",%progbits";
-  }
   SupportsDebugInformation = true;
 }
 

diff --git a/lib/Target/ARM/ARMTargetObjectFile.h b/lib/Target/ARM/ARMTargetObjectFile.h
new file mode 100644 (file)
index 0000000..604dd83
--- /dev/null
+++ b/lib/Target/ARM/ARMTargetObjectFile.h
@@ -0,0 +1,38 @@
+//===-- llvm/Target/ARMTargetObjectFile.h - ARM Object Info -----*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_TARGET_ARM_TARGETOBJECTFILE_H
+#define LLVM_TARGET_ARM_TARGETOBJECTFILE_H
+
+#include "llvm/Target/TargetLoweringObjectFile.h"
+
+namespace llvm {
+  
+  class ARMElfTargetObjectFile : public TargetLoweringObjectFileELF {
+  public:
+    ARMElfTargetObjectFile() : TargetLoweringObjectFileELF(true) {}
+    
+    void Initialize(MCContext &Ctx, const TargetMachine &TM) {
+      TargetLoweringObjectFileELF::Initialize(Ctx, TM);
+      
+      // FIXME: Add new attribute/flag to MCSection for init_array/fini_array.
+      // That will allow not treating these as "directives".
+      if (TM.getSubtarget<ARMSubtarget>().isAAPCS_ABI()) {
+        StaticCtorSection =
+          getOrCreateSection("\t.section .init_array,\"aw\",%init_array", false,
+                             SectionKind::getDataRel());
+        StaticDtorSection =
+          getOrCreateSection("\t.section .fini_array,\"aw\",%fini_array", false,
+                             SectionKind::getDataRel());
+      }
+    }
+  };
+} // end namespace llvm
+
+#endif

diff --git a/lib/Target/COFFTargetAsmInfo.cpp b/lib/Target/COFFTargetAsmInfo.cpp
index f1f742e787b0a7e8d5b21997f24f35e7643ef525..970096b473c011ca1d9323f78df69e8a3be7837b 100644 (file)
--- a/lib/Target/COFFTargetAsmInfo.cpp
+++ b/lib/Target/COFFTargetAsmInfo.cpp
@@ -24,8 +24,6 @@ COFFTargetAsmInfo::COFFTargetAsmInfo(const TargetMachine &TM)
   COMMDirectiveTakesAlignment = false;
   HasDotTypeDotSizeDirective = false;
   HasSingleParameterDotFile = false;
-  StaticCtorsSection = "\t.section .ctors,\"aw\"";
-  StaticDtorsSection = "\t.section .dtors,\"aw\"";
   HiddenDirective = NULL;
   PrivateGlobalPrefix = "L";  // Prefix for private global symbols
   WeakRefDirective = "\t.weak\t";

diff --git a/lib/Target/DarwinTargetAsmInfo.cpp b/lib/Target/DarwinTargetAsmInfo.cpp
index cca12c01cb02044207c257789ecc44af32084d2c..24bc9a5fa79cdb7042f42575c7c7b351d9c262a6 100644 (file)
--- a/lib/Target/DarwinTargetAsmInfo.cpp
+++ b/lib/Target/DarwinTargetAsmInfo.cpp
@@ -48,15 +48,6 @@ DarwinTargetAsmInfo::DarwinTargetAsmInfo(const TargetMachine &TM)
   WeakRefDirective = "\t.weak_reference ";
   HiddenDirective = "\t.private_extern ";
     
-  // Sections:
-  if (TM.getRelocationModel() == Reloc::Static) {
-    StaticCtorsSection = ".constructor";
-    StaticDtorsSection = ".destructor";
-  } else {
-    StaticCtorsSection = ".mod_init_func";
-    StaticDtorsSection = ".mod_term_func";
-  }
-    
   // _foo.eh symbols are currently always exported so that the linker knows
   // about them.  This may not strictly be necessary on 10.6 and later, but it
   // doesn't hurt anything.

diff --git a/lib/Target/TargetAsmInfo.cpp b/lib/Target/TargetAsmInfo.cpp
index add1dbf5c375dfbfcaa54a2efea2ccf9a1bf023c..80bb90e0651039f95ed227bec4fda453428393fe 100644 (file)
--- a/lib/Target/TargetAsmInfo.cpp
+++ b/lib/Target/TargetAsmInfo.cpp
@@ -70,9 +70,6 @@ TargetAsmInfo::TargetAsmInfo(const TargetMachine &tm) : TM(tm) {
   DataSectionStartSuffix = "";
   SectionEndDirectiveSuffix = 0;
   JumpTableDirective = 0;
-  // FIXME: Flags are ELFish - replace with normal section stuff.
-  StaticCtorsSection = "\t.section .ctors,\"aw\",@progbits";
-  StaticDtorsSection = "\t.section .dtors,\"aw\",@progbits";
   GlobalDirective = "\t.globl\t";
   SetDirective = 0;
   LCOMMDirective = 0;

diff --git a/lib/Target/TargetLoweringObjectFile.cpp b/lib/Target/TargetLoweringObjectFile.cpp
index 7c5eaf9dbffbd498e142fadaed83d2b0ad75b6b7..a86946da9f107513becec13f144fc595970931ef 100644 (file)
--- a/lib/Target/TargetLoweringObjectFile.cpp
+++ b/lib/Target/TargetLoweringObjectFile.cpp
@@ -34,6 +34,8 @@ TargetLoweringObjectFile::TargetLoweringObjectFile() : Ctx(0) {
   DataSection = 0;
   BSSSection = 0;
   ReadOnlySection = 0;
+  StaticCtorSection = 0;
+  StaticDtorSection = 0;
 }
 
 TargetLoweringObjectFile::~TargetLoweringObjectFile() {
@@ -295,6 +297,11 @@ void TargetLoweringObjectFileELF::Initialize(MCContext &Ctx,
                                 SectionKind::getMergeableConst8());
   MergeableConst16Section = getOrCreateSection(".rodata.cst16", false,
                                SectionKind::getMergeableConst16());
+
+  StaticCtorSection =
+    getOrCreateSection(".ctors", false, SectionKind::getDataRel());
+  StaticDtorSection =
+    getOrCreateSection(".dtors", false, SectionKind::getDataRel());
 }
 
 
@@ -517,6 +524,19 @@ void TargetLoweringObjectFileMachO::Initialize(MCContext &Ctx,
   DataCoalSection = getOrCreateSection("\t__DATA,__datacoal_nt,coalesced",
                                        false,
                                        SectionKind::getDataRel());
+
+  if (TM.getRelocationModel() == Reloc::Static) {
+    StaticCtorSection =
+      getOrCreateSection(".constructor", true, SectionKind::getDataRel());
+    StaticDtorSection =
+      getOrCreateSection(".destructor", true, SectionKind::getDataRel());
+  } else {
+    StaticCtorSection =
+      getOrCreateSection(".mod_init_func", true, SectionKind::getDataRel());
+    StaticDtorSection =
+      getOrCreateSection(".mod_term_func", true, SectionKind::getDataRel());
+  }
+  
 }
 
 const MCSection *TargetLoweringObjectFileMachO::
@@ -624,6 +644,10 @@ void TargetLoweringObjectFileCOFF::Initialize(MCContext &Ctx,
                                    SectionKind::getText());
   DataSection = getOrCreateSection("\t.data", true,
                                    SectionKind::getDataRel());
+  StaticCtorSection =
+    getOrCreateSection(".ctors", false, SectionKind::getDataRel());
+  StaticDtorSection =
+    getOrCreateSection(".dtors", false, SectionKind::getDataRel());
 }
 
 void TargetLoweringObjectFileCOFF::