Index: ELF/LinkerScript.h =================================================================== --- ELF/LinkerScript.h +++ ELF/LinkerScript.h @@ -264,6 +264,7 @@ bool shouldKeep(InputSectionBase *S); void assignOffsets(OutputSectionCommand *Cmd); void placeOrphanSections(); + void assignSymbols(); void assignAddresses(std::vector &Phdrs); bool hasPhdrsCommands(); uint64_t getHeaderSize() override; Index: ELF/LinkerScript.cpp =================================================================== --- ELF/LinkerScript.cpp +++ ELF/LinkerScript.cpp @@ -130,11 +130,6 @@ return; Cmd->Sym = addRegular(Cmd); - - // If there are sections, then let the value be assigned later in - // `assignAddresses`. - if (!ScriptConfig->HasSections) - assignSymbol(Cmd); } bool SymbolAssignment::classof(const BaseCommand *C) { @@ -324,15 +319,6 @@ continue; } - if (auto *Cmd = dyn_cast(Base1.get())) { - // If we don't have SECTIONS then output sections have already been - // created by Writer. The LinkerScript::assignAddresses - // will not be called, so ASSERT should be evaluated now. - if (!Opt.HasSections) - Cmd->Expression(); - continue; - } - if (auto *Cmd = dyn_cast(Base1.get())) { std::vector V = createInputSectionList(*Cmd); @@ -763,6 +749,21 @@ } template +void LinkerScript::assignSymbols() { + for (const std::unique_ptr &Base : Opt.Commands) { + if (auto *Cmd = dyn_cast(Base.get())) { + assignSymbol(Cmd); + continue; + } + + if (auto *Cmd = dyn_cast(Base.get())) { + Cmd->Expression(); + continue; + } + } +} + +template void LinkerScript::assignAddresses(std::vector &Phdrs) { // Assign addresses as instructed by linker script SECTIONS sub-commands. Dot = 0; @@ -1577,14 +1578,8 @@ SymbolAssignment *ScriptParser::readAssignment(StringRef Name) { StringRef Op = next(); - Expr E; assert(Op == "=" || Op == "+="); - if (consume("ABSOLUTE")) { - E = readExpr(); - E.IsAbsolute = [] { return true; }; - } else { - E = readExpr(); - } + Expr E = readExpr(); if (Op == "+=") { std::string Loc = getCurrentLocation(); E = [=] { return ScriptBase->getSymbolValue(Loc, Name) + E(); }; @@ -1836,6 +1831,13 @@ } if (Tok == "SIZEOF_HEADERS") return [=] { return ScriptBase->getHeaderSize(); }; + if (Tok == "ABSOLUTE") { + expect("("); + Expr E = readExpr(); + E.IsAbsolute = [] { return true; }; + expect(")"); + return [=]() { return E(); }; + } // Tok is a literal number. uint64_t V; Index: ELF/Writer.cpp =================================================================== --- ELF/Writer.cpp +++ ELF/Writer.cpp @@ -270,6 +270,7 @@ } else { fixSectionAlignments(); assignAddresses(); + Script::X->assignSymbols(); } // Remove empty PT_LOAD to avoid causing the dynamic linker to try to mmap a Index: test/ELF/linkerscript/absolute.s =================================================================== --- test/ELF/linkerscript/absolute.s +++ test/ELF/linkerscript/absolute.s @@ -4,6 +4,12 @@ # RUN: ld.lld -o %t --script %t.script %t.o # RUN: llvm-readobj --symbols %t | FileCheck %s +# REQUIRES: x86 +# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o +# RUN: echo "PROVIDE(foo = 1 + ABSOLUTE(ADDR(.text)));" > %t.script +# RUN: ld.lld -o %t --script %t.script %t.o +# RUN: llvm-readobj --symbols %t | FileCheck --check-prefix=CHECK-RHS %s + # CHECK: Name: foo # CHECK-NEXT: Value: # CHECK-NEXT: Size: @@ -13,6 +19,18 @@ # CHECK-NEXT: Section: Absolute # CHECK-NEXT: } +# CHECK-RHS: Name: foo +# CHECK-RHS-NEXT: Value: 0x201001 +# CHECK-RHS-NEXT: Size: +# CHECK-RHS-NEXT: Binding: +# CHECK-RHS-NEXT: Type: +# CHECK-RHS-NEXT: Other: +# CHECK-RHS-NEXT: Section: Absolute +# CHECK-RHS-NEXT: } + .text .globl _start _start: + nop + +.global foo