From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7877) id 760123858D38; Sat, 18 Feb 2023 08:53:33 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 760123858D38 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1676710413; bh=8uAxRLZ6iQlJl+CGBx5kzQKtmxwOloxDM6qvX0Iw0Ts=; h=From:To:Subject:Date:From; b=p005YIHIb8VPQgTZDwWADKeAgMwVHa5HOlpu3l2TJ39GYCt9FxKVhidt3UhsR2suZ iwk8Mz44+g5o68wDkQODOtJBUlmMvVzaK1ujyq85SbJ3rqxuf656MBF1T6u6q2/yWU RSIhayAa76KDSyCCg0cePq6BbKkd1LM1MHF0o7bY= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: LuluCheng To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-6126] LoongArch: Fix multiarch tuple canonization X-Act-Checkin: gcc X-Git-Author: Xi Ruoyao X-Git-Refname: refs/heads/master X-Git-Oldrev: a7d8c40484c31a74a2c2bb17d835d60ba7dd8d29 X-Git-Newrev: 017849d9d88f021770a90f12fffec9aa2425ed27 Message-Id: <20230218085333.760123858D38@sourceware.org> Date: Sat, 18 Feb 2023 08:53:33 +0000 (GMT) List-Id: https://gcc.gnu.org/g:017849d9d88f021770a90f12fffec9aa2425ed27 commit r13-6126-g017849d9d88f021770a90f12fffec9aa2425ed27 Author: Xi Ruoyao Date: Mon Feb 13 18:38:53 2023 +0800 LoongArch: Fix multiarch tuple canonization Multiarch tuple will be coded in file or directory names in multiarch-aware distros, so one ABI should have only one multiarch tuple. For example, "--target=loongarch64-linux-gnu --with-abi=lp64s" and "--target=loongarch64-linux-gnusf" should both set multiarch tuple to "loongarch64-linux-gnusf". Before this commit, "--target=loongarch64-linux-gnu --with-abi=lp64s --disable-multilib" will produce wrong result (loongarch64-linux-gnu). A recent LoongArch psABI revision mandates "loongarch64-linux-gnu" to be used for -mabi=lp64d (instead of "loongarch64-linux-gnuf64") for some non-technical reason [1]. Note that we cannot make "loongarch64-linux-gnuf64" an alias for "loongarch64-linux-gnu" because to implement such an alias, we must create thousands of symlinks in the distro and doing so would be completely unpractical. This commit also aligns GCC with the revision. Tested by building cross compilers with --enable-multiarch and multiple combinations of --target=loongarch64-linux-gnu*, --with-abi=lp64{s,f,d}, and --{enable,disable}-multilib; and run "xgcc --print-multiarch" then manually verify the result with eyesight. [1]: https://github.com/loongson/LoongArch-Documentation/pull/80 gcc/ChangeLog: * config.gcc (triplet_abi): Set its value based on $with_abi, instead of $target. (la_canonical_triplet): Set it after $triplet_abi is set correctly. * config/loongarch/t-linux (MULTILIB_OSDIRNAMES): Make the multiarch tuple for lp64d "loongarch64-linux-gnu" (without "f64" suffix). Diff: --- gcc/config.gcc | 14 +++++++------- gcc/config/loongarch/t-linux | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gcc/config.gcc b/gcc/config.gcc index 067720ac795..c070e6ecd2e 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -4889,20 +4889,16 @@ case "${target}" in case ${target} in loongarch64-*-*-*f64) abi_pattern="lp64d" - triplet_abi="f64" ;; loongarch64-*-*-*f32) abi_pattern="lp64f" - triplet_abi="f32" ;; loongarch64-*-*-*sf) abi_pattern="lp64s" - triplet_abi="sf" ;; loongarch64-*-*-*) abi_pattern="lp64[dfs]" abi_default="lp64d" - triplet_abi="" ;; *) echo "Unsupported target ${target}." 1>&2 @@ -4923,9 +4919,6 @@ case "${target}" in ;; esac - la_canonical_triplet="loongarch64-${triplet_os}${triplet_abi}" - - # Perform initial sanity checks on --with-* options. case ${with_arch} in "" | loongarch64 | la464) ;; # OK, append here. @@ -4996,6 +4989,13 @@ case "${target}" in ;; esac + case ${with_abi} in + "lp64d") triplet_abi="";; + "lp64f") triplet_abi="f32";; + "lp64s") triplet_abi="sf";; + esac + la_canonical_triplet="loongarch64-${triplet_os}${triplet_abi}" + # Set default value for with_abiext (internal) case ${with_abiext} in "") diff --git a/gcc/config/loongarch/t-linux b/gcc/config/loongarch/t-linux index 131c45fdced..e40da179203 100644 --- a/gcc/config/loongarch/t-linux +++ b/gcc/config/loongarch/t-linux @@ -40,7 +40,7 @@ ifeq ($(filter LA_DISABLE_MULTILIB,$(tm_defines)),) MULTILIB_OSDIRNAMES = \ mabi.lp64d=../lib64$\ - $(call if_multiarch,:loongarch64-linux-gnuf64) + $(call if_multiarch,:loongarch64-linux-gnu) MULTILIB_OSDIRNAMES += \ mabi.lp64f=../lib64/f32$\