<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Mar 16, 2016 at 6:27 PM, Rafael Espíndola <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:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">BTW, how are these files being produced in freebsd?<br></blockquote><div><br></div><div>+1</div><div><br></div><div>In <span style="font-size:12.8px">r259831 I made sure to give a very clear explanation of where the "bogus" files were coming from. It would be nice if we keep up this practice when adding workarounds for files that we previously considered invalid.</span></div><div><span style="font-size:12.8px"><br></span></div><div><span style="font-size:12.8px">-- Sean Silva</span></div><div><br></div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">
<br>
Cheers,<br>
Rafael<br>
<br>
<br>
On 16 March 2016 at 14:12, Ed Maste via llvm-commits<br>
<div class=""><div class="h5"><<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a>> wrote:<br>
> Author: emaste<br>
> Date: Wed Mar 16 16:12:53 2016<br>
> New Revision: 263664<br>
><br>
> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=263664&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=263664&view=rev</a><br>
> Log:<br>
> [ELF] SHF_MERGE section with 0 entsize is not fatal<br>
><br>
> For now just treat such sections as non-mergeable.<br>
><br>
> Resubmit r263660 with test fix.<br>
><br>
> Differential Revision:     <a href="http://reviews.llvm.org/D18225" rel="noreferrer" target="_blank">http://reviews.llvm.org/D18225</a><br>
><br>
> Added:<br>
>     lld/trunk/test/ELF/Inputs/merge-shentsize-zero.elf<br>
>       - copied unchanged from r263660, lld/trunk/test/ELF/Inputs/invalid-shentsize-zero.elf<br>
>     lld/trunk/test/ELF/merge-zero-size.test<br>
> Removed:<br>
>     lld/trunk/test/ELF/Inputs/invalid-shentsize-zero.elf<br>
> Modified:<br>
>     lld/trunk/ELF/InputFiles.cpp<br>
>     lld/trunk/test/ELF/invalid-elf.test<br>
><br>
> Modified: lld/trunk/ELF/InputFiles.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/InputFiles.cpp?rev=263664&r1=263663&r2=263664&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/InputFiles.cpp?rev=263664&r1=263663&r2=263664&view=diff</a><br>
> ==============================================================================<br>
> --- lld/trunk/ELF/InputFiles.cpp (original)<br>
> +++ lld/trunk/ELF/InputFiles.cpp Wed Mar 16 16:12:53 2016<br>
> @@ -148,7 +148,9 @@ template <class ELFT> static bool should<br>
>    if (Flags & SHF_WRITE)<br>
>      fatal("writable SHF_MERGE sections are not supported");<br>
>    uintX_t EntSize = Sec.sh_entsize;<br>
> -  if (!EntSize || Sec.sh_size % EntSize)<br>
> +  if (!EntSize)<br>
> +    return false;<br>
> +  if (Sec.sh_size % EntSize)<br>
>      fatal("SHF_MERGE section size must be a multiple of sh_entsize");<br>
><br>
>    // Don't try to merge if the aligment is larger than the sh_entsize and this<br>
><br>
> Removed: lld/trunk/test/ELF/Inputs/invalid-shentsize-zero.elf<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/Inputs/invalid-shentsize-zero.elf?rev=263663&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/Inputs/invalid-shentsize-zero.elf?rev=263663&view=auto</a><br>
> ==============================================================================<br>
> Binary file - no diff available.<br>
><br>
> Modified: lld/trunk/test/ELF/invalid-elf.test<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/invalid-elf.test?rev=263664&r1=263663&r2=263664&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/invalid-elf.test?rev=263664&r1=263663&r2=263664&view=diff</a><br>
> ==============================================================================<br>
> --- lld/trunk/test/ELF/invalid-elf.test (original)<br>
> +++ lld/trunk/test/ELF/invalid-elf.test Wed Mar 16 16:12:53 2016<br>
> @@ -24,10 +24,6 @@<br>
>  # RUN:   FileCheck --check-prefix=INVALID-SECTION-INDEX %s<br>
>  # INVALID-SECTION-INDEX: Invalid section index<br>
><br>
> -# RUN: not ld.lld %p/Inputs/invalid-shentsize-zero.elf -o %t2 2>&1 | \<br>
> -# RUN:   FileCheck --check-prefix=INVALID-SHENTSIZE-ZERO %s<br>
> -# INVALID-SHENTSIZE-ZERO: SHF_MERGE section size must be a multiple of sh_entsize<br>
> -<br>
>  # RUN: not ld.lld %p/Inputs/invalid-multiple-eh-relocs.elf -o %t2 2>&1 | \<br>
>  # RUN:   FileCheck --check-prefix=INVALID-EH-RELOCS %s<br>
>  # INVALID-EH-RELOCS: multiple relocation sections to .eh_frame are not supported<br>
><br>
> Added: lld/trunk/test/ELF/merge-zero-size.test<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/merge-zero-size.test?rev=263664&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/merge-zero-size.test?rev=263664&view=auto</a><br>
> ==============================================================================<br>
> --- lld/trunk/test/ELF/merge-zero-size.test (added)<br>
> +++ lld/trunk/test/ELF/merge-zero-size.test Wed Mar 16 16:12:53 2016<br>
> @@ -0,0 +1,4 @@<br>
> +# RUN: ld.lld %p/Inputs/merge-shentsize-zero.elf -o %t2 2>&1 | \<br>
> +# RUN:   FileCheck -allow-empty %s<br>
> +# CHECK-NOT: SHF_MERGE section size must be a multiple of sh_entsize<br>
> +<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>
_______________________________________________<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>
</div></div></blockquote></div><br></div></div>