RISC-V: Merge ELF attribute for ld.
2019-01-16 Kito Cheng <kito@andestech.com>
Nelson Chu <nelson@andestech.com>
bfd/
* elfnn-riscv.c (in_subsets): New.
(out_subsets): Likewise.
(merged_subsets): Likewise.
(riscv_std_ext_p): Likewise.
(riscv_non_std_ext_p): Likewise.
(riscv_std_sv_ext_p): Likewise.
(riscv_non_std_sv_ext_p): Likewise.
(riscv_version_mismatch): Likewise.
(riscv_i_or_e_p): Likewise.
(riscv_merge_std_ext): Likewise.
(riscv_merge_non_std_and_sv_ext): Likewise.
(riscv_merge_arch_attr_info): Likewise.
(riscv_merge_attributes): Likewise.
(_bfd_riscv_elf_merge_private_bfd_data): Merge attribute.
ld/
* testsuite/ld-elf/orphan-region.d: XFAIL for RISC-V, because add new
section.
* testsuite/ld-riscv-elf/ld-riscv-elf.exp: Add new tests.
* testsuite/ld-riscv-elf/attr-merge-arch-01.d: New test.
* testsuite/ld-riscv-elf/attr-merge-arch-01a.s: Likewise.
* testsuite/ld-riscv-elf/attr-merge-arch-01b.s: Likewise.
* testsuite/ld-riscv-elf/attr-merge-arch-02.d: Likewise.
* testsuite/ld-riscv-elf/attr-merge-arch-02a.s: Likewise.
* testsuite/ld-riscv-elf/attr-merge-arch-02b.s: Likewise.
* testsuite/ld-riscv-elf/attr-merge-arch-03.d: Likewise.
* testsuite/ld-riscv-elf/attr-merge-arch-03a.s: Likewise.
* testsuite/ld-riscv-elf/attr-merge-arch-03b.s: Likewise.
* testsuite/ld-riscv-elf/attr-merge-arch-failed-01.d: Likewise.
* testsuite/ld-riscv-elf/attr-merge-arch-failed-01a.s: Likewise.
* testsuite/ld-riscv-elf/attr-merge-arch-failed-01b.s: Likewise.
* testsuite/ld-riscv-elf/attr-merge-priv-spec-a.s: Likewise.
* testsuite/ld-riscv-elf/attr-merge-priv-spec-b.s: Likewise.
* testsuite/ld-riscv-elf/attr-merge-priv-spec.d: Likewise.
* testsuite/ld-riscv-elf/attr-merge-stack-align-a.s: Likewise.
* testsuite/ld-riscv-elf/attr-merge-stack-align-b.s: Likewise.
* testsuite/ld-riscv-elf/attr-merge-stack-align-failed-a.s: Likewise.
* testsuite/ld-riscv-elf/attr-merge-stack-align-failed-b.s: Likewise.
* testsuite/ld-riscv-elf/attr-merge-stack-align-failed.d: Likewise.
* testsuite/ld-riscv-elf/attr-merge-stack-align.d: Likewise.
* testsuite/ld-riscv-elf/attr-merge-strict-align-01.d: Likewise.
* testsuite/ld-riscv-elf/attr-merge-strict-align-01a.s: Likewise.
* testsuite/ld-riscv-elf/attr-merge-strict-align-01b.s: Likewise.
* testsuite/ld-riscv-elf/attr-merge-strict-align-02.d: Likewise.
* testsuite/ld-riscv-elf/attr-merge-strict-align-02a.s: Likewise.
* testsuite/ld-riscv-elf/attr-merge-strict-align-02b.s: Likewise.
* testsuite/ld-riscv-elf/attr-merge-strict-align-03.d: Likewise.
* testsuite/ld-riscv-elf/attr-merge-strict-align-03a.s: Likewise.
* testsuite/ld-riscv-elf/attr-merge-strict-align-03b.s: Likewise.
* testsuite/ld-riscv-elf/attr-merge-strict-align-04.d: Likewise.
* testsuite/ld-riscv-elf/attr-merge-strict-align-04a.s: Likewise.
* testsuite/ld-riscv-elf/attr-merge-strict-align-04b.s: Likewise.
* testsuite/ld-riscv-elf/attr-merge-strict-align-05.d: Likewise.
* testsuite/ld-riscv-elf/attr-merge-strict-align-05a.s: Likewise.
* testsuite/ld-riscv-elf/attr-merge-strict-align-05b.s: Likewise.
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index cea6d70..529ac73 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,6 +1,21 @@
2019-01-16 Kito Cheng <kito@andestech.com>
Nelson Chu <nelson@andestech.com>
+ * elfnn-riscv.c (in_subsets): New.
+ (out_subsets): Likewise.
+ (merged_subsets): Likewise.
+ (riscv_std_ext_p): Likewise.
+ (riscv_non_std_ext_p): Likewise.
+ (riscv_std_sv_ext_p): Likewise.
+ (riscv_non_std_sv_ext_p): Likewise.
+ (riscv_version_mismatch): Likewise.
+ (riscv_i_or_e_p): Likewise.
+ (riscv_merge_std_ext): Likewise.
+ (riscv_merge_non_std_and_sv_ext): Likewise.
+ (riscv_merge_arch_attr_info): Likewise.
+ (riscv_merge_attributes): Likewise.
+ (_bfd_riscv_elf_merge_private_bfd_data): Merge attribute.
+
* elfnn-riscv.c (riscv_elf_obj_attrs_arg_type): New.
(elf_backend_obj_attrs_vendor): Define.
(elf_backend_obj_attrs_section_type): Likewise.
diff --git a/bfd/elfnn-riscv.c b/bfd/elfnn-riscv.c
index 5430f61..69cadaa 100644
--- a/bfd/elfnn-riscv.c
+++ b/bfd/elfnn-riscv.c
@@ -2663,6 +2663,420 @@
}
}
+/* The information of architecture attribute. */
+static riscv_subset_list_t in_subsets;
+static riscv_subset_list_t out_subsets;
+static riscv_subset_list_t merged_subsets;
+
+/* Predicator for standard extension. */
+
+static bfd_boolean
+riscv_std_ext_p (const char *name)
+{
+ return (strlen (name) == 1) && (name[0] != 'x') && (name[0] != 's');
+}
+
+/* Predicator for non-standard extension. */
+
+static bfd_boolean
+riscv_non_std_ext_p (const char *name)
+{
+ return (strlen (name) >= 2) && (name[0] == 'x');
+}
+
+/* Predicator for standard supervisor extension. */
+
+static bfd_boolean
+riscv_std_sv_ext_p (const char *name)
+{
+ return (strlen (name) >= 2) && (name[0] == 's') && (name[1] != 'x');
+}
+
+/* Predicator for non-standard supervisor extension. */
+
+static bfd_boolean
+riscv_non_std_sv_ext_p (const char *name)
+{
+ return (strlen (name) >= 3) && (name[0] == 's') && (name[1] == 'x');
+}
+
+/* Error handler when version mis-match. */
+
+static void
+riscv_version_mismatch (bfd *ibfd,
+ struct riscv_subset_t *in,
+ struct riscv_subset_t *out)
+{
+ _bfd_error_handler
+ (_("error: %pB: Mis-matched ISA version for '%s' exetension. "
+ "%d.%d vs %d.%d"),
+ ibfd, in->name,
+ in->major_version, in->minor_version,
+ out->major_version, out->minor_version);
+}
+
+/* Return true if subset is 'i' or 'e'. */
+
+static bfd_boolean
+riscv_i_or_e_p (bfd *ibfd,
+ const char *arch,
+ struct riscv_subset_t *subset)
+{
+ if ((strcasecmp (subset->name, "e") != 0)
+ && (strcasecmp (subset->name, "i") != 0))
+ {
+ _bfd_error_handler
+ (_("error: %pB: corrupted ISA string '%s'."
+ "first letter should be 'i' or 'e' but got '%s'."),
+ ibfd, arch, subset->name);
+ return FALSE;
+ }
+ return TRUE;
+}
+
+/* Merge standard extensions.
+
+ Return Value:
+ Return FALSE if failed to merge.
+
+ Arguments:
+ `bfd`: bfd handler.
+ `in_arch`: Raw arch string for input object.
+ `out_arch`: Raw arch string for output object.
+ `pin`: subset list for input object, and it'll skip all merged subset after
+ merge.
+ `pout`: Like `pin`, but for output object. */
+
+static bfd_boolean
+riscv_merge_std_ext (bfd *ibfd,
+ const char *in_arch,
+ const char *out_arch,
+ struct riscv_subset_t **pin,
+ struct riscv_subset_t **pout)
+{
+ const char *standard_exts = riscv_supported_std_ext ();
+ const char *p;
+ struct riscv_subset_t *in = *pin;
+ struct riscv_subset_t *out = *pout;
+
+ /* First letter should be 'i' or 'e'. */
+ if (!riscv_i_or_e_p (ibfd, in_arch, in))
+ return FALSE;
+
+ if (!riscv_i_or_e_p (ibfd, out_arch, out))
+ return FALSE;
+
+ if (in->name[0] != out->name[0])
+ {
+ /* TODO: We might allow merge 'i' with 'e'. */
+ _bfd_error_handler
+ (_("error: %pB: Mis-matched ISA string to merge '%s' and '%s'."),
+ ibfd, in->name, out->name);
+ return FALSE;
+ }
+ else if ((in->major_version != out->major_version) ||
+ (in->minor_version != out->minor_version))
+ {
+ /* TODO: Allow different merge policy. */
+ riscv_version_mismatch (ibfd, in, out);
+ return FALSE;
+ }
+ else
+ riscv_add_subset (&merged_subsets,
+ in->name, in->major_version, in->minor_version);
+
+ in = in->next;
+ out = out->next;
+
+ /* Handle standard extension first. */
+ for (p = standard_exts; *p; ++p)
+ {
+ char find_ext[2] = {*p, '\0'};
+ struct riscv_subset_t *find_in =
+ riscv_lookup_subset (&in_subsets, find_ext);
+ struct riscv_subset_t *find_out =
+ riscv_lookup_subset (&out_subsets, find_ext);
+
+ if (find_in == NULL && find_out == NULL)
+ continue;
+
+ /* Check version is same or not. */
+ /* TODO: Allow different merge policy. */
+ if ((find_in != NULL && find_out != NULL)
+ && ((find_in->major_version != find_out->major_version)
+ || (find_in->minor_version != find_out->minor_version)))
+ {
+ riscv_version_mismatch (ibfd, in, out);
+ return FALSE;
+ }
+
+ struct riscv_subset_t *merged = find_in ? find_in : find_out;
+ riscv_add_subset (&merged_subsets, merged->name,
+ merged->major_version, merged->minor_version);
+ }
+
+ /* Skip all standard extensions. */
+ while ((in != NULL) && riscv_std_ext_p (in->name)) in = in->next;
+ while ((out != NULL) && riscv_std_ext_p (out->name)) out = out->next;
+
+ *pin = in;
+ *pout = out;
+
+ return TRUE;
+}
+
+/* Merge non-standard and supervisor extensions.
+ Return Value:
+ Return FALSE if failed to merge.
+
+ Arguments:
+ `bfd`: bfd handler.
+ `in_arch`: Raw arch string for input object.
+ `out_arch`: Raw arch string for output object.
+ `pin`: subset list for input object, and it'll skip all merged subset after
+ merge.
+ `pout`: Like `pin`, but for output object. */
+
+static bfd_boolean
+riscv_merge_non_std_and_sv_ext (bfd *ibfd,
+ riscv_subset_t **pin,
+ riscv_subset_t **pout,
+ bfd_boolean (*predicate_func) (const char *))
+{
+ riscv_subset_t *in = *pin;
+ riscv_subset_t *out = *pout;
+
+ for (in = *pin; in != NULL && predicate_func (in->name); in = in->next)
+ riscv_add_subset (&merged_subsets, in->name, in->major_version,
+ in->minor_version);
+
+ for (out = *pout; out != NULL && predicate_func (out->name); out = out->next)
+ {
+ riscv_subset_t *find_ext =
+ riscv_lookup_subset (&merged_subsets, out->name);
+ if (find_ext != NULL)
+ {
+ /* Check version is same or not. */
+ /* TODO: Allow different merge policy. */
+ if ((find_ext->major_version != out->major_version)
+ || (find_ext->minor_version != out->minor_version))
+ {
+ riscv_version_mismatch (ibfd, find_ext, out);
+ return FALSE;
+ }
+ }
+ else
+ riscv_add_subset (&merged_subsets, out->name,
+ out->major_version, out->minor_version);
+ }
+
+ *pin = in;
+ *pout = out;
+ return TRUE;
+}
+
+/* Merge Tag_RISCV_arch attribute. */
+
+static char *
+riscv_merge_arch_attr_info (bfd *ibfd, char *in_arch, char *out_arch)
+{
+ riscv_subset_t *in, *out;
+ char *merged_arch_str;
+
+ unsigned xlen_in, xlen_out;
+ merged_subsets.head = NULL;
+ merged_subsets.tail = NULL;
+
+ riscv_parse_subset_t rpe_in;
+ riscv_parse_subset_t rpe_out;
+
+ rpe_in.subset_list = &in_subsets;
+ rpe_in.error_handler = _bfd_error_handler;
+ rpe_in.xlen = &xlen_in;
+
+ rpe_out.subset_list = &out_subsets;
+ rpe_out.error_handler = _bfd_error_handler;
+ rpe_out.xlen = &xlen_out;
+
+ if (in_arch == NULL && out_arch == NULL)
+ return NULL;
+
+ if (in_arch == NULL && out_arch != NULL)
+ return out_arch;
+
+ if (in_arch != NULL && out_arch == NULL)
+ return in_arch;
+
+ /* Parse subset from arch string. */
+ if (!riscv_parse_subset (&rpe_in, in_arch))
+ return NULL;
+
+ if (!riscv_parse_subset (&rpe_out, out_arch))
+ return NULL;
+
+ /* Checking XLEN. */
+ if (xlen_out != xlen_in)
+ {
+ _bfd_error_handler
+ (_("error: %pB: ISA string of input (%s) doesn't match "
+ "output (%s)."), ibfd, in_arch, out_arch);
+ return NULL;
+ }
+
+ /* Merge subset list. */
+ in = in_subsets.head;
+ out = out_subsets.head;
+
+ /* Merge standard extension. */
+ if (!riscv_merge_std_ext (ibfd, in_arch, out_arch, &in, &out))
+ return NULL;
+ /* Merge non-standard extension. */
+ if (!riscv_merge_non_std_and_sv_ext (ibfd, &in, &out, riscv_non_std_ext_p))
+ return NULL;
+ /* Merge standard supervisor extension. */
+ if (!riscv_merge_non_std_and_sv_ext (ibfd, &in, &out, riscv_std_sv_ext_p))
+ return NULL;
+ /* Merge non-standard supervisor extension. */
+ if (!riscv_merge_non_std_and_sv_ext (ibfd, &in, &out, riscv_non_std_sv_ext_p))
+ return NULL;
+
+ if (xlen_in != xlen_out)
+ {
+ _bfd_error_handler
+ (_("error: %pB: XLEN of input (%u) doesn't match "
+ "output (%u)."), ibfd, xlen_in, xlen_out);
+ return NULL;
+ }
+
+ if (xlen_in != ARCH_SIZE)
+ {
+ _bfd_error_handler
+ (_("error: %pB: Unspported XLEN (%u), you might"
+ "using wrong emulation."), ibfd, xlen_in);
+ return NULL;
+ }
+
+ merged_arch_str = riscv_arch_str (ARCH_SIZE, &merged_subsets);
+
+ /* Release the subset lists. */
+ riscv_release_subset_list (&in_subsets);
+ riscv_release_subset_list (&out_subsets);
+ riscv_release_subset_list (&merged_subsets);
+
+ return merged_arch_str;
+}
+
+/* Merge object attributes from IBFD into output_bfd of INFO.
+ Raise an error if there are conflicting attributes. */
+
+static bfd_boolean
+riscv_merge_attributes (bfd *ibfd, struct bfd_link_info *info)
+{
+ bfd *obfd = info->output_bfd;
+ obj_attribute *in_attr;
+ obj_attribute *out_attr;
+ bfd_boolean result = TRUE;
+ const char *sec_name = get_elf_backend_data (ibfd)->obj_attrs_section;
+ unsigned int i;
+
+ /* Skip linker created files. */
+ if (ibfd->flags & BFD_LINKER_CREATED)
+ return TRUE;
+
+ /* Skip any input that doesn't have an attribute section.
+ This enables to link object files without attribute section with
+ any others. */
+ if (bfd_get_section_by_name (ibfd, sec_name) == NULL)
+ return TRUE;
+
+ if (!elf_known_obj_attributes_proc (obfd)[0].i)
+ {
+ /* This is the first object. Copy the attributes. */
+ _bfd_elf_copy_obj_attributes (ibfd, obfd);
+
+ out_attr = elf_known_obj_attributes_proc (obfd);
+
+ /* Use the Tag_null value to indicate the attributes have been
+ initialized. */
+ out_attr[0].i = 1;
+
+ return TRUE;
+ }
+
+ in_attr = elf_known_obj_attributes_proc (ibfd);
+ out_attr = elf_known_obj_attributes_proc (obfd);
+
+ for (i = LEAST_KNOWN_OBJ_ATTRIBUTE; i < NUM_KNOWN_OBJ_ATTRIBUTES; i++)
+ {
+ switch (i)
+ {
+ case Tag_RISCV_arch:
+ if (!out_attr[Tag_RISCV_arch].s)
+ out_attr[Tag_RISCV_arch].s = in_attr[Tag_RISCV_arch].s;
+ else if (in_attr[Tag_RISCV_arch].s
+ && out_attr[Tag_RISCV_arch].s)
+ {
+ /* Check arch compatible. */
+ char *merged_arch =
+ riscv_merge_arch_attr_info (ibfd,
+ in_attr[Tag_RISCV_arch].s,
+ out_attr[Tag_RISCV_arch].s);
+ if (merged_arch == NULL)
+ {
+ result = FALSE;
+ out_attr[Tag_RISCV_arch].s = "";
+ }
+ else
+ out_attr[Tag_RISCV_arch].s = merged_arch;
+ }
+ break;
+ case Tag_RISCV_priv_spec:
+ case Tag_RISCV_priv_spec_minor:
+ case Tag_RISCV_priv_spec_revision:
+ if (out_attr[i].i != in_attr[i].i)
+ {
+ _bfd_error_handler
+ (_("error: %pB: conflicting priv spec version "
+ "(major/minor/revision)."), ibfd);
+ result = FALSE;
+ }
+ break;
+ case Tag_RISCV_unaligned_access:
+ out_attr[i].i |= in_attr[i].i;
+ break;
+ case Tag_RISCV_stack_align:
+ if (out_attr[i].i == 0)
+ out_attr[i].i = in_attr[i].i;
+ else if (in_attr[i].i != 0
+ && out_attr[i].i != 0
+ && out_attr[i].i != in_attr[i].i)
+ {
+ _bfd_error_handler
+ (_("error: %pB use %u-byte stack aligned but the output "
+ "use %u-byte stack aligned."),
+ ibfd, in_attr[i].i, out_attr[i].i);
+ result = FALSE;
+ }
+ break;
+ default:
+ result &= _bfd_elf_merge_unknown_attribute_low (ibfd, obfd, i);
+ }
+
+ /* If out_attr was copied from in_attr then it won't have a type yet. */
+ if (in_attr[i].type && !out_attr[i].type)
+ out_attr[i].type = in_attr[i].type;
+ }
+
+ /* Merge Tag_compatibility attributes and any common GNU ones. */
+ if (!_bfd_elf_merge_object_attributes (ibfd, info))
+ return FALSE;
+
+ /* Check for any attributes not known on RISC-V. */
+ result &= _bfd_elf_merge_unknown_attribute_list (ibfd, obfd);
+
+ return result;
+}
+
/* Merge backend specific data from an object file to the output
object file when linking. */
@@ -2688,6 +3102,9 @@
if (!_bfd_elf_merge_object_attributes (ibfd, info))
return FALSE;
+ if (!riscv_merge_attributes (ibfd, info))
+ return FALSE;
+
if (! elf_flags_init (obfd))
{
elf_flags_init (obfd) = TRUE;
diff --git a/ld/ChangeLog b/ld/ChangeLog
index ba5b0e9..cde82e3 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,45 @@
+2019-01-16 Kito Cheng <kito@andestech.com>
+
+ * testsuite/ld-elf/orphan-region.d: XFAIL for RISC-V, because add new
+ section.
+ * testsuite/ld-riscv-elf/ld-riscv-elf.exp: Add new tests.
+ * testsuite/ld-riscv-elf/attr-merge-arch-01.d: New test.
+ * testsuite/ld-riscv-elf/attr-merge-arch-01a.s: Likewise.
+ * testsuite/ld-riscv-elf/attr-merge-arch-01b.s: Likewise.
+ * testsuite/ld-riscv-elf/attr-merge-arch-02.d: Likewise.
+ * testsuite/ld-riscv-elf/attr-merge-arch-02a.s: Likewise.
+ * testsuite/ld-riscv-elf/attr-merge-arch-02b.s: Likewise.
+ * testsuite/ld-riscv-elf/attr-merge-arch-03.d: Likewise.
+ * testsuite/ld-riscv-elf/attr-merge-arch-03a.s: Likewise.
+ * testsuite/ld-riscv-elf/attr-merge-arch-03b.s: Likewise.
+ * testsuite/ld-riscv-elf/attr-merge-arch-failed-01.d: Likewise.
+ * testsuite/ld-riscv-elf/attr-merge-arch-failed-01a.s: Likewise.
+ * testsuite/ld-riscv-elf/attr-merge-arch-failed-01b.s: Likewise.
+ * testsuite/ld-riscv-elf/attr-merge-priv-spec-a.s: Likewise.
+ * testsuite/ld-riscv-elf/attr-merge-priv-spec-b.s: Likewise.
+ * testsuite/ld-riscv-elf/attr-merge-priv-spec.d: Likewise.
+ * testsuite/ld-riscv-elf/attr-merge-stack-align-a.s: Likewise.
+ * testsuite/ld-riscv-elf/attr-merge-stack-align-b.s: Likewise.
+ * testsuite/ld-riscv-elf/attr-merge-stack-align-failed-a.s: Likewise.
+ * testsuite/ld-riscv-elf/attr-merge-stack-align-failed-b.s: Likewise.
+ * testsuite/ld-riscv-elf/attr-merge-stack-align-failed.d: Likewise.
+ * testsuite/ld-riscv-elf/attr-merge-stack-align.d: Likewise.
+ * testsuite/ld-riscv-elf/attr-merge-strict-align-01.d: Likewise.
+ * testsuite/ld-riscv-elf/attr-merge-strict-align-01a.s: Likewise.
+ * testsuite/ld-riscv-elf/attr-merge-strict-align-01b.s: Likewise.
+ * testsuite/ld-riscv-elf/attr-merge-strict-align-02.d: Likewise.
+ * testsuite/ld-riscv-elf/attr-merge-strict-align-02a.s: Likewise.
+ * testsuite/ld-riscv-elf/attr-merge-strict-align-02b.s: Likewise.
+ * testsuite/ld-riscv-elf/attr-merge-strict-align-03.d: Likewise.
+ * testsuite/ld-riscv-elf/attr-merge-strict-align-03a.s: Likewise.
+ * testsuite/ld-riscv-elf/attr-merge-strict-align-03b.s: Likewise.
+ * testsuite/ld-riscv-elf/attr-merge-strict-align-04.d: Likewise.
+ * testsuite/ld-riscv-elf/attr-merge-strict-align-04a.s: Likewise.
+ * testsuite/ld-riscv-elf/attr-merge-strict-align-04b.s: Likewise.
+ * testsuite/ld-riscv-elf/attr-merge-strict-align-05.d: Likewise.
+ * testsuite/ld-riscv-elf/attr-merge-strict-align-05a.s: Likewise.
+ * testsuite/ld-riscv-elf/attr-merge-strict-align-05b.s: Likewise.
+
2019-01-14 Maamoun Tarsha <maamountk@hotmail.com>
PR 20113
diff --git a/ld/testsuite/ld-riscv-elf/attr-merge-arch-01.d b/ld/testsuite/ld-riscv-elf/attr-merge-arch-01.d
new file mode 100644
index 0000000..5baaba4
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/attr-merge-arch-01.d
@@ -0,0 +1,9 @@
+#source: attr-merge-arch-01a.s
+#source: attr-merge-arch-01b.s
+#as:
+#ld: -r -melf32lriscv
+#readelf: -A
+
+Attribute Section: riscv
+File Attributes
+ Tag_RISCV_arch: "rv32i2p0_m2p0"
diff --git a/ld/testsuite/ld-riscv-elf/attr-merge-arch-01a.s b/ld/testsuite/ld-riscv-elf/attr-merge-arch-01a.s
new file mode 100644
index 0000000..acc98a5
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/attr-merge-arch-01a.s
@@ -0,0 +1 @@
+ .attribute arch, "rv32i2p0_m2p0"
diff --git a/ld/testsuite/ld-riscv-elf/attr-merge-arch-01b.s b/ld/testsuite/ld-riscv-elf/attr-merge-arch-01b.s
new file mode 100644
index 0000000..acc98a5
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/attr-merge-arch-01b.s
@@ -0,0 +1 @@
+ .attribute arch, "rv32i2p0_m2p0"
diff --git a/ld/testsuite/ld-riscv-elf/attr-merge-arch-02.d b/ld/testsuite/ld-riscv-elf/attr-merge-arch-02.d
new file mode 100644
index 0000000..a7d79a1
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/attr-merge-arch-02.d
@@ -0,0 +1,9 @@
+#source: attr-merge-arch-02a.s
+#source: attr-merge-arch-02b.s
+#as:
+#ld: -r -melf32lriscv
+#readelf: -A
+
+Attribute Section: riscv
+File Attributes
+ Tag_RISCV_arch: "rv32i2p0_m2p0"
diff --git a/ld/testsuite/ld-riscv-elf/attr-merge-arch-02a.s b/ld/testsuite/ld-riscv-elf/attr-merge-arch-02a.s
new file mode 100644
index 0000000..acc98a5
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/attr-merge-arch-02a.s
@@ -0,0 +1 @@
+ .attribute arch, "rv32i2p0_m2p0"
diff --git a/ld/testsuite/ld-riscv-elf/attr-merge-arch-02b.s b/ld/testsuite/ld-riscv-elf/attr-merge-arch-02b.s
new file mode 100644
index 0000000..65d0fef
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/attr-merge-arch-02b.s
@@ -0,0 +1 @@
+ .attribute arch, "rv32i2p0"
diff --git a/ld/testsuite/ld-riscv-elf/attr-merge-arch-03.d b/ld/testsuite/ld-riscv-elf/attr-merge-arch-03.d
new file mode 100644
index 0000000..d46dee8
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/attr-merge-arch-03.d
@@ -0,0 +1,9 @@
+#source: attr-merge-arch-03a.s
+#source: attr-merge-arch-03b.s
+#as:
+#ld: -r -melf32lriscv
+#readelf: -A
+
+Attribute Section: riscv
+File Attributes
+ Tag_RISCV_arch: "rv32i2p0_m2p0_xbar2p0_xfoo2p0"
diff --git a/ld/testsuite/ld-riscv-elf/attr-merge-arch-03a.s b/ld/testsuite/ld-riscv-elf/attr-merge-arch-03a.s
new file mode 100644
index 0000000..b86cc55
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/attr-merge-arch-03a.s
@@ -0,0 +1 @@
+ .attribute arch, "rv32i2p0_m2p0_xfoo2p0"
diff --git a/ld/testsuite/ld-riscv-elf/attr-merge-arch-03b.s b/ld/testsuite/ld-riscv-elf/attr-merge-arch-03b.s
new file mode 100644
index 0000000..376e373
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/attr-merge-arch-03b.s
@@ -0,0 +1 @@
+ .attribute arch, "rv32i2p0_xbar2p0"
diff --git a/ld/testsuite/ld-riscv-elf/attr-merge-arch-failed-01.d b/ld/testsuite/ld-riscv-elf/attr-merge-arch-failed-01.d
new file mode 100644
index 0000000..564687d
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/attr-merge-arch-failed-01.d
@@ -0,0 +1,5 @@
+#source: attr-merge-arch-failed-01a.s
+#source: attr-merge-arch-failed-01b.s
+#as: -march-attr
+#ld: -r -melf32lriscv
+#error: Mis-matched ISA version for 'm' exetension. 3.0 vs 2.0
diff --git a/ld/testsuite/ld-riscv-elf/attr-merge-arch-failed-01a.s b/ld/testsuite/ld-riscv-elf/attr-merge-arch-failed-01a.s
new file mode 100644
index 0000000..acc98a5
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/attr-merge-arch-failed-01a.s
@@ -0,0 +1 @@
+ .attribute arch, "rv32i2p0_m2p0"
diff --git a/ld/testsuite/ld-riscv-elf/attr-merge-arch-failed-01b.s b/ld/testsuite/ld-riscv-elf/attr-merge-arch-failed-01b.s
new file mode 100644
index 0000000..c9a590a
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/attr-merge-arch-failed-01b.s
@@ -0,0 +1 @@
+ .attribute arch, "rv32i2p0_m3p0"
diff --git a/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-a.s b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-a.s
new file mode 100644
index 0000000..1ad9500
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-a.s
@@ -0,0 +1,3 @@
+ .attribute priv_spec, 1
+ .attribute priv_spec_minor, 2
+ .attribute priv_spec_revision, 3
diff --git a/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-b.s b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-b.s
new file mode 100644
index 0000000..1ad9500
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-b.s
@@ -0,0 +1,3 @@
+ .attribute priv_spec, 1
+ .attribute priv_spec_minor, 2
+ .attribute priv_spec_revision, 3
diff --git a/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec.d b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec.d
new file mode 100644
index 0000000..dc4c4e0
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec.d
@@ -0,0 +1,12 @@
+#source: attr-merge-priv-spec-a.s
+#source: attr-merge-priv-spec-b.s
+#as: -march-attr
+#ld: -r
+#readelf: -A
+
+Attribute Section: riscv
+File Attributes
+ Tag_RISCV_arch: [a-zA-Z0-9_\"].*
+ Tag_RISCV_priv_spec: 1
+ Tag_RISCV_priv_spec_minor: 2
+ Tag_RISCV_priv_spec_revision: 3
diff --git a/ld/testsuite/ld-riscv-elf/attr-merge-stack-align-a.s b/ld/testsuite/ld-riscv-elf/attr-merge-stack-align-a.s
new file mode 100644
index 0000000..273d829
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/attr-merge-stack-align-a.s
@@ -0,0 +1 @@
+ .attribute stack_align, 16
diff --git a/ld/testsuite/ld-riscv-elf/attr-merge-stack-align-b.s b/ld/testsuite/ld-riscv-elf/attr-merge-stack-align-b.s
new file mode 100644
index 0000000..273d829
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/attr-merge-stack-align-b.s
@@ -0,0 +1 @@
+ .attribute stack_align, 16
diff --git a/ld/testsuite/ld-riscv-elf/attr-merge-stack-align-failed-a.s b/ld/testsuite/ld-riscv-elf/attr-merge-stack-align-failed-a.s
new file mode 100644
index 0000000..273d829
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/attr-merge-stack-align-failed-a.s
@@ -0,0 +1 @@
+ .attribute stack_align, 16
diff --git a/ld/testsuite/ld-riscv-elf/attr-merge-stack-align-failed-b.s b/ld/testsuite/ld-riscv-elf/attr-merge-stack-align-failed-b.s
new file mode 100644
index 0000000..73b7238
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/attr-merge-stack-align-failed-b.s
@@ -0,0 +1 @@
+ .attribute stack_align, 4
diff --git a/ld/testsuite/ld-riscv-elf/attr-merge-stack-align-failed.d b/ld/testsuite/ld-riscv-elf/attr-merge-stack-align-failed.d
new file mode 100644
index 0000000..917f06e
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/attr-merge-stack-align-failed.d
@@ -0,0 +1,5 @@
+#source: attr-merge-stack-align-failed-a.s
+#source: attr-merge-stack-align-failed-b.s
+#as:
+#ld: -r
+#error: .*use 4-byte stack aligned but the output use 16-byte stack aligned.
diff --git a/ld/testsuite/ld-riscv-elf/attr-merge-stack-align.d b/ld/testsuite/ld-riscv-elf/attr-merge-stack-align.d
new file mode 100644
index 0000000..7a5bc81
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/attr-merge-stack-align.d
@@ -0,0 +1,10 @@
+#source: attr-merge-stack-align-a.s
+#source: attr-merge-stack-align-b.s
+#as: -march-attr
+#ld: -r
+#readelf: -A
+
+Attribute Section: riscv
+File Attributes
+ Tag_RISCV_stack_align: 16-bytes
+ Tag_RISCV_arch: [a-zA-Z0-9_\"].*
diff --git a/ld/testsuite/ld-riscv-elf/attr-merge-strict-align-01.d b/ld/testsuite/ld-riscv-elf/attr-merge-strict-align-01.d
new file mode 100644
index 0000000..1039930
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/attr-merge-strict-align-01.d
@@ -0,0 +1,10 @@
+#source: attr-merge-strict-align-01a.s
+#source: attr-merge-strict-align-01b.s
+#as: -march-attr
+#ld: -r
+#readelf: -A
+
+Attribute Section: riscv
+File Attributes
+ Tag_RISCV_arch: [a-zA-Z0-9_\"].*
+ Tag_RISCV_unaligned_access: Unaligned access
diff --git a/ld/testsuite/ld-riscv-elf/attr-merge-strict-align-01a.s b/ld/testsuite/ld-riscv-elf/attr-merge-strict-align-01a.s
new file mode 100644
index 0000000..55ffc07
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/attr-merge-strict-align-01a.s
@@ -0,0 +1 @@
+ .attribute unaligned_access, 1
diff --git a/ld/testsuite/ld-riscv-elf/attr-merge-strict-align-01b.s b/ld/testsuite/ld-riscv-elf/attr-merge-strict-align-01b.s
new file mode 100644
index 0000000..55ffc07
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/attr-merge-strict-align-01b.s
@@ -0,0 +1 @@
+ .attribute unaligned_access, 1
diff --git a/ld/testsuite/ld-riscv-elf/attr-merge-strict-align-02.d b/ld/testsuite/ld-riscv-elf/attr-merge-strict-align-02.d
new file mode 100644
index 0000000..12ca1c4
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/attr-merge-strict-align-02.d
@@ -0,0 +1,10 @@
+#source: attr-merge-strict-align-02a.s
+#source: attr-merge-strict-align-02b.s
+#as: -march-attr
+#ld: -r
+#readelf: -A
+
+Attribute Section: riscv
+File Attributes
+ Tag_RISCV_arch: [a-zA-Z0-9_\"].*
+ Tag_RISCV_unaligned_access: Unaligned access
diff --git a/ld/testsuite/ld-riscv-elf/attr-merge-strict-align-02a.s b/ld/testsuite/ld-riscv-elf/attr-merge-strict-align-02a.s
new file mode 100644
index 0000000..55ffc07
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/attr-merge-strict-align-02a.s
@@ -0,0 +1 @@
+ .attribute unaligned_access, 1
diff --git a/ld/testsuite/ld-riscv-elf/attr-merge-strict-align-02b.s b/ld/testsuite/ld-riscv-elf/attr-merge-strict-align-02b.s
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/attr-merge-strict-align-02b.s
diff --git a/ld/testsuite/ld-riscv-elf/attr-merge-strict-align-03.d b/ld/testsuite/ld-riscv-elf/attr-merge-strict-align-03.d
new file mode 100644
index 0000000..e41351d
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/attr-merge-strict-align-03.d
@@ -0,0 +1,10 @@
+#source: attr-merge-strict-align-03a.s
+#source: attr-merge-strict-align-03b.s
+#as: -march-attr
+#ld: -r
+#readelf: -A
+
+Attribute Section: riscv
+File Attributes
+ Tag_RISCV_arch: [a-zA-Z0-9_\"].*
+ Tag_RISCV_unaligned_access: Unaligned access
diff --git a/ld/testsuite/ld-riscv-elf/attr-merge-strict-align-03a.s b/ld/testsuite/ld-riscv-elf/attr-merge-strict-align-03a.s
new file mode 100644
index 0000000..55ffc07
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/attr-merge-strict-align-03a.s
@@ -0,0 +1 @@
+ .attribute unaligned_access, 1
diff --git a/ld/testsuite/ld-riscv-elf/attr-merge-strict-align-03b.s b/ld/testsuite/ld-riscv-elf/attr-merge-strict-align-03b.s
new file mode 100644
index 0000000..a88149e
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/attr-merge-strict-align-03b.s
@@ -0,0 +1 @@
+ .attribute unaligned_access, 0
diff --git a/ld/testsuite/ld-riscv-elf/attr-merge-strict-align-04.d b/ld/testsuite/ld-riscv-elf/attr-merge-strict-align-04.d
new file mode 100644
index 0000000..ac2a766
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/attr-merge-strict-align-04.d
@@ -0,0 +1,9 @@
+#source: attr-merge-strict-align-04a.s
+#source: attr-merge-strict-align-04b.s
+#as: -march-attr
+#ld: -r
+#readelf: -A
+
+Attribute Section: riscv
+File Attributes
+ Tag_RISCV_arch: [a-zA-Z0-9_\"].*
diff --git a/ld/testsuite/ld-riscv-elf/attr-merge-strict-align-04a.s b/ld/testsuite/ld-riscv-elf/attr-merge-strict-align-04a.s
new file mode 100644
index 0000000..a88149e
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/attr-merge-strict-align-04a.s
@@ -0,0 +1 @@
+ .attribute unaligned_access, 0
diff --git a/ld/testsuite/ld-riscv-elf/attr-merge-strict-align-04b.s b/ld/testsuite/ld-riscv-elf/attr-merge-strict-align-04b.s
new file mode 100644
index 0000000..a88149e
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/attr-merge-strict-align-04b.s
@@ -0,0 +1 @@
+ .attribute unaligned_access, 0
diff --git a/ld/testsuite/ld-riscv-elf/attr-merge-strict-align-05.d b/ld/testsuite/ld-riscv-elf/attr-merge-strict-align-05.d
new file mode 100644
index 0000000..608c05e
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/attr-merge-strict-align-05.d
@@ -0,0 +1,10 @@
+#source: attr-merge-strict-align-05a.s
+#source: attr-merge-strict-align-05b.s
+#as: -march-attr
+#ld: -r
+#readelf: -A
+
+Attribute Section: riscv
+File Attributes
+ Tag_RISCV_arch: [a-zA-Z0-9_\"].*
+ Tag_RISCV_unaligned_access: Unaligned access
diff --git a/ld/testsuite/ld-riscv-elf/attr-merge-strict-align-05a.s b/ld/testsuite/ld-riscv-elf/attr-merge-strict-align-05a.s
new file mode 100644
index 0000000..55ffc07
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/attr-merge-strict-align-05a.s
@@ -0,0 +1 @@
+ .attribute unaligned_access, 1
diff --git a/ld/testsuite/ld-riscv-elf/attr-merge-strict-align-05b.s b/ld/testsuite/ld-riscv-elf/attr-merge-strict-align-05b.s
new file mode 100644
index 0000000..55ffc07
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/attr-merge-strict-align-05b.s
@@ -0,0 +1 @@
+ .attribute unaligned_access, 1
diff --git a/ld/testsuite/ld-riscv-elf/ld-riscv-elf.exp b/ld/testsuite/ld-riscv-elf/ld-riscv-elf.exp
index 0bedd5e..bce7bfe 100644
--- a/ld/testsuite/ld-riscv-elf/ld-riscv-elf.exp
+++ b/ld/testsuite/ld-riscv-elf/ld-riscv-elf.exp
@@ -24,6 +24,18 @@
run_dump_test "disas-jalr"
run_dump_test "pcrel-lo-addend"
run_dump_test "pcrel-lo-addend-2"
+ run_dump_test "attr-merge-arch-01"
+ run_dump_test "attr-merge-arch-02"
+ run_dump_test "attr-merge-arch-03"
+ run_dump_test "attr-merge-strict-align-01"
+ run_dump_test "attr-merge-strict-align-02"
+ run_dump_test "attr-merge-strict-align-03"
+ run_dump_test "attr-merge-strict-align-04"
+ run_dump_test "attr-merge-strict-align-05"
+ run_dump_test "attr-merge-stack-align"
+ run_dump_test "attr-merge-priv-spec"
+ run_dump_test "attr-merge-arch-failed-01"
+ run_dump_test "attr-merge-stack-align-failed"
run_ld_link_tests {
{ "Weak reference 32" "-T weakref.ld -melf32lriscv" ""
"-march=rv32i -mabi=ilp32" {weakref32.s}
