RISC-V: Sync extension of canonical order with spec

The canonical order has been adjusted a little bit [1-2].  Fortunately, the
affected extensions haven't been ratified yet, so there's no real impact.
Although P doesn't have an upstream yet, to avoid forgetting to update the
canonical order in the future, I've decided to update it now while I still
remember it.

[1] https://github.com/riscv/riscv-isa-manual/pull/2903
[2] https://github.com/riscv/riscv-isa-manual/pull/2910

gcc/ChangeLog:

	* common/config/riscv/riscv-common.cc (riscv_supported_std_ext):
	Move 'v' before 'p' and drop 'n' to match the spec.
	* config/riscv/arch-canonicalize (CANONICAL_ORDER): Ditto.

diff --git a/gcc/common/config/riscv/riscv-common.cc b/gcc/common/config/riscv/riscv-common.cc
index 20f40fc662c74b9f7027273fd6b39f21145b1020..ed5d6839e92e86e00470844c895c27dd7be31f3a 100644 (file)
--- a/gcc/common/config/riscv/riscv-common.cc
+++ b/gcc/common/config/riscv/riscv-common.cc
@@ -798,7 +798,7 @@ riscv_subset_list::lookup (const char *subset, int major_version,
 static const char *
 riscv_supported_std_ext (void)
 {
-  return "mafdqlcbkjtpvnh";
+  return "mafdqlcbkjtvph";
 }
 
 /* Parsing subset version.

diff --git a/gcc/config/riscv/arch-canonicalize b/gcc/config/riscv/arch-canonicalize
index 4f45bc263410071078909925129418d407509753..97b4ea587dd70ade2a870e91f77dc212ea39b8c0 100755 (executable)
--- a/gcc/config/riscv/arch-canonicalize
+++ b/gcc/config/riscv/arch-canonicalize
@@ -30,7 +30,7 @@ import os
 from functools import reduce
 
 SUPPORTED_ISA_SPEC = ["2.2", "20190608", "20191213"]
-CANONICAL_ORDER = "imafdqlcbkjtpvnh"
+CANONICAL_ORDER = "imafdqlcbkjtvph"
 LONG_EXT_PREFIXES = ['z', 's', 'h', 'x']
 
 def parse_define_riscv_ext(content):