diff options
Diffstat (limited to 'gas/testsuite')
21 files changed, 32 insertions, 22 deletions
diff --git a/gas/testsuite/gas/riscv/attribute-02.d b/gas/testsuite/gas/riscv/attribute-02.d index ae0195e..45b89f2 100644 --- a/gas/testsuite/gas/riscv/attribute-02.d +++ b/gas/testsuite/gas/riscv/attribute-02.d @@ -1,6 +1,6 @@ -#as: -march=rv32gxargle -march-attr -misa-spec=2.2 +#as: -march=rv32gxargle2p0 -march-attr -misa-spec=2.2 #readelf: -A #source: empty.s Attribute Section: riscv File Attributes - Tag_RISCV_arch: "rv32i2p0_m2p0_a2p0_f2p0_d2p0_xargle0p0" + 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 index 9916ff6..11416d6 100644 --- a/gas/testsuite/gas/riscv/attribute-03.d +++ b/gas/testsuite/gas/riscv/attribute-03.d @@ -1,6 +1,6 @@ -#as: -march=rv32gxargle_xfoo -march-attr -misa-spec=2.2 +#as: -march=rv32gxargle2p0_xfoo3p0 -march-attr -misa-spec=2.2 #readelf: -A #source: empty.s Attribute Section: riscv File Attributes - Tag_RISCV_arch: "rv32i2p0_m2p0_a2p0_f2p0_d2p0_xargle0p0_xfoo0p0" + Tag_RISCV_arch: "rv32i2p0_m2p0_a2p0_f2p0_d2p0_xargle2p0_xfoo3p0" diff --git a/gas/testsuite/gas/riscv/attribute-09.d b/gas/testsuite/gas/riscv/attribute-09.d index cad1713..fc87f82 100644 --- a/gas/testsuite/gas/riscv/attribute-09.d +++ b/gas/testsuite/gas/riscv/attribute-09.d @@ -1,6 +1,6 @@ -#as: -march-attr -march=rv32i2p1m_zicsr -misa-spec=2.2 +#as: -march-attr -march=rv32i2p2m_zicsr -misa-spec=20191213 #readelf: -A #source: empty.s Attribute Section: riscv File Attributes - Tag_RISCV_arch: "rv32i2p1_m2p0_zicsr0p0" + Tag_RISCV_arch: "rv32i2p2_m2p0_zicsr2p0" diff --git a/gas/testsuite/gas/riscv/march-fail-base-01.l b/gas/testsuite/gas/riscv/march-fail-base-01.l index 9fa071f..45d5c9a 100644 --- a/gas/testsuite/gas/riscv/march-fail-base-01.l +++ b/gas/testsuite/gas/riscv/march-fail-base-01.l @@ -1,2 +1,2 @@ .*Assembler messages: -.*Fatal error: .*first ISA extension must be `e', `i' or `g' +.*Error: .*first ISA extension must be `e', `i' or `g' diff --git a/gas/testsuite/gas/riscv/march-fail-base-02.l b/gas/testsuite/gas/riscv/march-fail-base-02.l index 6fc4dfa..f6a3c1d 100644 --- a/gas/testsuite/gas/riscv/march-fail-base-02.l +++ b/gas/testsuite/gas/riscv/march-fail-base-02.l @@ -1,2 +1,2 @@ .*Assembler messages: -.*Fatal error: .*rv64e is not a valid base ISA +.*Error: .*rv64e is not a valid base ISA diff --git a/gas/testsuite/gas/riscv/march-fail-isa-spec.d b/gas/testsuite/gas/riscv/march-fail-isa-spec.d new file mode 100644 index 0000000..af707e2 --- /dev/null +++ b/gas/testsuite/gas/riscv/march-fail-isa-spec.d @@ -0,0 +1,3 @@ +#as: -march=rv32iln_zicsr_xargle_xbargle -misa-spec=20191213 +#source: empty.s +#error_output: march-fail-isa-spec.l diff --git a/gas/testsuite/gas/riscv/march-fail-isa-spec.l b/gas/testsuite/gas/riscv/march-fail-isa-spec.l new file mode 100644 index 0000000..e714ddf --- /dev/null +++ b/gas/testsuite/gas/riscv/march-fail-isa-spec.l @@ -0,0 +1,5 @@ +.*Assembler messages: +.*Error: cannot find default versions of the ISA extension `l' +.*Error: cannot find default versions of the ISA extension `n' +.*Error: x ISA extension `xargle' must be set with the versions +.*Error: x ISA extension `xbargle' must be set with the versions diff --git a/gas/testsuite/gas/riscv/march-fail-order-std.l b/gas/testsuite/gas/riscv/march-fail-order-std.l index 666a8c0..9e3ce5e 100644 --- a/gas/testsuite/gas/riscv/march-fail-order-std.l +++ b/gas/testsuite/gas/riscv/march-fail-order-std.l @@ -1,2 +1,2 @@ .*Assembler messages: -.*Fatal error: .*standard ISA extension `m' is not in canonical order +.*Error: .*standard ISA extension `m' is not in canonical order diff --git a/gas/testsuite/gas/riscv/march-fail-order-x.l b/gas/testsuite/gas/riscv/march-fail-order-x.l index f7b383d..025db14 100644 --- a/gas/testsuite/gas/riscv/march-fail-order-x.l +++ b/gas/testsuite/gas/riscv/march-fail-order-x.l @@ -1,2 +1,2 @@ .*Assembler messages: -.*Fatal error: .*x ISA extension `xargle' is not in alphabetical order. It must come before `xbargle' +.*Error: .*x ISA extension `xargle' is not in alphabetical order. It must come before `xbargle' diff --git a/gas/testsuite/gas/riscv/march-fail-order-z.l b/gas/testsuite/gas/riscv/march-fail-order-z.l index 1129219..a98c53a 100644 --- a/gas/testsuite/gas/riscv/march-fail-order-z.l +++ b/gas/testsuite/gas/riscv/march-fail-order-z.l @@ -1,2 +1,2 @@ .*Assembler messages: -.*Fatal error: .*z ISA extension `zicsr' is not in alphabetical order. It must come before `zifencei' +.*Error: .*z ISA extension `zicsr' is not in alphabetical order. It must come before `zifencei' diff --git a/gas/testsuite/gas/riscv/march-fail-porder.l b/gas/testsuite/gas/riscv/march-fail-porder.l index a06d586..c5496ea 100644 --- a/gas/testsuite/gas/riscv/march-fail-porder.l +++ b/gas/testsuite/gas/riscv/march-fail-porder.l @@ -1,2 +1,2 @@ .*Assembler messages: -.*Fatal error: .*unexpected ISA string at end:.* +.*Error: .*unexpected ISA string at end:.* diff --git a/gas/testsuite/gas/riscv/march-fail-rv32ef.l b/gas/testsuite/gas/riscv/march-fail-rv32ef.l index d2d915d..e6d93f2 100644 --- a/gas/testsuite/gas/riscv/march-fail-rv32ef.l +++ b/gas/testsuite/gas/riscv/march-fail-rv32ef.l @@ -1,2 +1,2 @@ .*Assembler messages: -.*Fatal error: .*rv32e does not support the `f' extension +.*Error: .*rv32e does not support the `f' extension diff --git a/gas/testsuite/gas/riscv/march-fail-rv32id.l b/gas/testsuite/gas/riscv/march-fail-rv32id.l index 29b2717..c5f990c 100644 --- a/gas/testsuite/gas/riscv/march-fail-rv32id.l +++ b/gas/testsuite/gas/riscv/march-fail-rv32id.l @@ -1,2 +1,2 @@ .*Assembler messages: -.*Fatal error: .*`d' extension requires `f' extension +.*Error: .*`d' extension requires `f' extension diff --git a/gas/testsuite/gas/riscv/march-fail-rv32iq.l b/gas/testsuite/gas/riscv/march-fail-rv32iq.l index 361c381..8143dd4 100644 --- a/gas/testsuite/gas/riscv/march-fail-rv32iq.l +++ b/gas/testsuite/gas/riscv/march-fail-rv32iq.l @@ -1,2 +1,3 @@ .*Assembler messages: -.*Fatal error: .*rv32 does not support the `q' extension +.*Error: .*rv32 does not support the `q' extension +.*Error: .*`q' extension requires `d' extension diff --git a/gas/testsuite/gas/riscv/march-fail-rv64iq.l b/gas/testsuite/gas/riscv/march-fail-rv64iq.l index 76a4104..787f46d 100644 --- a/gas/testsuite/gas/riscv/march-fail-rv64iq.l +++ b/gas/testsuite/gas/riscv/march-fail-rv64iq.l @@ -1,2 +1,2 @@ .*Assembler messages: -.*Fatal error: .*`q' extension requires `d' extension +.*Error: .*`q' extension requires `d' extension diff --git a/gas/testsuite/gas/riscv/march-fail-single-char.l b/gas/testsuite/gas/riscv/march-fail-single-char.l index 6466e16..435d0b2 100644 --- a/gas/testsuite/gas/riscv/march-fail-single-char.l +++ b/gas/testsuite/gas/riscv/march-fail-single-char.l @@ -1,2 +1,2 @@ .*Assembler messages: -.*Fatal error: .*unknown (s|h|z|x) ISA extension `(s|h|z|x)' +.*Error: .*unknown (s|h|z|x) ISA extension `(s|h|z|x)' diff --git a/gas/testsuite/gas/riscv/march-fail-unknown-std.l b/gas/testsuite/gas/riscv/march-fail-unknown-std.l index cb85637..75cdda3 100644 --- a/gas/testsuite/gas/riscv/march-fail-unknown-std.l +++ b/gas/testsuite/gas/riscv/march-fail-unknown-std.l @@ -1,2 +1,2 @@ .*Assembler messages: -.*Fatal error: .*unknown standard ISA extension `[^eimafdqiglcbjtpvn]' +.*Error: .*unknown standard ISA extension `[^eimafdqiglcbjtpvn]' diff --git a/gas/testsuite/gas/riscv/march-fail-unknown.l b/gas/testsuite/gas/riscv/march-fail-unknown.l index 28a864d..874b8d4 100644 --- a/gas/testsuite/gas/riscv/march-fail-unknown.l +++ b/gas/testsuite/gas/riscv/march-fail-unknown.l @@ -1,2 +1,2 @@ .*Assembler messages: -.*Fatal error: .*unknown (s|h|z) ISA extension `(s|h|z)foo' +.*Error: .*unknown (s|h|z) ISA extension `(s|h|z)foo' diff --git a/gas/testsuite/gas/riscv/march-fail-uppercase.l b/gas/testsuite/gas/riscv/march-fail-uppercase.l index 292c18a..14f03d6 100644 --- a/gas/testsuite/gas/riscv/march-fail-uppercase.l +++ b/gas/testsuite/gas/riscv/march-fail-uppercase.l @@ -1,2 +1,2 @@ .*Assembler messages: -.*Fatal error: .*ISA string cannot contain uppercase letters +.*Error: .*ISA string cannot contain uppercase letters diff --git a/gas/testsuite/gas/riscv/march-fail-version.l b/gas/testsuite/gas/riscv/march-fail-version.l index b5d0b91..c7f8a4d 100644 --- a/gas/testsuite/gas/riscv/march-fail-version.l +++ b/gas/testsuite/gas/riscv/march-fail-version.l @@ -1,2 +1,3 @@ .*Assembler messages: -.*Fatal error: .*expect number after `2p' +.*Error: cannot find default versions of the ISA extension `p' +.*Error: .*expect number after `2p' diff --git a/gas/testsuite/gas/riscv/march-ok-two-nse.d b/gas/testsuite/gas/riscv/march-ok-two-nse.d index 0fe5037..e78cf9d 100644 --- a/gas/testsuite/gas/riscv/march-ok-two-nse.d +++ b/gas/testsuite/gas/riscv/march-ok-two-nse.d @@ -1,4 +1,4 @@ -#as: -march=rv32imafd_xargle_xbargle +#as: -march=rv32imafd_xargle2p0_xbargle3p0 #objdump: -dr #source: empty.s |