From 2723f79615a326f52deff8e0683d5576b20af4dc Mon Sep 17 00:00:00 2001
From: Dimitry Andric <dim@FreeBSD.org>
Date: Fri, 25 Nov 2016 19:14:25 +0000
Subject: Vendor import of lld release_39 branch r287912:
 https://llvm.org/svn/llvm-project/lld/branches/release_39@287912

---
 ELF/InputFiles.cpp            | 3 ++-
 test/ELF/as-needed-no-reloc.s | 2 +-
 test/ELF/shared.s             | 1 -
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ELF/InputFiles.cpp b/ELF/InputFiles.cpp
index 57e556395937..426d9c39715d 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 @@ template <class ELFT> void SharedFile<ELFT>::parseSoName() {
   }
 
   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 0706ca0a932d..9cbe25cf1767 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 a81a09370999..086cc7345125 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
-- 
cgit v1.2.3