commit 3dabfc6b0d62433d9beedfd2b3dc8fd067870a9b
author Rafael Espindola <rafael.espindola@gmail.com> Mon Oct 31 13:14:53 2016 +0000
committer Rafael Espindola <rafael.espindola@gmail.com> Mon Oct 31 13:14:53 2016 +0000
tree f02a05e3b9425dbe9493660fb67e2b81a2649850
parent 6788ddeac96193f2cd5670d3061ef816a4a4737a

Correctly merge visibility of linkerscript created symbols.

llvm-svn: 285567

lld/ELF/LinkerScript.cpp

diff --git a/lld/ELF/LinkerScript.cpp b/lld/ELF/LinkerScript.cpp
index f15d170..96862cc 100644
--- a/lld/ELF/LinkerScript.cpp
+++ b/lld/ELF/LinkerScript.cpp
@@ -46,9 +46,9 @@
 ScriptConfiguration *elf::ScriptConfig;
 
 template <class ELFT> static void addRegular(SymbolAssignment *Cmd) {
-  Symbol *Sym = Symtab<ELFT>::X->addRegular(Cmd->Name, STV_DEFAULT, nullptr,
+  uint8_t Visibility = Cmd->Hidden ? STV_HIDDEN : STV_DEFAULT;
+  Symbol *Sym = Symtab<ELFT>::X->addRegular(Cmd->Name, Visibility, nullptr,
                                             STB_GLOBAL, STT_NOTYPE, 0);
-  Sym->Visibility = Cmd->Hidden ? STV_HIDDEN : STV_DEFAULT;
   Cmd->Sym = Sym->body();
 
   // If we have no SECTIONS then we don't have '.' and don't call

lld/test/ELF/linkerscript/visibility.s

diff --git a/lld/test/ELF/linkerscript/visibility.s b/lld/test/ELF/linkerscript/visibility.s
new file mode 100644
index 0000000..9d9fcf0
--- /dev/null
+++ b/lld/test/ELF/linkerscript/visibility.s
@@ -0,0 +1,22 @@
+# REQUIRES: x86
+# RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
+
+# RUN: echo "SECTIONS { foo = .; }" > %t1.script
+# RUN: ld.lld -o %t1 --script %t1.script %t.o -shared
+# RUN: llvm-readobj -t %t1 | FileCheck %s
+
+# CHECK:      Symbol {
+# CHECK:        Name: foo
+# CHECK-NEXT:   Value:
+# CHECK-NEXT:   Size:
+# CHECK-NEXT:   Binding: Local
+# CHECK-NEXT:   Type:
+# CHECK-NEXT:   Other [
+# CHECK-NEXT:     STV_HIDDEN
+# CHECK-NEXT:   ]
+# CHECK-NEXT:   Section:
+# CHECK-NEXT: }
+
+        .data
+        .hidden foo
+        .long foo