[lld] r280990 - [ELF] Fix DT_NEEDED value.

Davide Italiano via llvm-commits llvm-commits at lists.llvm.org
Thu Sep 8 14:18:39 PDT 2016


Author: davide
Date: Thu Sep  8 16:18:38 2016
New Revision: 280990

URL: http://llvm.org/viewvc/llvm-project?rev=280990&view=rev
Log:
[ELF] Fix DT_NEEDED value.

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

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

Modified: lld/trunk/ELF/InputFiles.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/InputFiles.cpp?rev=280990&r1=280989&r2=280990&view=diff
==============================================================================
--- lld/trunk/ELF/InputFiles.cpp (original)
+++ lld/trunk/ELF/InputFiles.cpp Thu Sep  8 16:18:38 2016
@@ -19,6 +19,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;
@@ -477,7 +478,7 @@ template <class ELFT> void SharedFile<EL
   }
 
   this->initStringTable();
-  SoName = this->getName();
+  SoName = sys::path::filename(this->getName());
 
   if (!DynamicSec)
     return;

Modified: lld/trunk/test/ELF/as-needed-no-reloc.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/as-needed-no-reloc.s?rev=280990&r1=280989&r2=280990&view=diff
==============================================================================
--- lld/trunk/test/ELF/as-needed-no-reloc.s (original)
+++ lld/trunk/test/ELF/as-needed-no-reloc.s Thu Sep  8 16:18:38 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/trunk/test/ELF/shared.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/shared.s?rev=280990&r1=280989&r2=280990&view=diff
==============================================================================
--- lld/trunk/test/ELF/shared.s (original)
+++ lld/trunk/test/ELF/shared.s Thu Sep  8 16:18:38 2016
@@ -119,7 +119,6 @@
 // CHECK-NEXT:   EntrySize: 8
 // CHECK-NEXT:   SectionData (
 // CHECK:        )
-// CHECK-NEXT: }
 
 // CHECK:      Name: .symtab
 // CHECK-NEXT: Type: SHT_SYMTAB




More information about the llvm-commits mailing list