diff options
| author | Miguel Saldivar <saldivarcher@gmail.com> | 2019-11-10 00:04:25 -0800 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2019-11-11 10:56:44 +1030 |
| commit | 6f485ad41608601f6cd2740472ef4410bf419f6a (patch) | |
| tree | c4b5cfc0c79599c8920e85540f35d1451fa3f0e3 /gold | |
| parent | b7a3015b1ac8d8f700a9ec37e2b16495375b1405 (diff) | |
| download | fsf-binutils-gdb-6f485ad41608601f6cd2740472ef4410bf419f6a.zip fsf-binutils-gdb-6f485ad41608601f6cd2740472ef4410bf419f6a.tar.gz fsf-binutils-gdb-6f485ad41608601f6cd2740472ef4410bf419f6a.tar.bz2 | |
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.
Diffstat (limited to 'gold')
| -rw-r--r-- | gold/ChangeLog | 7 | ||||
| -rw-r--r-- | gold/expression.cc | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog index c2acb20..cc5da7d 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,10 @@ +2019-11-11 Miguel Saldivar <saldivarcher@gmail.com> + + 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 <amodra@gmail.com> PR 16794 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, |