diff options
| -rw-r--r-- | gas/ChangeLog | 6 | ||||
| -rw-r--r-- | gas/config/tc-riscv.c | 18 |
2 files changed, 14 insertions, 10 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index 8ffba29fe76..11693d33182 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,9 @@ +2021-06-11 Nelson Chu <nelson.chu@sifive.com> + + * config/tc-riscv.c (riscv_set_arch): Call riscv_set_rvc + and riscv_set_rve both for -march and elf attributes. + (riscv_after_parse_args): Likewise. + 2021-06-10 Jan Beulich <jbeulich@suse.com> * config/tc-arm.c (do_bfloat_vfma): Rename index to idx. diff --git a/gas/config/tc-riscv.c b/gas/config/tc-riscv.c index 42e57529369..70cbc8190fe 100644 --- a/gas/config/tc-riscv.c +++ b/gas/config/tc-riscv.c @@ -417,6 +417,14 @@ riscv_set_arch (const char *s) riscv_release_subset_list (&riscv_subsets); riscv_parse_subset (&rps, s); + + /* To support .option rvc and rve. */ + riscv_set_rvc (false); + if (riscv_subset_supports ("c")) + riscv_set_rvc (true); + riscv_set_rve (false); + if (riscv_subset_supports ("e")) + riscv_set_rve (true); } /* Indicate -mabi option is explictly set. */ @@ -2945,16 +2953,6 @@ riscv_after_parse_args (void) riscv_set_arch (default_arch_with_ext); - /* Add the RVC extension, regardless of -march, to support .option rvc. */ - riscv_set_rvc (false); - if (riscv_subset_supports ("c")) - riscv_set_rvc (true); - - /* Enable RVE if specified by the -march option. */ - riscv_set_rve (false); - if (riscv_subset_supports ("e")) - riscv_set_rve (true); - /* If the CIE to be produced has not been overridden on the command line, then produce version 3 by default. This allows us to use the full range of registers in a .cfi_return_column directive. */ |