Index: ELF/Driver.cpp =================================================================== --- ELF/Driver.cpp +++ ELF/Driver.cpp @@ -1031,6 +1031,8 @@ for (StringRef Sym : Script->Opt.ReferencedSymbols) Symtab->addUndefined(Sym); + Script->defineSymbols(); + // If an entry symbol is in a static archive, pull out that file now // to complete the symbol table. After this, no new names except a // few linker-synthesized ones will be added to the symbol table. Index: ELF/LTO.cpp =================================================================== --- ELF/LTO.cpp +++ ELF/LTO.cpp @@ -129,11 +129,6 @@ std::vector Syms = F.getSymbols(); std::vector Resols(Syms.size()); - DenseSet ScriptSymbols; - for (BaseCommand *Base : Script->Opt.Commands) - if (auto *Cmd = dyn_cast(Base)) - ScriptSymbols.insert(Cmd->Name); - // Provide a resolution to the LTO API for each symbol. for (const lto::InputFile::Symbol &ObjSym : Obj.symbols()) { SymbolBody *B = Syms[SymNum]; @@ -165,7 +160,7 @@ // still not final: // 1) Aliased (with --defsym) or wrapped (with --wrap) symbols. // 2) Symbols redefined in linker script. - R.LinkerRedefined = !Sym->CanInline || ScriptSymbols.count(B->getName()); + R.LinkerRedefined = !Sym->CanInline; } checkError(LTOObj->add(std::move(F.Obj), Resols)); } Index: ELF/LinkerScript.h =================================================================== --- ELF/LinkerScript.h +++ ELF/LinkerScript.h @@ -257,6 +257,7 @@ void assignAddresses(); void allocateHeaders(std::vector &Phdrs); void addSymbol(SymbolAssignment *Cmd); + void defineSymbols(); void processCommands(OutputSectionFactory &Factory); // Parsed linker script configurations are set to this struct. Index: ELF/LinkerScript.cpp =================================================================== --- ELF/LinkerScript.cpp +++ ELF/LinkerScript.cpp @@ -79,13 +79,30 @@ return getValue() - getSecAddr(); } -static SymbolBody *addRegular(SymbolAssignment *Cmd) { +static Symbol *createSymbol(SymbolAssignment *Cmd) { Symbol *Sym; uint8_t Visibility = Cmd->Hidden ? STV_HIDDEN : STV_DEFAULT; std::tie(Sym, std::ignore) = Symtab->insert(Cmd->Name, /*Type*/ 0, Visibility, /*CanOmitFromDynSym*/ false, /*File*/ nullptr); Sym->Binding = STB_GLOBAL; + return Sym; +} + +static SymbolBody *addDummyRegular(SymbolAssignment *Cmd) { + // We do not need to add dummy symbol if already have non-dummy one. + if (SymbolBody *B = Symtab->find(Cmd->Name)) + return B; + + Symbol *Sym = createSymbol(Cmd); + replaceBody(Sym, nullptr, Cmd->Name, /*IsLocal=*/false, + Cmd->Hidden ? STV_HIDDEN : STV_DEFAULT, + STT_NOTYPE, 0, 0, nullptr); + return Sym->body(); +} + +static SymbolBody *addRegular(SymbolAssignment *Cmd) { + Symbol *Sym = createSymbol(Cmd); ExprValue Value = Cmd->Expression(); SectionBase *Sec = Value.isAbsolute() ? nullptr : Value.Sec; @@ -94,7 +111,8 @@ // like this: `alignment = 16; . = ALIGN(., alignment)` uint64_t SymValue = Value.Sec ? 0 : Value.getValue(); replaceBody(Sym, nullptr, Cmd->Name, /*IsLocal=*/false, - Visibility, STT_NOTYPE, SymValue, 0, Sec); + Cmd->Hidden ? STV_HIDDEN : STV_DEFAULT, + STT_NOTYPE, SymValue, 0, Sec); return Sym->body(); } @@ -155,19 +173,34 @@ } } -void LinkerScript::addSymbol(SymbolAssignment *Cmd) { +static bool shouldAddSymbol(SymbolAssignment *Cmd) { if (Cmd->Name == ".") - return; - + return false; // If a symbol was in PROVIDE(), we need to define it only when // it is a referenced undefined symbol. + if (!Cmd->Provide) + return true; SymbolBody *B = Symtab->find(Cmd->Name); - if (Cmd->Provide && (!B || B->isDefined())) - return; + return B && B->isUndefined(); +} +void LinkerScript::addSymbol(SymbolAssignment *Cmd) { + if (!shouldAddSymbol(Cmd)) + return; Cmd->Sym = addRegular(Cmd); } +// We want to define symbols assigned by linker script early enough, +// so we can version them or change another attributes before the rest script +// commands are processed and their values are finalized. +void LinkerScript::defineSymbols() { + assert(!CurAddressState); + for (BaseCommand *Base : Opt.Commands) + if (SymbolAssignment *Cmd = dyn_cast(Base)) + if (shouldAddSymbol(Cmd)) + addDummyRegular(Cmd)->symbol()->CanInline = false; +} + bool SymbolAssignment::classof(const BaseCommand *C) { return C->Kind == AssignmentKind; } Index: ELF/Writer.cpp =================================================================== --- ELF/Writer.cpp +++ ELF/Writer.cpp @@ -787,7 +787,11 @@ // to GOT. Default offset is 0x7ff0. // See "Global Data Symbols" in Chapter 6 in the following document: // ftp://www.linux-mips.org/pub/linux/mips/doc/ABI/mipsabi.pdf - ElfSym::MipsGp = Symtab->addAbsolute("_gp", STV_HIDDEN, STB_LOCAL); + SymbolBody *Gp = Symtab->find("_gp"); + if (!Gp || !isa(Gp)) + ElfSym::MipsGp = Symtab->addAbsolute("_gp", STV_HIDDEN, STB_LOCAL); + else + ElfSym::MipsGp = dyn_cast(Gp); // On MIPS O32 ABI, _gp_disp is a magic symbol designates offset between // start of function and 'gp' pointer into GOT. Index: test/ELF/linkerscript/symbols-synthetic.s =================================================================== --- test/ELF/linkerscript/symbols-synthetic.s +++ test/ELF/linkerscript/symbols-synthetic.s @@ -61,6 +61,7 @@ # SIMPLE-NEXT: 0000000000000120 .foo 00000000 _begin_sec # SIMPLE-NEXT: 0000000000000128 *ABS* 00000000 _end_sec_abs # SIMPLE-NEXT: 0000000000001048 .text 00000000 _start +# SIMPLE-NEXT: 0000000000000ee4 *ABS* 00000000 size_foo_3 # SIMPLE-NEXT: 0000000000000120 .foo 00000000 begin_foo # SIMPLE-NEXT: 0000000000000128 .foo 00000000 end_foo # SIMPLE-NEXT: 0000000000000008 *ABS* 00000000 size_foo_1 @@ -68,7 +69,6 @@ # SIMPLE-NEXT: 0000000000001000 .foo 00000000 begin_bar # SIMPLE-NEXT: 0000000000001004 .foo 00000000 end_bar # SIMPLE-NEXT: 0000000000000ee4 *ABS* 00000000 size_foo_2 -# SIMPLE-NEXT: 0000000000000ee4 *ABS* 00000000 size_foo_3 # SIMPLE-NEXT: 0000000000001004 .eh_frame_hdr 00000000 __eh_frame_hdr_start # SIMPLE-NEXT: 0000000000001010 *ABS* 00000000 __eh_frame_hdr_start2 # SIMPLE-NEXT: 0000000000001018 .eh_frame_hdr 00000000 __eh_frame_hdr_end Index: test/ELF/linkerscript/version-script.s =================================================================== --- test/ELF/linkerscript/version-script.s +++ test/ELF/linkerscript/version-script.s @@ -0,0 +1,37 @@ +# REQUIRES: x86 +# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o + +# RUN: echo "bar = foo; VERSION { V { global: foo; bar; local: *; }; }" > %t.script +# RUN: ld.lld -T %t.script -shared --no-undefined-version %t.o -o %t.so +# RUN: llvm-readobj -V %t.so | FileCheck %s + +# CHECK: Symbols [ +# CHECK-NEXT: Symbol { +# CHECK-NEXT: Version: 0 +# CHECK-NEXT: Name: @ +# CHECK-NEXT: } +# CHECK-NEXT: Symbol { +# CHECK-NEXT: Version: 2 +# CHECK-NEXT: Name: foo@@V +# CHECK-NEXT: } +# CHECK-NEXT: Symbol { +# CHECK-NEXT: Version: 0 +# CHECK-NEXT: Name: und@ +# CHECK-NEXT: } +# CHECK-NEXT: Symbol { +# CHECK-NEXT: Version: 2 +# CHECK-NEXT: Name: bar@@V +# CHECK-NEXT: } +# CHECK-NEXT: ] + +# RUN: echo "bar = und; VERSION { V { global: foo; bar; local: *; }; }" > %t.script +# RUN: not ld.lld -T %t.script -shared --no-undefined-version %t.o -o %t.so \ +# RUN: 2>&1 | FileCheck --check-prefix=ERR %s +# ERR: symbol not found: und + +.global und + +.text +.globl foo +.type foo,@function +foo: Index: test/ELF/mips-gp-ext.s =================================================================== --- test/ELF/mips-gp-ext.s +++ test/ELF/mips-gp-ext.s @@ -27,10 +27,10 @@ # REQUIRES: mips # REL: Contents of section .text: -# REL-NEXT: 0000 3c080000 2108010c 8f82fffc +# REL-NEXT: 0000 3c080000 2108010c 8f82001c # ^-- %hi(_gp_disp) # ^-- %lo(_gp_disp) -# ^-- 8 - (0x10c - 0x100) +# ^-- 8 - (0x10c - 0x120) # G - (GP - .got) # REL: Contents of section .reginfo: @@ -39,18 +39,18 @@ # ^-- _gp # REL: Contents of section .data: -# REL-NEXT: 00f0 fffffef4 +# REL-NEXT: 0110 fffffef4 # ^-- 0-0x10c # REL: 00000000 .text 00000000 foo # REL: 00000000 *ABS* 00000000 .hidden _gp_disp -# REL: 0000010c *ABS* 00000000 .hidden _gp +# REL: 0000010c *ABS* 00000000 _gp # ABS: Contents of section .text: -# ABS-NEXT: 0000 3c080000 21080200 8f82ff08 +# ABS-NEXT: 0000 3c080000 21080200 8f82ff28 # ^-- %hi(_gp_disp) # ^-- %lo(_gp_disp) -# ^-- 8 - (0x200 - 0x100) +# ^-- 8 - (0x200 - 0x120) # G - (GP - .got) # ABS: Contents of section .reginfo: @@ -59,12 +59,12 @@ # ^-- _gp # ABS: Contents of section .data: -# ABS-NEXT: 00f0 fffffe00 +# ABS-NEXT: 0110 fffffe00 # ^-- 0-0x200 # ABS: 00000000 .text 00000000 foo # ABS: 00000000 *ABS* 00000000 .hidden _gp_disp -# ABS: 00000200 *ABS* 00000000 .hidden _gp +# ABS: 00000200 *ABS* 00000000 _gp .text foo: