From: Kito Cheng <kito.cheng@sifive.com>
Date: Thu, 10 Apr 2025 08:58:49 +0000 (+0800)
Subject: RISC-V: Fix the behavior for multilib-generator with --cmodel=large on rv32
X-Git-Tag: releases/gcc-14.3.0~219
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb0653a0e54203eeb9ff399aee93ed904030b4bd;p=thirdparty%2Fgcc.git

RISC-V: Fix the behavior for multilib-generator with --cmodel=large on rv32

Large code model is only supported on RV64, so we don't need to
generate the multilibs for RV32 with --cmodel=large. And the compact
code model is something we don't supported on upstream (which is
accidentally added in the past), so we need to remove it.

gcc/ChangeLog:

	* config/riscv/multilib-generator: Remove the compact code model
	and check large code model for RV32.

(cherry picked from commit 72dff34bcdd6f05b64bbf07739ab815e673b5946)
---

diff --git a/gcc/config/riscv/multilib-generator b/gcc/config/riscv/multilib-generator
index 25cb6762ea7..d1dcbf732fa 100755
--- a/gcc/config/riscv/multilib-generator
+++ b/gcc/config/riscv/multilib-generator
@@ -159,8 +159,8 @@ for cmodel in cmodels:
              "e.g. rv32imafd-ilp32--" % cfg)
       sys.exit(1)
 
-    # Compact code model only support rv64.
-    if cmodel == "compact" and arch.startswith("rv32"):
+    # Large code model only support rv64.
+    if cmodel == "large" and arch.startswith("rv32"):
       continue
 
     arch = arch_canonicalize (arch, args.misa_spec)