[llvm-commits] [llvm] r77842 - in /llvm/trunk: include/llvm/Target/TargetAsmInfo.h include/llvm/Target/TargetLoweringObjectFile.h lib/CodeGen/AsmPrinter/AsmPrinter.cpp lib/Target/ARM/ARMISelLowering.cpp lib/Target/ARM/ARMTargetAsmInfo.cpp lib/Target/ARM/ARMTargetObjectFile.h lib/Target/COFFTargetAsmInfo.cpp lib/Target/DarwinTargetAsmInfo.cpp lib/Target/TargetAsmInfo.cpp lib/Target/TargetLoweringObjectFile.cpp
Chris Lattner
sabre at nondot.org
Sat Aug 1 17:34:36 PDT 2009
Author: lattner
Date: Sat Aug 1 19:34:36 2009
New Revision: 77842
URL: http://llvm.org/viewvc/llvm-project?rev=77842&view=rev
Log:
convert ctors/dtors section to be in TLOF instead of
TAI.
Added:
llvm/trunk/lib/Target/ARM/ARMTargetObjectFile.h
Modified:
llvm/trunk/include/llvm/Target/TargetAsmInfo.h
llvm/trunk/include/llvm/Target/TargetLoweringObjectFile.h
llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
llvm/trunk/lib/Target/ARM/ARMISelLowering.cpp
llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.cpp
llvm/trunk/lib/Target/COFFTargetAsmInfo.cpp
llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp
llvm/trunk/lib/Target/TargetAsmInfo.cpp
llvm/trunk/lib/Target/TargetLoweringObjectFile.cpp
Modified: llvm/trunk/include/llvm/Target/TargetAsmInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/TargetAsmInfo.h?rev=77842&r1=77841&r2=77842&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Target/TargetAsmInfo.h (original)
+++ llvm/trunk/include/llvm/Target/TargetAsmInfo.h Sat Aug 1 19:34:36 2009
@@ -210,16 +210,6 @@
/// 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\", at 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\", at progbits".
- const char *StaticDtorsSection;
-
//===--- Global Variable Emission Directives --------------------------===//
/// GlobalDirective - This is the directive used to declare a global entity.
@@ -533,12 +523,6 @@
const char *getSectionEndDirectiveSuffix() const {
return SectionEndDirectiveSuffix;
}
- const char *getStaticCtorsSection() const {
- return StaticCtorsSection;
- }
- const char *getStaticDtorsSection() const {
- return StaticDtorsSection;
- }
const char *getGlobalDirective() const {
return GlobalDirective;
}
Modified: llvm/trunk/include/llvm/Target/TargetLoweringObjectFile.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/TargetLoweringObjectFile.h?rev=77842&r1=77841&r2=77842&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Target/TargetLoweringObjectFile.h (original)
+++ llvm/trunk/include/llvm/Target/TargetLoweringObjectFile.h Sat Aug 1 19:34:36 2009
@@ -50,6 +50,14 @@
/// 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 @@
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)
Modified: llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp?rev=77842&r1=77841&r2=77842&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp Sat Aug 1 19:34:36 2009
@@ -532,14 +532,14 @@
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;
Modified: llvm/trunk/lib/Target/ARM/ARMISelLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMISelLowering.cpp?rev=77842&r1=77841&r2=77842&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/ARMISelLowering.cpp (original)
+++ llvm/trunk/lib/Target/ARM/ARMISelLowering.cpp Sat Aug 1 19:34:36 2009
@@ -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 @@
static TargetLoweringObjectFile *createTLOF(TargetMachine &TM) {
if (TM.getSubtarget<ARMSubtarget>().isTargetDarwin())
return new TargetLoweringObjectFileMachO();
- return new TargetLoweringObjectFileELF(true);
+ return new ARMElfTargetObjectFile();
}
ARMTargetLowering::ARMTargetLowering(TargetMachine &TM)
Modified: llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.cpp?rev=77842&r1=77841&r2=77842&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.cpp Sat Aug 1 19:34:36 2009
@@ -78,13 +78,6 @@
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;
}
Added: llvm/trunk/lib/Target/ARM/ARMTargetObjectFile.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMTargetObjectFile.h?rev=77842&view=auto
==============================================================================
--- llvm/trunk/lib/Target/ARM/ARMTargetObjectFile.h (added)
+++ llvm/trunk/lib/Target/ARM/ARMTargetObjectFile.h Sat Aug 1 19:34:36 2009
@@ -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
Modified: llvm/trunk/lib/Target/COFFTargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/COFFTargetAsmInfo.cpp?rev=77842&r1=77841&r2=77842&view=diff
==============================================================================
--- llvm/trunk/lib/Target/COFFTargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/COFFTargetAsmInfo.cpp Sat Aug 1 19:34:36 2009
@@ -24,8 +24,6 @@
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";
Modified: llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp?rev=77842&r1=77841&r2=77842&view=diff
==============================================================================
--- llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp Sat Aug 1 19:34:36 2009
@@ -48,15 +48,6 @@
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.
Modified: llvm/trunk/lib/Target/TargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/TargetAsmInfo.cpp?rev=77842&r1=77841&r2=77842&view=diff
==============================================================================
--- llvm/trunk/lib/Target/TargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/TargetAsmInfo.cpp Sat Aug 1 19:34:36 2009
@@ -70,9 +70,6 @@
DataSectionStartSuffix = "";
SectionEndDirectiveSuffix = 0;
JumpTableDirective = 0;
- // FIXME: Flags are ELFish - replace with normal section stuff.
- StaticCtorsSection = "\t.section .ctors,\"aw\", at progbits";
- StaticDtorsSection = "\t.section .dtors,\"aw\", at progbits";
GlobalDirective = "\t.globl\t";
SetDirective = 0;
LCOMMDirective = 0;
Modified: llvm/trunk/lib/Target/TargetLoweringObjectFile.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/TargetLoweringObjectFile.cpp?rev=77842&r1=77841&r2=77842&view=diff
==============================================================================
--- llvm/trunk/lib/Target/TargetLoweringObjectFile.cpp (original)
+++ llvm/trunk/lib/Target/TargetLoweringObjectFile.cpp Sat Aug 1 19:34:36 2009
@@ -34,6 +34,8 @@
DataSection = 0;
BSSSection = 0;
ReadOnlySection = 0;
+ StaticCtorSection = 0;
+ StaticDtorSection = 0;
}
TargetLoweringObjectFile::~TargetLoweringObjectFile() {
@@ -295,6 +297,11 @@
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 @@
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 @@
SectionKind::getText());
DataSection = getOrCreateSection("\t.data", true,
SectionKind::getDataRel());
+ StaticCtorSection =
+ getOrCreateSection(".ctors", false, SectionKind::getDataRel());
+ StaticDtorSection =
+ getOrCreateSection(".dtors", false, SectionKind::getDataRel());
}
void TargetLoweringObjectFileCOFF::
More information about the llvm-commits
mailing list