This is the mail archive of the
binutils-cvs@sourceware.org
mailing list for the binutils project.
[binutils-gdb] PR24996, Gold fix for ternary operator within linker scripts
- From: Alan Modra <amodra at sourceware dot org>
- To: bfd-cvs at sourceware dot org
- Date: 11 Nov 2019 00:27:07 -0000
- Subject: [binutils-gdb] PR24996, Gold fix for ternary operator within linker scripts
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=6f485ad41608601f6cd2740472ef4410bf419f6a
commit 6f485ad41608601f6cd2740472ef4410bf419f6a
Author: Miguel Saldivar <saldivarcher@gmail.com>
Date: Sun Nov 10 00:04:25 2019 -0800
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:
---
gold/ChangeLog | 7 +++++++
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,