From: Kito Cheng <kito.cheng@sifive.com>
Date: Mon, 15 May 2023 07:23:31 +0000 (+0800)
Subject: RISC-V: Fix wrong select_kind in riscv_compute_multilib
X-Git-Tag: releases/gcc-13.2.0~224
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=554aabc26786891ffb4d542c359eca0cef407ed1;p=thirdparty%2Fgcc.git

RISC-V: Fix wrong select_kind in riscv_compute_multilib

Seems like I screw up bare-metal toolchian multi lib selection during
finxing linux multi-lib selction...

gcc/ChangeLog:

	* common/config/riscv/riscv-common.cc (riscv_compute_multilib):
	Fix wrong select_kind...

(cherry picked from commit 008cbecf622a413ebcc8b41a737f30fd7e2a1abf)
---

diff --git a/gcc/common/config/riscv/riscv-common.cc b/gcc/common/config/riscv/riscv-common.cc
index fc2af72b7174..e19c0985ca0d 100644
--- a/gcc/common/config/riscv/riscv-common.cc
+++ b/gcc/common/config/riscv/riscv-common.cc
@@ -1777,11 +1777,11 @@ riscv_compute_multilib (
   switch (select_kind)
     {
     case select_by_abi:
-      return riscv_select_multilib (riscv_current_abi_str, subset_list,
-				    switches, n_switches, multilib_infos);
-    case select_by_abi_arch_cmodel:
       return riscv_select_multilib_by_abi (riscv_current_abi_str,
 					   multilib_infos);
+    case select_by_abi_arch_cmodel:
+      return riscv_select_multilib (riscv_current_abi_str, subset_list,
+				    switches, n_switches, multilib_infos);
     case select_by_builtin:
       gcc_unreachable ();
     default: