[lld] r263661 - Revert r263660 as one of the tests is broken.

[Ed Maste via llvm-commits]

Author: emaste
Date: Wed Mar 16 15:42:27 2016
New Revision: 263661

URL: http://llvm.org/viewvc/llvm-project?rev=263661&view=rev
Log:
Revert r263660 as one of the tests is broken.


Modified:
    lld/trunk/ELF/InputFiles.cpp

Modified: lld/trunk/ELF/InputFiles.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/InputFiles.cpp?rev=263661&r1=263660&r2=263661&view=diff
==============================================================================
--- lld/trunk/ELF/InputFiles.cpp (original)
+++ lld/trunk/ELF/InputFiles.cpp Wed Mar 16 15:42:27 2016
@@ -148,9 +148,7 @@ template <class ELFT> static bool should
   if (Flags & SHF_WRITE)
     fatal("writable SHF_MERGE sections are not supported");
   uintX_t EntSize = Sec.sh_entsize;
-  if (!EntSize)
-    return false;
-  if (Sec.sh_size % EntSize)
+  if (!EntSize || Sec.sh_size % EntSize)
     fatal("SHF_MERGE section size must be a multiple of sh_entsize");
 
   // Don't try to merge if the aligment is larger than the sh_entsize and this