<div dir="ltr">Thanks!<div><br></div></div><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Mar 21, 2016 at 3:57 PM, 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: Mon Mar 21 09:57:20 2016<br>
New Revision: 263944<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=263944&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=263944&view=rev</a><br>
Log:<br>
Revert "[ELF] SHF_MERGE section with 0 entsize is not fatal"<br>
<br>
This reverts commit r263664.<br>
<br>
The reason we were getting broken files was lld -r, and that has been<br>
fixed.<br>
<br>
Added:<br>
    lld/trunk/test/ELF/Inputs/invalid-shentsize-zero.elf<br>
      - copied, changed from r263933, lld/trunk/test/ELF/Inputs/merge-shentsize-zero.elf<br>
Removed:<br>
    lld/trunk/test/ELF/Inputs/merge-shentsize-zero.elf<br>
    lld/trunk/test/ELF/merge-zero-size.test<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=263944&r1=263943&r2=263944&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/InputFiles.cpp?rev=263944&r1=263943&r2=263944&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/ELF/InputFiles.cpp (original)<br>
+++ lld/trunk/ELF/InputFiles.cpp Mon Mar 21 09:57:20 2016<br>
@@ -148,9 +148,7 @@ 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)<br>
-    return false;<br>
-  if (Sec.sh_size % EntSize)<br>
+  if (!EntSize || 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>
Copied: lld/trunk/test/ELF/Inputs/invalid-shentsize-zero.elf (from r263933, lld/trunk/test/ELF/Inputs/merge-shentsize-zero.elf)<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/Inputs/invalid-shentsize-zero.elf?p2=lld/trunk/test/ELF/Inputs/invalid-shentsize-zero.elf&p1=lld/trunk/test/ELF/Inputs/merge-shentsize-zero.elf&r1=263933&r2=263944&rev=263944&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/Inputs/invalid-shentsize-zero.elf?p2=lld/trunk/test/ELF/Inputs/invalid-shentsize-zero.elf&p1=lld/trunk/test/ELF/Inputs/merge-shentsize-zero.elf&r1=263933&r2=263944&rev=263944&view=diff</a><br>
==============================================================================<br>
Binary files - no diff available.<br>
<br>
Removed: lld/trunk/test/ELF/Inputs/merge-shentsize-zero.elf<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/Inputs/merge-shentsize-zero.elf?rev=263943&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/Inputs/merge-shentsize-zero.elf?rev=263943&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=263944&r1=263943&r2=263944&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/invalid-elf.test?rev=263944&r1=263943&r2=263944&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/test/ELF/invalid-elf.test (original)<br>
+++ lld/trunk/test/ELF/invalid-elf.test Mon Mar 21 09:57:20 2016<br>
@@ -24,6 +24,10 @@<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>
Removed: 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=263943&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/merge-zero-size.test?rev=263943&view=auto</a><br>
==============================================================================<br>
--- lld/trunk/test/ELF/merge-zero-size.test (original)<br>
+++ lld/trunk/test/ELF/merge-zero-size.test (removed)<br>
@@ -1,4 +0,0 @@<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>
</blockquote></div><br></div>