6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-02-22 13:29:44 +00:00
Code Issues Projects Releases Wiki Activity

Revert "COFF: Let globals with private linkage reside in their own section"

Browse Source 
This reverts commit r232539.  This was committed accidently.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@232543 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
David Majnemer 2015-03-17 20:41:11 +00:00
parent e3154fb22d
commit 76d3a99d10
6 changed files with 3 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/llvm/CodeGen/TargetLoweringObjectFileImpl.h
View File

@ -147,10 +147,6 @@ public:
SectionKind Kind, Mangler &Mang, SectionKind Kind, Mangler &Mang,
const TargetMachine &TM) const override; const TargetMachine &TM) const override;
void getNameWithPrefix(SmallVectorImpl<char> &OutName, const GlobalValue *GV,
bool CannotUsePrivateLabel, Mangler &Mang,
const TargetMachine &TM) const override;
const MCSection * const MCSection *
getSectionForJumpTable(const Function &F, Mangler &Mang, getSectionForJumpTable(const Function &F, Mangler &Mang,
const TargetMachine &TM) const override; const TargetMachine &TM) const override;

5
include/llvm/Target/TargetLoweringObjectFile.h
View File

@ -101,11 +101,6 @@ public:
return SectionForGlobal(GV, getKindForGlobal(GV, TM), Mang, TM); return SectionForGlobal(GV, getKindForGlobal(GV, TM), Mang, TM);
} }
virtual void getNameWithPrefix(SmallVectorImpl<char> &OutName,
const GlobalValue *GV,
bool CannotUsePrivateLabel, Mangler &Mang,
const TargetMachine &TM) const;
virtual const MCSection * virtual const MCSection *
getSectionForJumpTable(const Function &F, Mangler &Mang, getSectionForJumpTable(const Function &F, Mangler &Mang,
const TargetMachine &TM) const; const TargetMachine &TM) const;

24
lib/CodeGen/TargetLoweringObjectFileImpl.cpp
View File

@ -927,11 +927,6 @@ SelectSectionForGlobal(const GlobalValue *GV, SectionKind Kind,
StringRef COMDATSymName = Sym->getName(); StringRef COMDATSymName = Sym->getName();
return getContext().getCOFFSection(Name, Characteristics, Kind, return getContext().getCOFFSection(Name, Characteristics, Kind,
COMDATSymName, Selection); COMDATSymName, Selection);
} else {
SmallString<256> TmpData;
getNameWithPrefix(TmpData, GV, true, Mang, TM);
return getContext().getCOFFSection(Name, Characteristics, Kind, TmpData,
Selection);
} }
} }
@ -953,25 +948,6 @@ SelectSectionForGlobal(const GlobalValue *GV, SectionKind Kind,
return DataSection; return DataSection;
} }
void TargetLoweringObjectFileCOFF::getNameWithPrefix(
SmallVectorImpl<char> &OutName, const GlobalValue *GV,
bool CannotUsePrivateLabel, Mangler &Mang, const TargetMachine &TM) const {
if (GV->hasPrivateLinkage() &&
((isa<Function>(GV) && TM.getFunctionSections()) ||
(isa<GlobalVariable>(GV) && TM.getDataSections()))) {
SmallString<256> Tmp;
Mang.getNameWithPrefix(Tmp, GV, /*CannotUsePrivateLabel=*/false);
if (Tmp.startswith(".L"))
OutName.append(Tmp.begin() + 2, Tmp.end());
else if (Tmp.startswith("L"))
OutName.append(Tmp.begin() + 1, Tmp.end());
else
OutName.append(Tmp.begin(), Tmp.end());
return;
}
Mang.getNameWithPrefix(OutName, GV, CannotUsePrivateLabel);
}
const MCSection *TargetLoweringObjectFileCOFF::getSectionForJumpTable( const MCSection *TargetLoweringObjectFileCOFF::getSectionForJumpTable(
const Function &F, Mangler &Mang, const TargetMachine &TM) const { const Function &F, Mangler &Mang, const TargetMachine &TM) const {
// If the function can be removed, produce a unique section so that // If the function can be removed, produce a unique section so that

6
lib/Target/TargetLoweringObjectFile.cpp
View File

@ -343,9 +343,3 @@ const MCExpr *TargetLoweringObjectFile::getDebugThreadLocalSymbol(const MCSymbol
// null return could mean 'no location' & we should just do that here. // null return could mean 'no location' & we should just do that here.
return MCSymbolRefExpr::Create(Sym, *Ctx); return MCSymbolRefExpr::Create(Sym, *Ctx);
} }
void TargetLoweringObjectFile::getNameWithPrefix(
SmallVectorImpl<char> &OutName, const GlobalValue *GV,
bool CannotUsePrivateLabel, Mangler &Mang, const TargetMachine &TM) const {
Mang.getNameWithPrefix(OutName, GV, CannotUsePrivateLabel);
}

2
lib/Target/TargetMachine.cpp
View File

@ -175,7 +175,7 @@ void TargetMachine::getNameWithPrefix(SmallVectorImpl<char> &Name,
const TargetLoweringObjectFile *TLOF = getObjFileLowering(); const TargetLoweringObjectFile *TLOF = getObjFileLowering();
const MCSection *TheSection = TLOF->SectionForGlobal(GV, GVKind, Mang, *this); const MCSection *TheSection = TLOF->SectionForGlobal(GV, GVKind, Mang, *this);
bool CannotUsePrivateLabel = !canUsePrivateLabel(*AsmInfo, *TheSection); bool CannotUsePrivateLabel = !canUsePrivateLabel(*AsmInfo, *TheSection);
TLOF->getNameWithPrefix(Name, GV, CannotUsePrivateLabel, Mang, *this); Mang.getNameWithPrefix(Name, GV, CannotUsePrivateLabel);
} }
MCSymbol *TargetMachine::getSymbol(const GlobalValue *GV, Mangler &Mang) const { MCSymbol *TargetMachine::getSymbol(const GlobalValue *GV, Mangler &Mang) const {

4
test/CodeGen/X86/global-sections.ll
View File

@ -275,8 +275,8 @@ bb7:
; LINUX-SECTIONS: .asciz "foo" ; LINUX-SECTIONS: .asciz "foo"
; LINUX-SECTIONS: .size .LG14, 4 ; LINUX-SECTIONS: .size .LG14, 4
; WIN32-SECTIONS: .section .rdata,"dr",one_only,_G14 ; WIN32-SECTIONS: .section .rdata,"dr"
; WIN32-SECTIONS: _G14: ; WIN32-SECTIONS: L_G14:
; WIN32-SECTIONS: .asciz "foo" ; WIN32-SECTIONS: .asciz "foo"
; cannot be merged on MachO, but can on other formats. ; cannot be merged on MachO, but can on other formats.