From: Jim Lin <jim@andestech.com>
Date: Fri, 10 Jul 2026 16:43:04 +0000 (-0600)
Subject: RISC-V: Don't drop multilibs matching the default march/mabi
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38d41abb75838df35493f150ef756846360b9543;p=thirdparty%2Fgcc.git

RISC-V: Don't drop multilibs matching the default march/mabi

A multilib entry that shares march/mabi with the default may
differ in other options such as mcmodel, so it is not equivalent
to the default multilib.  Stop returning false for these entries
in riscv_multi_lib_info_t::parse so they are still recorded.

gcc/ChangeLog:

	* common/config/riscv/riscv-common.cc
	(riscv_multi_lib_info_t::parse): Remove early-out for multilibs
	matching only the default march/mabi.
---

diff --git a/gcc/common/config/riscv/riscv-common.cc b/gcc/common/config/riscv/riscv-common.cc
index 783692076a7..2d56ba59f0e 100644
--- a/gcc/common/config/riscv/riscv-common.cc
+++ b/gcc/common/config/riscv/riscv-common.cc
@@ -1927,12 +1927,6 @@ riscv_multi_lib_info_t::parse (
 	  multi_lib_info->arch_str = itr->c_str () + strlen ("march=");
 	else if (prefixed_with (*itr, "mabi="))
 	  multi_lib_info->abi_str = itr->c_str () + strlen ("mabi=");
-
-	/* Skip this multi-lib if this configuration is exactly same as
-	   default multi-lib settings.  */
-      if (multi_lib_info->arch_str == default_arch_str
-	  && multi_lib_info->abi_str == default_abi_str)
-	return false;
     }
 
   multi_lib_info->subset_list =