From: Kito Cheng <kito.cheng@sifive.com>
Date: Wed, 27 Oct 2021 15:41:17 +0000 (+0800)
Subject: RISC-V: Handle zi* extension correctly for arch-canonicalize script
X-Git-Tag: releases/gcc-11.3.0~145
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=330aff0a9f7be55b7bd1e0c420456b3d29e39c44;p=thirdparty%2Fgcc.git

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 --git a/gcc/config/riscv/arch-canonicalize b/gcc/config/riscv/arch-canonicalize
index ea95a0693f32..c7df3c8a3137 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']
 
 #