Pushed, thanks!
On Sun, May 22, 2022 at 5:30 PM Tsukasa OI via Gcc-patches <gcc-patches@gcc.gnu.org> wrote: > > This commit fixes canonical extension order to follow the RISC-V ISA > Manual draft-20210402-1271737 or later. > > gcc/ChangeLog: > > * common/config/riscv/riscv-common.cc (riscv_supported_std_ext): > Fix "K" extension prefix to be placed before "J". > * config/riscv/arch-canonicalize: Likewise. > > Signed-off-by: Tsukasa OI <research_tra...@irq.a4lg.com> > --- > gcc/common/config/riscv/riscv-common.cc | 2 +- > gcc/config/riscv/arch-canonicalize | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/gcc/common/config/riscv/riscv-common.cc > b/gcc/common/config/riscv/riscv-common.cc > index 1501242e296..0b0ec2c4ec5 100644 > --- a/gcc/common/config/riscv/riscv-common.cc > +++ b/gcc/common/config/riscv/riscv-common.cc > @@ -594,7 +594,7 @@ riscv_subset_list::lookup (const char *subset, int > major_version, > static const char * > riscv_supported_std_ext (void) > { > - return "mafdqlcbjktpvn"; > + return "mafdqlcbkjtpvn"; > } > > /* Parsing subset version. > diff --git a/gcc/config/riscv/arch-canonicalize > b/gcc/config/riscv/arch-canonicalize > index 41bab69193c..71b2232b29e 100755 > --- a/gcc/config/riscv/arch-canonicalize > +++ b/gcc/config/riscv/arch-canonicalize > @@ -32,7 +32,7 @@ import itertools > from functools import reduce > > SUPPORTED_ISA_SPEC = ["2.2", "20190608", "20191213"] > -CANONICAL_ORDER = "imafdgqlcbjktpvn" > +CANONICAL_ORDER = "imafdgqlcbkjtpvn" > LONG_EXT_PREFIXES = ['z', 's', 'h', 'x'] > > # > -- > 2.34.1 >