18 files changed, 96 insertions, 4 deletions
diff --git a/gas/testsuite/gas/elf/elf.exp b/gas/testsuite/gas/elf/elf.exp
index efd24f8b18e..d616d5de766 100644
--- a/gas/testsuite/gas/elf/elf.exp
+++ b/gas/testsuite/gas/elf/elf.exp
@@ -76,6 +76,9 @@ if { [is_elf_format] } then {
     if {[istarget "rx-*-*"]} then {
 	set target_machine -rx
     }
+    if {[istarget "riscv*-*-*"]} then {
+	set target_machine -riscv
+    }
     if {[istarget "v850*-*-*"]} then {
 	set target_machine -v850
     }
@@ -170,10 +173,16 @@ if { [is_elf_format] } then {
     if {! [istarget "h8300-*-*"]} then {
 	# The h8300 port issues a warning message for
 	# new sections created without atrributes.
-	if  { [istarget "i*86-*-*"] || [istarget "x86_64-*-*"] } then {
-	    run_elf_list_test "section2" "$target_machine" "-al -mx86-used-note=no" "-s" ""
-	} {
-	    run_elf_list_test "section2" "$target_machine" "-al" "-s" ""
+	case $target_triplet in {
+	    { i*86-*-* x86_64-*-* } {
+		run_elf_list_test "section2" "$target_machine" "-al -mx86-used-note=no" "-s" ""
+	    }
+	    { riscv*-*-* } {
+		run_elf_list_test "section2" "$target_machine" "-al -march-attr" "-s" ""
+	    }
+	    default {
+		run_elf_list_test "section2" "$target_machine" "-al" "-s" ""
+	    }
 	}
     }
     run_dump_test "section3"
diff --git a/gas/testsuite/gas/elf/section2.e-riscv b/gas/testsuite/gas/elf/section2.e-riscv
new file mode 100644
index 00000000000..115bae2173d
--- /dev/null
+++ b/gas/testsuite/gas/elf/section2.e-riscv
@@ -0,0 +1,9 @@
+
+Symbol table '.symtab' contains 6 entries:
+ +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
+ +0: 0+0 +0 +NOTYPE +LOCAL +DEFAULT +UND 
+ +1: 0+0 +0 +SECTION +LOCAL +DEFAULT +1 
+ +2: 0+0 +0 +SECTION +LOCAL +DEFAULT +2 
+ +3: 0+0 +0 +SECTION +LOCAL +DEFAULT +3 
+ +4: 0+0 +0 +SECTION +LOCAL +DEFAULT +4 
+ +5: 0+0 +0 +SECTION +LOCAL +DEFAULT +5 
diff --git a/gas/testsuite/gas/riscv/attribute-01.d b/gas/testsuite/gas/riscv/attribute-01.d
new file mode 100644
index 00000000000..e22773e22b8
--- /dev/null
+++ b/gas/testsuite/gas/riscv/attribute-01.d
@@ -0,0 +1,6 @@
+#as: -march=rv32g -march-attr
+#readelf: -A
+#source: empty.s
+Attribute Section: riscv
+File Attributes
+  Tag_RISCV_arch: "rv32i2p0_m2p0_a2p0_f2p0_d2p0"
diff --git a/gas/testsuite/gas/riscv/attribute-02.d b/gas/testsuite/gas/riscv/attribute-02.d
new file mode 100644
index 00000000000..bc3295be7ef
--- /dev/null
+++ b/gas/testsuite/gas/riscv/attribute-02.d
@@ -0,0 +1,6 @@
+#as: -march=rv32gxargle -march-attr
+#readelf: -A
+#source: empty.s
+Attribute Section: riscv
+File Attributes
+  Tag_RISCV_arch: "rv32i2p0_m2p0_a2p0_f2p0_d2p0_xargle2p0"
diff --git a/gas/testsuite/gas/riscv/attribute-03.d b/gas/testsuite/gas/riscv/attribute-03.d
new file mode 100644
index 00000000000..78b706a73ad
--- /dev/null
+++ b/gas/testsuite/gas/riscv/attribute-03.d
@@ -0,0 +1,6 @@
+#as: -march=rv32gxargle_xfoo -march-attr
+#readelf: -A
+#source: empty.s
+Attribute Section: riscv
+File Attributes
+  Tag_RISCV_arch: "rv32i2p0_m2p0_a2p0_f2p0_d2p0_xargle2p0_xfoo2p0"
diff --git a/gas/testsuite/gas/riscv/attribute-04.d b/gas/testsuite/gas/riscv/attribute-04.d
new file mode 100644
index 00000000000..c97bf03d5e4
--- /dev/null
+++ b/gas/testsuite/gas/riscv/attribute-04.d
@@ -0,0 +1,6 @@
+#as: -march-attr
+#readelf: -A
+#source: attribute-04.s
+Attribute Section: riscv
+File Attributes
+  Tag_RISCV_arch: "rv32i2p0_m2p0_a2p0_f2p0_d2p0"
diff --git a/gas/testsuite/gas/riscv/attribute-04.s b/gas/testsuite/gas/riscv/attribute-04.s
new file mode 100644
index 00000000000..26362277022
--- /dev/null
+++ b/gas/testsuite/gas/riscv/attribute-04.s
@@ -0,0 +1 @@
+	.attribute arch,"rv32g"
diff --git a/gas/testsuite/gas/riscv/attribute-05.d b/gas/testsuite/gas/riscv/attribute-05.d
new file mode 100644
index 00000000000..f9b65f206b7
--- /dev/null
+++ b/gas/testsuite/gas/riscv/attribute-05.d
@@ -0,0 +1,11 @@
+#as: -march-attr
+#readelf: -A
+#source: attribute-05.s
+Attribute Section: riscv
+File Attributes
+  Tag_RISCV_stack_align: 16-bytes
+  Tag_RISCV_arch: "rv32i2p0_m2p0_a2p0_f2p0_d2p0"
+  Tag_RISCV_unaligned_access: Unaligned access
+  Tag_RISCV_priv_spec: 1
+  Tag_RISCV_priv_spec_minor: 2
+  Tag_RISCV_priv_spec_revision: 3
diff --git a/gas/testsuite/gas/riscv/attribute-05.s b/gas/testsuite/gas/riscv/attribute-05.s
new file mode 100644
index 00000000000..3b3b7f6d561
--- /dev/null
+++ b/gas/testsuite/gas/riscv/attribute-05.s
@@ -0,0 +1,6 @@
+	.attribute arch, "rv32g"
+	.attribute priv_spec, 1
+	.attribute priv_spec_minor, 2
+	.attribute priv_spec_revision, 3
+	.attribute unaligned_access, 1
+	.attribute stack_align, 16
diff --git a/gas/testsuite/gas/riscv/attribute-06.d b/gas/testsuite/gas/riscv/attribute-06.d
new file mode 100644
index 00000000000..1abeb47383d
--- /dev/null
+++ b/gas/testsuite/gas/riscv/attribute-06.d
@@ -0,0 +1,6 @@
+#as: -march=rv32g2p0 -march-attr
+#readelf: -A
+#source: attribute-06.s
+Attribute Section: riscv
+File Attributes
+  Tag_RISCV_arch: "rv32i2p0"
diff --git a/gas/testsuite/gas/riscv/attribute-06.s b/gas/testsuite/gas/riscv/attribute-06.s
new file mode 100644
index 00000000000..de50251e908
--- /dev/null
+++ b/gas/testsuite/gas/riscv/attribute-06.s
@@ -0,0 +1 @@
+	.attribute arch, "rv32i"
diff --git a/gas/testsuite/gas/riscv/attribute-07.d b/gas/testsuite/gas/riscv/attribute-07.d
new file mode 100644
index 00000000000..dfd7e6bd6e5
--- /dev/null
+++ b/gas/testsuite/gas/riscv/attribute-07.d
@@ -0,0 +1,6 @@
+#as: -march=rv64g2p0 -march-attr
+#readelf: -A
+#source: attribute-07.s
+Attribute Section: riscv
+File Attributes
+  Tag_RISCV_arch: "rv64i2p0"
diff --git a/gas/testsuite/gas/riscv/attribute-07.s b/gas/testsuite/gas/riscv/attribute-07.s
new file mode 100644
index 00000000000..35e6ae3f2ed
--- /dev/null
+++ b/gas/testsuite/gas/riscv/attribute-07.s
@@ -0,0 +1 @@
+	.attribute arch, "rv64i"
diff --git a/gas/testsuite/gas/riscv/attribute-08.d b/gas/testsuite/gas/riscv/attribute-08.d
new file mode 100644
index 00000000000..c10ac0ca353
--- /dev/null
+++ b/gas/testsuite/gas/riscv/attribute-08.d
@@ -0,0 +1,6 @@
+#as: -march-attr
+#readelf: -A
+#source: attribute-08.s
+Attribute Section: riscv
+File Attributes
+  Tag_RISCV_arch: "rv32e1p9"
diff --git a/gas/testsuite/gas/riscv/attribute-08.s b/gas/testsuite/gas/riscv/attribute-08.s
new file mode 100644
index 00000000000..44e7a8da746
--- /dev/null
+++ b/gas/testsuite/gas/riscv/attribute-08.s
@@ -0,0 +1 @@
+	.attribute arch, "rv32e1p9"
diff --git a/gas/testsuite/gas/riscv/attribute-unknown.d b/gas/testsuite/gas/riscv/attribute-unknown.d
new file mode 100644
index 00000000000..667f21acfc1
--- /dev/null
+++ b/gas/testsuite/gas/riscv/attribute-unknown.d
@@ -0,0 +1,8 @@
+#as: -march-attr
+#readelf: -A
+#source: attribute-unknown.s
+Attribute Section: riscv
+File Attributes
+  Tag_RISCV_arch: [a-zA-Z0-9_\"].*
+  Tag_unknown_255: "test"
+  Tag_unknown_256: 123 \(0x7b\)
diff --git a/gas/testsuite/gas/riscv/attribute-unknown.s b/gas/testsuite/gas/riscv/attribute-unknown.s
new file mode 100644
index 00000000000..7e63a35551e
--- /dev/null
+++ b/gas/testsuite/gas/riscv/attribute-unknown.s
@@ -0,0 +1,2 @@
+	.attribute 255, "test"
+	.attribute 256, 123
diff --git a/gas/testsuite/gas/riscv/empty.l b/gas/testsuite/gas/riscv/empty.l
new file mode 100644
index 00000000000..8b137891791
--- /dev/null
+++ b/gas/testsuite/gas/riscv/empty.l
@@ -0,0 +1 @@
+