From 6f485ad41608601f6cd2740472ef4410bf419f6a Mon Sep 17 00:00:00 2001 From: Miguel Saldivar Date: Sun, 10 Nov 2019 00:04:25 -0800 Subject: PR24996, Gold fix for ternary operator within linker scripts PR 24996 * expression.cc (Trinary_expression::arg2_value): Use correct integer expression when calling "eval_maybe_dot" method. (Trinary_expression::arg3_value): Likewise. --- gold/expression.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gold/expression.cc') diff --git a/gold/expression.cc b/gold/expression.cc index 2471e25..f4bdf2a 100644 --- a/gold/expression.cc +++ b/gold/expression.cc @@ -596,7 +596,7 @@ class Trinary_expression : public Expression Output_section** section_pointer, uint64_t* alignment_pointer) const { - return this->arg1_->eval_maybe_dot(eei->symtab, eei->layout, + return this->arg2_->eval_maybe_dot(eei->symtab, eei->layout, eei->check_assertions, eei->is_dot_available, eei->dot_value, @@ -615,7 +615,7 @@ class Trinary_expression : public Expression Output_section** section_pointer, uint64_t* alignment_pointer) const { - return this->arg1_->eval_maybe_dot(eei->symtab, eei->layout, + return this->arg3_->eval_maybe_dot(eei->symtab, eei->layout, eei->check_assertions, eei->is_dot_available, eei->dot_value, -- cgit v1.1