wangtao
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ELF] - Remove unnecessary template #3. NFC. 

llvm-svn: 297719
This commit is contained in:
George Rimar 2017-03-14 09:25:03 +00:00
parent f08b592390
commit 09268b7b1e
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lld/ELF/OutputSections.cpp
View File

@ -253,7 +253,6 @@ static uint64_t getOutFlags(InputSectionBase *S) {
return S->Flags & ~SHF_GROUP & ~SHF_COMPRESSED; return S->Flags & ~SHF_GROUP & ~SHF_COMPRESSED;
} }
template <class ELFT>
static SectionKey createKey(InputSectionBase *C, StringRef OutsecName) { static SectionKey createKey(InputSectionBase *C, StringRef OutsecName) {
// The ELF spec just says // The ELF spec just says
// ---------------------------------------------------------------- // ----------------------------------------------------------------
@ -298,12 +297,10 @@ static SectionKey createKey(InputSectionBase *C, StringRef OutsecName) {
// Given the above issues, we instead merge sections by name and error on // Given the above issues, we instead merge sections by name and error on
// incompatible types and flags. // incompatible types and flags.
typedef typename ELFT::uint uintX_t;
uint32_t Alignment = 0; uint32_t Alignment = 0;
uintX_t Flags = 0; uint64_t Flags = 0;
if (Config->Relocatable && (C->Flags & SHF_MERGE)) { if (Config->Relocatable && (C->Flags & SHF_MERGE)) {
Alignment = std::max<uintX_t>(C->Alignment, C->Entsize); Alignment = std::max<uint64_t>(C->Alignment, C->Entsize);
Flags = C->Flags & (SHF_MERGE | SHF_STRINGS); Flags = C->Flags & (SHF_MERGE | SHF_STRINGS);
} }
@ -345,7 +342,7 @@ void OutputSectionFactory::addInputSec(InputSectionBase *IS,
return; return;
} }
SectionKey Key = createKey<ELFT>(IS, OutsecName); SectionKey Key = createKey(IS, OutsecName);
uint64_t Flags = getOutFlags(IS); uint64_t Flags = getOutFlags(IS);
OutputSection *&Sec = Map[Key]; OutputSection *&Sec = Map[Key];
if (Sec) { if (Sec) {