commit 74df5c7eeb444b8a392939ea9302dc16b2d01c0e
author Rafael Espindola <rafael.espindola@gmail.com> Tue Jul 19 12:33:46 2016 +0000
committer Rafael Espindola <rafael.espindola@gmail.com> Tue Jul 19 12:33:46 2016 +0000
tree 5925f3575e98f2cebf27bd968c98afd661b0f530
parent 766345e3312b71b3c33deb6747705810ecfd0d17

Fix build with gcc 6.

llvm-svn: 275972

lld/ELF/Writer.cpp

diff --git a/lld/ELF/Writer.cpp b/lld/ELF/Writer.cpp
index 784e182..0c6bd0d 100644
--- a/lld/ELF/Writer.cpp
+++ b/lld/ELF/Writer.cpp
@@ -44,7 +44,7 @@
   void run();
 
 private:
-  typedef Phdr<ELFT> Phdr;
+  typedef PhdrEntry<ELFT> Phdr;
 
   void copyLocalSymbols();
   void addReservedSymbols();
@@ -479,13 +479,13 @@
 
 // Program header entry
 template<class ELFT>
-Phdr<ELFT>::Phdr(unsigned Type, unsigned Flags) {
+PhdrEntry<ELFT>::PhdrEntry(unsigned Type, unsigned Flags) {
   H.p_type = Type;
   H.p_flags = Flags;
 }
 
 template<class ELFT>
-void Phdr<ELFT>::AddSec(OutputSectionBase<ELFT> *Sec) {
+void PhdrEntry<ELFT>::AddSec(OutputSectionBase<ELFT> *Sec) {
   Last = Sec;
   if (!First)
     First = Sec;
@@ -1285,10 +1285,10 @@
 template void elf::writeResult<ELF64LE>(SymbolTable<ELF64LE> *Symtab);
 template void elf::writeResult<ELF64BE>(SymbolTable<ELF64BE> *Symtab);
 
-template struct elf::Phdr<ELF32LE>;
-template struct elf::Phdr<ELF32BE>;
-template struct elf::Phdr<ELF64LE>;
-template struct elf::Phdr<ELF64BE>;
+template struct elf::PhdrEntry<ELF32LE>;
+template struct elf::PhdrEntry<ELF32BE>;
+template struct elf::PhdrEntry<ELF64LE>;
+template struct elf::PhdrEntry<ELF64BE>;
 
 template bool elf::needsInterpSection<ELF32LE>();
 template bool elf::needsInterpSection<ELF32BE>();