aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTsukasa OI <research_trasio@irq.a4lg.com>2022-05-22 18:29:14 +0900
committerKito Cheng <kito.cheng@sifive.com>2022-05-23 10:50:25 +0800
commit075fb873c264a030f56793cb162c9fdecbdd1773 (patch)
treeb4ced2687b1068f7d3edc74489838564adeadb7b
parent657612fb9f58c9cca44b091e3cf40d704fe3ec75 (diff)
downloadgcc-075fb873c264a030f56793cb162c9fdecbdd1773.zip
gcc-075fb873c264a030f56793cb162c9fdecbdd1773.tar.gz
gcc-075fb873c264a030f56793cb162c9fdecbdd1773.tar.bz2
RISC-V: Fix canonical extension order (K and J)
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_trasio@irq.a4lg.com>
-rw-r--r--gcc/common/config/riscv/riscv-common.cc2
-rwxr-xr-xgcc/config/riscv/arch-canonicalize2
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 1501242..0b0ec2c 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 41bab69..71b2232 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']
#