intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-18 16:50:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

[ELF] Linkerscript: symbol assignments with indentifiers on the right side of expression.

Browse Source 
In symbol assignments symbol may appear on the right-hand side of the expression:
(https://svnweb.freebsd.org/base/head/sys/conf/ldscript.amd64?revision=284870&view=markup#l8)

kernphys = CONSTANT (MAXPAGESIZE);
 . = kernbase + kernphys + SIZEOF_HEADERS;

Patch implements that.

Differential revision: https://reviews.llvm.org/D22759

llvm-svn: 276784
This commit is contained in:
George Rimar
2016-07-26 18:18:58 +00:00
parent f17d48e58a
commit a9c5a52846
2 changed files with 61 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
lld/ELF/LinkerScript.cpp
View File

@@ -756,6 +756,29 @@ SymbolAssignment *ScriptParser::readAssignment(StringRef Name) {
// script expression.
Expr ScriptParser::readExpr() { return readExpr1(readPrimary(), 0); }
static uint64_t getSymbolValue(StringRef S) {
switch (Config->EKind) {
case ELF32LEKind:
if (SymbolBody *B = Symtab<ELF32LE>::X->find(S))
return B->getVA<ELF32LE>();
break;
case ELF32BEKind:
if (SymbolBody *B = Symtab<ELF32BE>::X->find(S))
return B->getVA<ELF32BE>();
break;
case ELF64LEKind:
if (SymbolBody *B = Symtab<ELF64LE>::X->find(S))
return B->getVA<ELF64LE>();
break;
case ELF64BEKind:
if (SymbolBody *B = Symtab<ELF64BE>::X->find(S))
return B->getVA<ELF64BE>();
break;
}
error("symbol not found: " + S);
return 0;
}
// This is a part of the operator-precedence parser. This function
// assumes that the remaining token stream starts with an operator.
Expr ScriptParser::readExpr1(Expr Lhs, int MinPrec) {
@@ -844,10 +867,13 @@ Expr ScriptParser::readPrimary() {
return [](uint64_t Dot) { return alignTo(Dot, Target->PageSize); };
}
// Parse a number literal
// Parse a symbol name or a number literal.
uint64_t V = 0;
if (Tok.getAsInteger(0, V))
setError("malformed number: " + Tok);
if (Tok.getAsInteger(0, V)) {
if (!isValidCIdentifier(Tok))
setError("malformed number: " + Tok);
return [=](uint64_t Dot) { return getSymbolValue(Tok); };
}
return [=](uint64_t Dot) { return V; };
}