maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[ELF] - Linkerscript: Add `~` as separate math token. 

Previously we did not support following:
foo = ~0xFF;
and had to add space before numeric value:
foo = ~ 0xFF

That was constistent with ld.bfd < 2.30, which shows:
script.txt:3: undefined symbol `~2' referenced in expression,
but inconsistent with gold.

It was fixed for ld.bfd 2.30 as well:
https://sourceware.org/bugzilla/show_bug.cgi?id=22267

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

llvm-svn: 315569
This commit is contained in:
George Rimar 2017-10-12 08:40:12 +00:00
parent 3f2b00b7b6
commit 81eca18df3
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lld/ELF/ScriptLexer.cpp
View File

@ -164,7 +164,7 @@ bool ScriptLexer::atEOF() { return ErrorCount || Tokens.size() == Pos; }
// Split a given string as an expression. // Split a given string as an expression.
// This function returns "3", "*" and "5" for "3*5" for example. // This function returns "3", "*" and "5" for "3*5" for example.
static std::vector<StringRef> tokenizeExpr(StringRef S) { static std::vector<StringRef> tokenizeExpr(StringRef S) {
StringRef Ops = "+-*/:!"; // List of operators StringRef Ops = "+-*/:!~"; // List of operators
// Quoted strings are literal strings, so we don't want to split it. // Quoted strings are literal strings, so we don't want to split it.
if (S.startswith("\"")) if (S.startswith("\""))

2
lld/test/ELF/linkerscript/symbol-assignexpr.s
View File

@ -6,7 +6,7 @@
# RUN: symbol2 = symbol + 0x1234; \ # RUN: symbol2 = symbol + 0x1234; \
# RUN: symbol3 = symbol2; \ # RUN: symbol3 = symbol2; \
# RUN: symbol4 = symbol + -4; \ # RUN: symbol4 = symbol + -4; \
# RUN: symbol5 = symbol - ~ 0xfffb; \ # RUN: symbol5 = symbol - ~0xfffb; \
# RUN: symbol6 = symbol - ~(0xfff0 + 0xb); \ # RUN: symbol6 = symbol - ~(0xfff0 + 0xb); \
# RUN: symbol7 = symbol - ~ 0xfffb + 4; \ # RUN: symbol7 = symbol - ~ 0xfffb + 4; \
# RUN: symbol8 = ~ 0xffff + 4; \ # RUN: symbol8 = ~ 0xffff + 4; \