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
------------------------------------------------------------------------
git-svn-id: https://llvm.org/svn/llvm-project/lld/branches/release_39@287907 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/ELF/InputFiles.cpp b/ELF/InputFiles.cpp
index 57e5563..426d9c3 100644
--- a/ELF/InputFiles.cpp
+++ b/ELF/InputFiles.cpp
@@ -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 @@
}
this->initStringTable();
- SoName = this->getName();
+ SoName = sys::path::filename(this->getName());
if (!DynamicSec)
return;
diff --git a/test/ELF/as-needed-no-reloc.s b/test/ELF/as-needed-no-reloc.s
index 0706ca0..9cbe25c 100644
--- a/test/ELF/as-needed-no-reloc.s
+++ b/test/ELF/as-needed-no-reloc.s
@@ -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:
diff --git a/test/ELF/shared.s b/test/ELF/shared.s
index a81a093..086cc73 100644
--- a/test/ELF/shared.s
+++ b/test/ELF/shared.s
@@ -119,7 +119,6 @@
// CHECK-NEXT: EntrySize: 8
// CHECK-NEXT: SectionData (
// CHECK: )
-// CHECK-NEXT: }
// CHECK: Name: .symtab
// CHECK-NEXT: Type: SHT_SYMTAB
