[gcc r11-9748] RISC-V: Handle zi* extension correctly for arch-canonicalize script

[gcc r11-9748] RISC-V: Handle zi* extension correctly for arch-canonicalize script

[Kito Cheng]

https://gcc.gnu.org/g:330aff0a9f7be55b7bd1e0c420456b3d29e39c44

commit r11-9748-g330aff0a9f7be55b7bd1e0c420456b3d29e39c44
Author: Kito Cheng <kito.cheng@sifive.com>
Date:   Wed Oct 27 23:41:17 2021 +0800

    RISC-V: Handle zi* extension correctly for arch-canonicalize script
    
    Canonical order for z-prefixed extension are rely on the canonical order of
    single letter extension, however we didn't put i into the list before,
    so when we put zicsr or zifencei it will got exception.
    
    gcc/ChangeLog:
    
            * config/riscv/arch-canonicalize (CANONICAL_ORDER): Add `i` to
            CANONICAL_ORDER.
    
    (cherry picked from commit e399cde6f9c89cafbbf6c3274c0af3c369d4f872)

Diff:
---
 gcc/config/riscv/arch-canonicalize | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gcc/config/riscv/arch-canonicalize b/gcc/config/riscv/arch-canonicalize
index ea95a0693f3..c7df3c8a313 100755
--- a/gcc/config/riscv/arch-canonicalize
+++ b/gcc/config/riscv/arch-canonicalize
@@ -28,7 +28,7 @@ import itertools
 from functools import reduce
 
 
-CANONICAL_ORDER = "mafdgqlcbjtpvn"
+CANONICAL_ORDER = "imafdgqlcbjtpvn"
 LONG_EXT_PREFIXES = ['z', 's', 'h', 'x']
 
 #