diff options
| -rw-r--r-- | lld/ELF/ScriptParser.cpp | 11 | ||||
| -rw-r--r-- | lld/test/ELF/linkerscript/operators.s | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/lld/ELF/ScriptParser.cpp b/lld/ELF/ScriptParser.cpp index 0c4e523ebc8..6073820ff69 100644 --- a/lld/ELF/ScriptParser.cpp +++ b/lld/ELF/ScriptParser.cpp @@ -164,6 +164,13 @@ static ExprValue div(ExprValue A, ExprValue B) { return 0; } +static ExprValue mod(ExprValue A, ExprValue B) { + if (uint64_t BV = B.getValue()) + return A.getValue() % BV; + error("modulo by zero"); + return 0; +} + static ExprValue bitAnd(ExprValue A, ExprValue B) { moveAbsRight(A, B); return {A.Sec, A.ForceAbsolute, @@ -457,7 +464,7 @@ void ScriptParser::readSections() { static int precedence(StringRef Op) { return StringSwitch<int>(Op) - .Cases("*", "/", 5) + .Cases("*", "/", "%", 5) .Cases("+", "-", 4) .Cases("<<", ">>", 3) .Cases("<", "<=", ">", ">=", "==", "!=", 2) @@ -807,6 +814,8 @@ static Expr combine(StringRef Op, Expr L, Expr R) { return [=] { return L().getValue() * R().getValue(); }; if (Op == "/") return [=] { return div(L(), R()); }; + if (Op == "%") + return [=] { return mod(L(), R()); }; if (Op == "<<") return [=] { return L().getValue() << R().getValue(); }; if (Op == ">>") diff --git a/lld/test/ELF/linkerscript/operators.s b/lld/test/ELF/linkerscript/operators.s index 494fc08c0f9..b9be4b68e21 100644 --- a/lld/test/ELF/linkerscript/operators.s +++ b/lld/test/ELF/linkerscript/operators.s @@ -5,6 +5,7 @@ # RUN: plus = 1 + 2 + 3; \ # RUN: minus = 5 - 1; \ # RUN: div = 6 / 2; \ +# RUN: mod = 20 % 7; \ # RUN: mul = 1 + 2 * 3; \ # RUN: nospace = 1+2*6/3; \ # RUN: braces = 1 + (2 + 3) * 4; \ @@ -37,6 +38,7 @@ # CHECK: 00000000000006 *ABS* 00000000 plus # CHECK: 00000000000004 *ABS* 00000000 minus # CHECK: 00000000000003 *ABS* 00000000 div +# CHECK: 00000000000006 *ABS* 00000000 mod # CHECK: 00000000000007 *ABS* 00000000 mul # CHECK: 00000000000005 *ABS* 00000000 nospace # CHECK: 00000000000015 *ABS* 00000000 braces |
