mirror of
https://github.com/RPCS3/llvm.git
synced 2024-12-30 08:24:12 +00:00
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
This commit is contained in:
parent
f9f1adbcbb
commit
80ec2792b2
@ -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;
|
||||
}
|
||||
|
@ -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)
|
||||
|
@ -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;
|
||||
|
@ -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)
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
|
38
lib/Target/ARM/ARMTargetObjectFile.h
Normal file
38
lib/Target/ARM/ARMTargetObjectFile.h
Normal file
@ -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
|
@ -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";
|
||||
|
@ -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.
|
||||
|
@ -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;
|
||||
|
@ -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::
|
||||
|
Loading…
Reference in New Issue
Block a user