[lld] r287907 - Merging r280990:

[Tom Stellard via llvm-commits]

Author: tstellar
Date: Thu Nov 24 19:57:00 2016
New Revision: 287907

URL: http://llvm.org/viewvc/llvm-project?rev=287907&view=rev
Log:
Merging r280990:

------------------------------------------------------------------------
r280990 | davide | 2016-09-08 14:18:38 -0700 (Thu, 08 Sep 2016) | 4 lines

[ELF] Fix DT_NEEDED value.

Differential Revision: https://reviews.llvm.org/D24363

------------------------------------------------------------------------

Modified:
    lld/branches/release_39/ELF/InputFiles.cpp
    lld/branches/release_39/test/ELF/as-needed-no-reloc.s
    lld/branches/release_39/test/ELF/shared.s

Modified: lld/branches/release_39/ELF/InputFiles.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/branches/release_39/ELF/InputFiles.cpp?rev=287907&r1=287906&r2=287907&view=diff
==============================================================================
--- lld/branches/release_39/ELF/InputFiles.cpp (original)
+++ lld/branches/release_39/ELF/InputFiles.cpp Thu Nov 24 19:57:00 2016
@@ -18,6 +18,7 @@
 #include "llvm/CodeGen/Analysis.h"
 #include "llvm/IR/LLVMContext.h"
 #include "llvm/IR/Module.h"
+#include "llvm/Support/Path.h"
 #include "llvm/Support/raw_ostream.h"
 
 using namespace llvm;
@@ -459,7 +460,7 @@ template <class ELFT> void SharedFile<EL
   }
 
   this->initStringTable();
-  SoName = this->getName();
+  SoName = sys::path::filename(this->getName());
 
   if (!DynamicSec)
     return;

Modified: lld/branches/release_39/test/ELF/as-needed-no-reloc.s
URL: http://llvm.org/viewvc/llvm-project/lld/branches/release_39/test/ELF/as-needed-no-reloc.s?rev=287907&r1=287906&r2=287907&view=diff
==============================================================================
--- lld/branches/release_39/test/ELF/as-needed-no-reloc.s (original)
+++ lld/branches/release_39/test/ELF/as-needed-no-reloc.s Thu Nov 24 19:57:00 2016
@@ -16,7 +16,7 @@
 # CHECK-NEXT: Other: 0
 # CHECK-NEXT: Section: Undefined
 
-# CHECK: NEEDED SharedLibrary ({{.*}}2.so)
+# CHECK: NEEDED SharedLibrary (as-needed-no-reloc{{.*}}2.so)
 
         .globl _start
 _start:

Modified: lld/branches/release_39/test/ELF/shared.s
URL: http://llvm.org/viewvc/llvm-project/lld/branches/release_39/test/ELF/shared.s?rev=287907&r1=287906&r2=287907&view=diff
==============================================================================
--- lld/branches/release_39/test/ELF/shared.s (original)
+++ lld/branches/release_39/test/ELF/shared.s Thu Nov 24 19:57:00 2016
@@ -119,7 +119,6 @@
 // CHECK-NEXT:   EntrySize: 8
 // CHECK-NEXT:   SectionData (
 // CHECK:        )
-// CHECK-NEXT: }
 
 // CHECK:      Name: .symtab
 // CHECK-NEXT: Type: SHT_SYMTAB