Commit 44e40fa1 authored by Tom Stellard's avatar Tom Stellard
Browse files

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

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

llvm-svn: 287907
parent 04aa3b87

lld/ELF/InputFiles.cpp

+2 −1
Original line number Diff line number Diff line
@@ -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;

lld/test/ELF/as-needed-no-reloc.s

+1 −1
Original line number Diff line number Diff line
@@ -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:

lld/test/ELF/shared.s

+0 −1
Original line number Diff line number Diff line
@@ -119,7 +119,6 @@ 
// CHECK-NEXT:   EntrySize: 8

// CHECK-NEXT:   SectionData (

// CHECK:        )

// CHECK-NEXT: }



// CHECK:      Name: .symtab

// CHECK-NEXT: Type: SHT_SYMTAB