RISC-V: Don't assume the priv attributes are in order when handling them.

[deliverable/binutils-gdb.git] / bfd / ChangeLog

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index a77dd705ee064535ca541604e99ff08103818ba5..d9b66b55d347e37b940c5b869e77cec1f4a73dc8 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,11 @@
+2020-06-22  Nelson Chu  <nelson.chu@sifive.com>
+
+       * elfnn-riscv.c (riscv_merge_attributes): Once we meet one of the
+       priv attributes, we will check the conflicts for all of them (major,
+       minor and revision), and then set the priv_attrs_merged to TRUE to
+       indicate that we have handled all of the priv attributes.  Remove
+       the unused boolean priv_may_conflict, in_priv_zero and out_priv_zero.
+
 2020-06-21  Alan Modra  <amodra@gmail.com>
 
        PR 26132