Set dso_local in lld.

We were already doing this in gold, but not in lld.

llvm-svn: 322572

6 files changed, 15 insertions, 9 deletions

diff --git a/lld/ELF/LTO.cpp b/lld/ELF/LTO.cpp
index bfd85288d18..57f3b90666b 100644
--- a/lld/ELF/LTO.cpp
+++ b/lld/ELF/LTO.cpp
@@ -134,6 +134,8 @@ void BitcodeCompiler::add(BitcodeFile &F) {
     if (auto *Cmd = dyn_cast<SymbolAssignment>(Base))
       ScriptSymbols.insert(Cmd->Name);
 
+  bool IsExecutable = !Config->Shared && !Config->Relocatable;
+
   // Provide a resolution to the LTO API for each symbol.
   for (const lto::InputFile::Symbol &ObjSym : Obj.symbols()) {
     Symbol *Sym = Syms[SymNum];
@@ -156,6 +158,10 @@ void BitcodeCompiler::add(BitcodeFile &F) {
     R.VisibleToRegularObj = Config->Relocatable || Sym->IsUsedInRegularObj ||
                             (R.Prevailing && Sym->includeInDynsym()) ||
                             UsedStartStop.count(ObjSym.getSectionName());
+    R.FinalDefinitionInLinkageUnit =
+        Sym->isDefined() &&
+        (IsExecutable || Sym->getVisibility() != STV_DEFAULT);
+
     if (R.Prevailing)
       undefine(Sym);
 
diff --git a/lld/test/ELF/lto/asmundef.ll b/lld/test/ELF/lto/asmundef.ll
index d03a5e38721..57449a1f149 100644
--- a/lld/test/ELF/lto/asmundef.ll
+++ b/lld/test/ELF/lto/asmundef.ll
@@ -20,5 +20,5 @@ define void @_start() {
   ret void
 }
 
-; CHECK: define void @foo
+; CHECK: define dso_local void @foo
 
diff --git a/lld/test/ELF/lto/internalize-basic.ll b/lld/test/ELF/lto/internalize-basic.ll
index 43c1837528f..b5691a752ab 100644
--- a/lld/test/ELF/lto/internalize-basic.ll
+++ b/lld/test/ELF/lto/internalize-basic.ll
@@ -15,7 +15,7 @@ define hidden void @foo() {
 }
 
 ; Check that _start is not internalized.
-; CHECK: define void @_start()
+; CHECK: define dso_local void @_start()
 
 ; Check that foo function is correctly internalized.
 ; CHECK: define internal void @foo()
diff --git a/lld/test/ELF/lto/internalize-exportdyn.ll b/lld/test/ELF/lto/internalize-exportdyn.ll
index 2034a2b3ab7..0ffde696edb 100644
--- a/lld/test/ELF/lto/internalize-exportdyn.ll
+++ b/lld/test/ELF/lto/internalize-exportdyn.ll
@@ -38,10 +38,10 @@ define linkonce_odr void @baz() {
 @use_baz = global void ()* @baz
 
 ; Check what gets internalized.
-; CHECK: define void @_start()
-; CHECK: define void @foo()
+; CHECK: define dso_local void @_start()
+; CHECK: define dso_local void @foo()
 ; CHECK: define internal void @bar()
 ; CHECK: define internal void @zed()
 ; CHECK: define internal void @zed2()
-; CHECK: define weak_odr void @bah()
-; CHECK: define weak_odr void @baz()
+; CHECK: define weak_odr dso_local void @bah()
+; CHECK: define weak_odr dso_local void @baz()
diff --git a/lld/test/ELF/lto/internalize-llvmused.ll b/lld/test/ELF/lto/internalize-llvmused.ll
index 253dcb26d04..cd79394d99b 100644
--- a/lld/test/ELF/lto/internalize-llvmused.ll
+++ b/lld/test/ELF/lto/internalize-llvmused.ll
@@ -17,4 +17,4 @@ define hidden void @f() {
 @llvm.used = appending global [1 x i8*] [ i8* bitcast (void ()* @f to i8*)]
 
 ; Check that f is not internalized.
-; CHECK: define hidden void @f()
+; CHECK: define dso_local hidden void @f()
diff --git a/lld/test/ELF/lto/wrap-1.ll b/lld/test/ELF/lto/wrap-1.ll
index 83e09493fb5..b82bece253d 100644
--- a/lld/test/ELF/lto/wrap-1.ll
+++ b/lld/test/ELF/lto/wrap-1.ll
@@ -20,8 +20,8 @@
 ; Make sure that the 'r' (linker redefined) bit is set for bar and __wrap_bar
 ; in the resolutions file.
 ; RESOLS: ,bar,xr
-; RESOLS: ,__wrap_bar,px
-; RESOLS: ,__real_bar,pxr
+; RESOLS: ,__wrap_bar,plx
+; RESOLS: ,__real_bar,plxr
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"