[lld] r362755 - Revert [ELF] Simplify the condition to create .interp

[Jordan Rupprecht via llvm-commits]

Author: rupprecht
Date: Thu Jun  6 16:23:14 2019
New Revision: 362755

URL: http://llvm.org/viewvc/llvm-project?rev=362755&view=rev
Log:
Revert [ELF] Simplify the condition to create .interp

This reverts r362355 (git commit c78c999a9cd7a77b9d13c610c9faebac5d560a55)

This causes some internal tests to fail; details provided offthread.

Modified:
    lld/trunk/ELF/Writer.cpp
    lld/trunk/test/ELF/dynamic-linker.s

Modified: lld/trunk/ELF/Writer.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Writer.cpp?rev=362755&r1=362754&r2=362755&view=diff
==============================================================================
--- lld/trunk/ELF/Writer.cpp (original)
+++ lld/trunk/ELF/Writer.cpp Thu Jun  6 16:23:14 2019
@@ -138,7 +138,8 @@ StringRef elf::getOutputSectionName(cons
 }
 
 static bool needsInterpSection() {
-  return !Config->DynamicLinker.empty() && Script->needsInterpSection();
+  return !SharedFiles.empty() && !Config->DynamicLinker.empty() &&
+         Script->needsInterpSection();
 }
 
 template <class ELFT> void elf::writeResult() { Writer<ELFT>().run(); }

Modified: lld/trunk/test/ELF/dynamic-linker.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/dynamic-linker.s?rev=362755&r1=362754&r2=362755&view=diff
==============================================================================
--- lld/trunk/test/ELF/dynamic-linker.s (original)
+++ lld/trunk/test/ELF/dynamic-linker.s Thu Jun  6 16:23:14 2019
@@ -1,19 +1,21 @@
 # REQUIRES: x86
+# RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/shared.s -o %t1.o
+# RUN: ld.lld -shared %t1.o -o %t.so
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 
-# RUN: ld.lld --dynamic-linker foo %t.o -o %t
-# RUN: llvm-readelf --program-headers %t | FileCheck %s
+# RUN: ld.lld --dynamic-linker foo %t.o %t.so -o %t
+# RUN: llvm-readelf -program-headers %t | FileCheck %s
 
-# RUN: ld.lld --dynamic-linker=foo %t.o -o %t
-# RUN: llvm-readelf --program-headers %t | FileCheck %s
+# RUN: ld.lld --dynamic-linker=foo %t.o %t.so -o %t
+# RUN: llvm-readelf -program-headers %t | FileCheck %s
 
 # CHECK: [Requesting program interpreter: foo]
 
-# RUN: ld.lld %t.o -o %t
+# RUN: ld.lld %t.o %t.so -o %t
 # RUN: llvm-readelf -program-headers %t | FileCheck --check-prefix=NO %s
 
-# RUN: ld.lld --dynamic-linker foo --no-dynamic-linker %t.o -o %t
-# RUN: llvm-readelf --program-headers %t | FileCheck --check-prefix=NO %s
+# RUN: ld.lld --dynamic-linker foo --no-dynamic-linker %t.o %t.so -o %t
+# RUN: llvm-readelf -program-headers %t | FileCheck --check-prefix=NO %s
 
 # NO-NOT: PT_INTERP