6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-04-15 13:40:33 +00:00
Code Issues Projects Releases Wiki Activity

Do not propagate ELF-specific stuff (data.rel) into other targets. This simplifies code and also ensures correctness.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@68032 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Anton Korobeynikov 2009-03-30 15:27:43 +00:00
parent 71a7c6cde0
commit fca82deecb
5 changed files with 37 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/llvm/Target/ELFTargetAsmInfo.h
View File

@ -25,6 +25,7 @@ namespace llvm {
struct ELFTargetAsmInfo: public TargetAsmInfo {
explicit ELFTargetAsmInfo(const TargetMachine &TM);
SectionKind::Kind SectionKindForGlobal(const GlobalValue *GV) const;
virtual const Section* SelectSectionForGlobal(const GlobalValue *GV) const;
virtual std::string printSectionFlags(unsigned flags) const;
const Section* MergeableConstSection(const GlobalVariable *GV) const;

3
lib/Target/DarwinTargetAsmInfo.cpp
View File

@ -85,9 +85,6 @@ DarwinTargetAsmInfo::SelectSectionForGlobal(const GlobalValue *GV) const {
else
return TextSection;
case SectionKind::Data:
case SectionKind::DataRel:
case SectionKind::DataRelRO:
case SectionKind::DataRelROLocal:
case SectionKind::ThreadData:
case SectionKind::BSS:
case SectionKind::ThreadBSS:

24
lib/Target/ELFTargetAsmInfo.cpp
View File

@ -44,6 +44,30 @@ ELFTargetAsmInfo::ELFTargetAsmInfo(const TargetMachine &TM)
SectionFlags::Writeable);
}
SectionKind::Kind
ELFTargetAsmInfo::SectionKindForGlobal(const GlobalValue *GV) const {
SectionKind::Kind Kind = TargetAsmInfo::SectionKindForGlobal(GV);
if (Kind != SectionKind::Data)
return Kind;
// Decide, whether we need data.rel stuff
const GlobalVariable* GVar = dyn_cast<GlobalVariable>(GV);
if (GVar->hasInitializer()) {
Constant *C = GVar->getInitializer();
bool isConstant = GVar->isConstant();
unsigned Reloc = RelocBehaviour();
if (Reloc != Reloc::None && C->ContainsRelocations(Reloc))
return (C->ContainsRelocations(Reloc::Local) ?
(isConstant ?
SectionKind::DataRelROLocal : SectionKind::DataRelLocal) :
(isConstant ?
SectionKind::DataRelRO : SectionKind::DataRel));
}
return Kind;
}
const Section*
ELFTargetAsmInfo::SelectSectionForGlobal(const GlobalValue *GV) const {
SectionKind::Kind Kind = SectionKindForGlobal(GV);

27
lib/Target/TargetAsmInfo.cpp
View File

@ -220,18 +220,14 @@ TargetAsmInfo::SectionKindForGlobal(const GlobalValue *GV) const {
unsigned Reloc = RelocBehaviour();
// We already did a query for 'all' relocs, thus - early exits.
if (Reloc == Reloc::LocalOrGlobal) {
return (C->ContainsRelocations(Reloc::Local) ?
SectionKind::DataRelROLocal : SectionKind::DataRelRO);
} else if (Reloc == Reloc::None)
if (Reloc == Reloc::LocalOrGlobal)
return SectionKind::Data;
else if (Reloc == Reloc::None)
return SectionKind::ROData;
else {
// Ok, target wants something funny. Honour it.
if (C->ContainsRelocations(Reloc)) {
return (Reloc == Reloc::Local ?
SectionKind::DataRelROLocal : SectionKind::DataRelRO);
} else
return SectionKind::ROData;
return (C->ContainsRelocations(Reloc) ?
SectionKind::Data : SectionKind::ROData);
}
} else {
// Check, if initializer is a null-terminated string
@ -243,18 +239,7 @@ TargetAsmInfo::SectionKindForGlobal(const GlobalValue *GV) const {
}
// Variable either is not constant or thread-local - output to data section.
if (isThreadLocal)
return SectionKind::ThreadData;
if (GVar->hasInitializer()) {
Constant *C = GVar->getInitializer();
unsigned Reloc = RelocBehaviour();
if (Reloc != Reloc::None && C->ContainsRelocations(Reloc))
return (C->ContainsRelocations(Reloc::Local) ?
SectionKind::DataRelLocal : SectionKind::DataRel);
}
return SectionKind::Data;
return (isThreadLocal ? SectionKind::ThreadData : SectionKind::Data);
}
unsigned

7
lib/Target/X86/X86TargetAsmInfo.cpp
View File

@ -305,12 +305,17 @@ X86COFFTargetAsmInfo::UniqueSectionForGlobal(const GlobalValue* GV,
switch (kind) {
case SectionKind::Text:
return ".text$linkonce" + GV->getName();
case SectionKind::Data:
case SectionKind::BSS:
case SectionKind::ThreadData:
case SectionKind::ThreadBSS:
return ".data$linkonce" + GV->getName();
case SectionKind::ROData:
case SectionKind::RODataMergeConst:
case SectionKind::RODataMergeStr:
return ".rdata$linkonce" + GV->getName();
default:
return ".data$linkonce" + GV->getName();
assert(0 && "Unknown section kind");
}
return NULL;
}