+2020-06-22 Nelson Chu <nelson.chu@sifive.com>
+
+ * elfxx-riscv.c (struct priv_spec_t priv_specs[]): Move them from
+ opcodes/riscv-opc.c to bfd/elfxx-riscv.c, since we need it in linker.
+ (riscv_get_priv_spec_class): Likewise.
+ (riscv_get_priv_spec_name): Likewise.
+ (riscv_get_priv_spec_class_from_numbers): New function, convert
+ the version numbers into string, then call riscv_get_priv_spec_class
+ to get the priv spec class.
+ * elfxx-riscv.h (riscv_get_priv_spec_class): Move forward declaration
+ from include/opcode/riscv.h to bfd/elfxx-riscv.h.
+ (riscv_get_priv_spec_name): Likewise.
+ (riscv_get_priv_spec_class_from_numbers): New forward declaration.
+ (opcode/riscv.h): Include it in the header rather than elfxx-riscv.c.
+ * elfnn-riscv.c (riscv_merge_attributes): Get the priv spec classes
+ of input and output objects form their priv spec attributes by
+ riscv_get_priv_spec_class_from_numbers. Report warning rather than
+ errors when linking objects with differnet priv spec versions. We do
+ know v1.9.1 may have conflicts to other versions, so report the
+ warning, too. After that, update the output priv spec version to the
+ newest one so far.
+
+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