From: Miguel Saldivar Date: Sun, 10 Nov 2019 08:04:25 +0000 (-0800) Subject: PR24996, Gold fix for ternary operator within linker scripts X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6f485ad41608601f6cd2740472ef4410bf419f6a;p=binutils-gdb.git 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. --- diff --git a/gold/ChangeLog b/gold/ChangeLog index c2acb20a74d..cc5da7d9642 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,10 @@ +2019-11-11 Miguel Saldivar + + PR 24996 + * expression.cc (Trinary_expression::arg2_value): Use correct integer + expression when calling "eval_maybe_dot" method. + (Trinary_expression::arg3_value): Likewise. + 2019-09-28 Alan Modra PR 16794 diff --git a/gold/expression.cc b/gold/expression.cc index 2471e25a2af..f4bdf2a096c 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,