<div dir="ltr">Thanks. I like the new name PhdrEntry.</div><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Jul 19, 2016 at 7:33 AM, Rafael Espindola via llvm-commits <span dir="ltr"><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: rafael<br>
Date: Tue Jul 19 07:33:46 2016<br>
New Revision: 275972<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=275972&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=275972&view=rev</a><br>
Log:<br>
Fix build with gcc 6.<br>
<br>
Modified:<br>
    lld/trunk/ELF/LinkerScript.cpp<br>
    lld/trunk/ELF/LinkerScript.h<br>
    lld/trunk/ELF/Writer.cpp<br>
    lld/trunk/ELF/Writer.h<br>
<br>
Modified: lld/trunk/ELF/LinkerScript.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/LinkerScript.cpp?rev=275972&r1=275971&r2=275972&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/LinkerScript.cpp?rev=275972&r1=275971&r2=275972&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/ELF/LinkerScript.cpp (original)<br>
+++ lld/trunk/ELF/LinkerScript.cpp Tue Jul 19 07:33:46 2016<br>
@@ -275,7 +275,7 @@ void LinkerScript<ELFT>::assignAddresses<br>
 }<br>
<br>
 template <class ELFT><br>
-std::vector<Phdr<ELFT>><br>
+std::vector<PhdrEntry<ELFT>><br>
 LinkerScript<ELFT>::createPhdrs(ArrayRef<OutputSectionBase<ELFT> *> Sections) {<br>
   int TlsNum = -1;<br>
   int NoteNum = -1;<br>
<br>
Modified: lld/trunk/ELF/LinkerScript.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/LinkerScript.h?rev=275972&r1=275971&r2=275972&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/LinkerScript.h?rev=275972&r1=275971&r2=275972&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/ELF/LinkerScript.h (original)<br>
+++ lld/trunk/ELF/LinkerScript.h Tue Jul 19 07:33:46 2016<br>
@@ -87,7 +87,7 @@ template <class ELFT> class LinkerScript<br>
   typedef typename ELFT::uint uintX_t;<br>
<br>
 public:<br>
-  typedef Phdr<ELFT> Phdr;<br>
+  typedef PhdrEntry<ELFT> Phdr;<br>
<br>
   StringRef getOutputSection(InputSectionBase<ELFT> *S);<br>
   ArrayRef<uint8_t> getFiller(StringRef Name);<br>
<br>
Modified: lld/trunk/ELF/Writer.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Writer.cpp?rev=275972&r1=275971&r2=275972&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Writer.cpp?rev=275972&r1=275971&r2=275972&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/ELF/Writer.cpp (original)<br>
+++ lld/trunk/ELF/Writer.cpp Tue Jul 19 07:33:46 2016<br>
@@ -44,7 +44,7 @@ public:<br>
   void run();<br>
<br>
 private:<br>
-  typedef Phdr<ELFT> Phdr;<br>
+  typedef PhdrEntry<ELFT> Phdr;<br>
<br>
   void copyLocalSymbols();<br>
   void addReservedSymbols();<br>
@@ -479,13 +479,13 @@ template <class ELFT> bool elf::isOutput<br>
<br>
 // Program header entry<br>
 template<class ELFT><br>
-Phdr<ELFT>::Phdr(unsigned Type, unsigned Flags) {<br>
+PhdrEntry<ELFT>::PhdrEntry(unsigned Type, unsigned Flags) {<br>
   H.p_type = Type;<br>
   H.p_flags = Flags;<br>
 }<br>
<br>
 template<class ELFT><br>
-void Phdr<ELFT>::AddSec(OutputSectionBase<ELFT> *Sec) {<br>
+void PhdrEntry<ELFT>::AddSec(OutputSectionBase<ELFT> *Sec) {<br>
   Last = Sec;<br>
   if (!First)<br>
     First = Sec;<br>
@@ -1285,10 +1285,10 @@ template void elf::writeResult<ELF32BE>(<br>
 template void elf::writeResult<ELF64LE>(SymbolTable<ELF64LE> *Symtab);<br>
 template void elf::writeResult<ELF64BE>(SymbolTable<ELF64BE> *Symtab);<br>
<br>
-template struct elf::Phdr<ELF32LE>;<br>
-template struct elf::Phdr<ELF32BE>;<br>
-template struct elf::Phdr<ELF64LE>;<br>
-template struct elf::Phdr<ELF64BE>;<br>
+template struct elf::PhdrEntry<ELF32LE>;<br>
+template struct elf::PhdrEntry<ELF32BE>;<br>
+template struct elf::PhdrEntry<ELF64LE>;<br>
+template struct elf::PhdrEntry<ELF64BE>;<br>
<br>
 template bool elf::needsInterpSection<ELF32LE>();<br>
 template bool elf::needsInterpSection<ELF32BE>();<br>
<br>
Modified: lld/trunk/ELF/Writer.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Writer.h?rev=275972&r1=275971&r2=275972&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Writer.h?rev=275972&r1=275971&r2=275972&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/ELF/Writer.h (original)<br>
+++ lld/trunk/ELF/Writer.h Tue Jul 19 07:33:46 2016<br>
@@ -35,8 +35,8 @@ uint32_t toPhdrFlags(uint64_t Flags);<br>
 // Each contains type, access flags and range of output sections that will be<br>
 // placed in it.<br>
 template<class ELFT><br>
-struct Phdr {<br>
-  Phdr(unsigned Type, unsigned Flags);<br>
+struct PhdrEntry {<br>
+  PhdrEntry(unsigned Type, unsigned Flags);<br>
   void AddSec(OutputSectionBase<ELFT> *Sec);<br>
<br>
   typename ELFT::Phdr H = {};<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>