summaryrefslogtreecommitdiffstats
path: root/lld/ELF/LinkerScript.cpp
diff options
context:
space:
mode:
authorGeorge Rimar <grimar@accesssoftek.com>2016-04-22 10:51:34 +0000
committerGeorge Rimar <grimar@accesssoftek.com>2016-04-22 10:51:34 +0000
commitf8e230b2774ee8525fffccf9e347668b130e5a33 (patch)
treed8ad32f735570871a564d2262d127eec68613920 /lld/ELF/LinkerScript.cpp
parent5b31c423a0edfb947f26b666157f706589c8876e (diff)
downloadbcm5719-llvm-f8e230b2774ee8525fffccf9e347668b130e5a33.tar.gz
bcm5719-llvm-f8e230b2774ee8525fffccf9e347668b130e5a33.zip
Revert r267132 as it broke buildbot.
llvm-svn: 267134
Diffstat (limited to 'lld/ELF/LinkerScript.cpp')
-rw-r--r--lld/ELF/LinkerScript.cpp14
1 files changed, 0 insertions, 14 deletions
diff --git a/lld/ELF/LinkerScript.cpp b/lld/ELF/LinkerScript.cpp
index 87743c60a46..9fcb2f61188 100644
--- a/lld/ELF/LinkerScript.cpp
+++ b/lld/ELF/LinkerScript.cpp
@@ -97,17 +97,6 @@ uint64_t LinkerScript<ELFT>::parsePrimary(ArrayRef<StringRef> &Tokens) {
return getInteger(Tok);
}
-template <class ELFT>
-uint64_t LinkerScript<ELFT>::parseTernary(ArrayRef<StringRef> &Tokens,
- uint64_t Cond) {
- next(Tokens);
- uint64_t V = parseExpr(Tokens, Dot);
- if (!expect(Tokens, ":"))
- return 0;
- uint64_t W = parseExpr(Tokens, Dot);
- return Cond ? V : W;
-}
-
static uint64_t apply(StringRef Op, uint64_t L, uint64_t R) {
if (Op == "+")
return L + R;
@@ -137,9 +126,6 @@ uint64_t LinkerScript<ELFT>::parseExpr1(ArrayRef<StringRef> &Tokens,
while (!Tokens.empty()) {
// Read an operator and an expression.
StringRef Op1 = Tokens.front();
- if (Op1 == "?")
- return parseTernary(Tokens, Lhs, Dot);
-
if (precedence(Op1) < MinPrec)
return Lhs;
next(Tokens);
OpenPOWER on IntegriCloud