diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2016-10-31 13:14:53 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2016-10-31 13:14:53 +0000 |
| commit | 3dabfc6b0d62433d9beedfd2b3dc8fd067870a9b (patch) | |
| tree | f02a05e3b9425dbe9493660fb67e2b81a2649850 | |
| parent | 6788ddeac96193f2cd5670d3061ef816a4a4737a (diff) | |
| download | bcm5719-llvm-3dabfc6b0d62433d9beedfd2b3dc8fd067870a9b.tar.gz bcm5719-llvm-3dabfc6b0d62433d9beedfd2b3dc8fd067870a9b.zip | |
Correctly merge visibility of linkerscript created symbols.
llvm-svn: 285567
| -rw-r--r-- | lld/ELF/LinkerScript.cpp | 4 | ||||
| -rw-r--r-- | lld/test/ELF/linkerscript/visibility.s | 22 |
2 files changed, 24 insertions, 2 deletions
diff --git a/lld/ELF/LinkerScript.cpp b/lld/ELF/LinkerScript.cpp index f15d1708cdb..96862ccd44a 100644 --- a/lld/ELF/LinkerScript.cpp +++ b/lld/ELF/LinkerScript.cpp @@ -46,9 +46,9 @@ LinkerScriptBase *elf::ScriptBase; 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 diff --git a/lld/test/ELF/linkerscript/visibility.s b/lld/test/ELF/linkerscript/visibility.s new file mode 100644 index 00000000000..9d9fcf0c5cd --- /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 |
