[ELF] Fix DT_NEEDED value

[davide]

Summary

The absolute path value might not exist at runtime.
To quote Eric Van Gyzen who reported the bug:

18:52 < vangyzen> That path is a build area on the build host.
18:53 < vangyzen> e.g. /build/product/X.Y.Z/lib/libfoo.so
18:54 < vangyzen> On the running product, it's simply /lib.

https://llvm.org/bugs/show_bug.cgi?id=30330

[davide]

Also, the shared.s change is a side effect.
We can't do CHECK-NEXT

[davide]

Also, the shared.s change is a side effect.
We can't do CHECK-NEXT

Section {
  Index: 7
  Name: .dynamic (46)
  Type: SHT_DYNAMIC (0x6)
  Flags [ (0x3)
    SHF_ALLOC (0x2)
    SHF_WRITE (0x1)
  ]
  Address: 0x12000
  Offset: 0x2000
  Size: 96
  Link: 4
  Info: 0
  AddressAlignment: 4
  EntrySize: 8
  SectionData (
    0000: 1D000000 10000000 01000000 18000000  |................|
    0010: 11000000 E4010100 12000000 10000000  |................|
    0020: 13000000 08000000 06000000 50010100  |............P...|
    0030: 0B000000 10000000 05000000 B8010100  |................|
    0040: 0A000000 29000000 04000000 90010100  |....)...........|
    0050: 15000000 00000000 00000000 00000000  |................|
  )
}

because the section data already contains a ).

[ruiu]

Did you check that this behavior matches GNU?

[davide]

In D24363#537577, @ruiu wrote:

Did you check that this behavior matches GNU?

Yes, take a look at the bug report.

[ruiu]

ELF/OutputSections.cpp

689–690

Currently, the default soname (used if DT_SONAME is absent) if an absolute path of a library, which I think wrong. Look at SharedFile<ELFT>::parseSoName. You want to fix SoName default value in that function instead of fixing it here.

[ruiu]

ELF/InputFiles.cpp

481 ↗

(On Diff #70746)

Stripping path parts from the default seems fine, but

494 ↗

(On Diff #70746)

we should respect DT_SONAME value, no?

[ruiu]

LGTM

test/ELF/shared.s

122

Probably you just want to remove this line.

ELF/OutputSections.cpp

 #include "LinkerScript.h"
 #include "Strings.h"
 #include "SymbolTable.h"
 #include "Target.h"
 #include "lld/Core/Parallel.h"
 #include "llvm/Support/Dwarf.h"
 #include "llvm/Support/MD5.h"
 #include "llvm/Support/MathExtras.h"
-#include "llvm/Support/SHA1.h"
+#include "llvm/Support/Path.h"
 #include "llvm/Support/RandomNumberGenerator.h"
+#include "llvm/Support/SHA1.h"
 
 using namespace llvm;
 using namespace llvm::dwarf;
 using namespace llvm::object;
 using namespace llvm::support::endian;
 using namespace llvm::ELF;
 
 using namespace lld;
template <class ELFT> void DynamicSection<ELFT>::finalize() {
   for (StringRef S : Config->AuxiliaryList)
     Add({DT_AUXILIARY, Out<ELFT>::DynStrTab->addString(S)});
   if (!Config->RPath.empty())
     Add({Config->EnableNewDtags ? DT_RUNPATH : DT_RPATH,
          Out<ELFT>::DynStrTab->addString(Config->RPath)});
   for (const std::unique_ptr<SharedFile<ELFT>> &F :
        Symtab<ELFT>::X->getSharedFiles())
     if (F->isNeeded())
-      Add({DT_NEEDED, Out<ELFT>::DynStrTab->addString(F->getSoName())});
+      Add({DT_NEEDED, Out<ELFT>::DynStrTab->addString(
+                          sys::path::filename(F->getSoName()))});
   if (!Config->SoName.empty())
     Add({DT_SONAME, Out<ELFT>::DynStrTab->addString(Config->SoName)});
 
   Out<ELFT>::DynStrTab->finalize();
 
   if (Out<ELFT>::RelaDyn->hasRelocs()) {
     bool IsRela = Config->Rela;
     Add({IsRela ? DT_RELA : DT_REL, Out<ELFT>::RelaDyn});

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

 # CHECK:      Name: bar
 # CHECK-NEXT: Value: 0x0
 # CHECK-NEXT: Size: 0
 # CHECK-NEXT: Binding: Global
 # CHECK-NEXT: Type: Function
 # 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:
         .global bar

test/ELF/shared.s

 // CHECK-NEXT:   Offset: [[OFFSET:.*]]
 // CHECK-NEXT:   Size: [[SIZE:.*]]
 // CHECK-NEXT:   Link: [[DYNSTR]]
 // CHECK-NEXT:   Info: 0
 // CHECK-NEXT:   AddressAlignment: [[ALIGN:.*]]
 // CHECK-NEXT:   EntrySize: 8
 // CHECK-NEXT:   SectionData (
 // CHECK:        )
-// CHECK-NEXT: }
+// CHECK: }
 
 // CHECK:      Name: .symtab
 // CHECK-NEXT: Type: SHT_SYMTAB
 // CHECK-NEXT: Flags [
 // CHECK-NEXT: ]
 // CHECK-NEXT: Address:
 // CHECK-NEXT: Offset:
 // CHECK-NEXT: Size: