From patchwork Fri Dec 1 07:46:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Yujie X-Patchwork-Id: 81074 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 39AFE385AC37 for ; Fri, 1 Dec 2023 07:46:59 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by sourceware.org (Postfix) with ESMTP id 4DF9A3858CDB for ; Fri, 1 Dec 2023 07:46:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4DF9A3858CDB Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=loongson.cn Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=loongson.cn ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 4DF9A3858CDB Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=114.242.206.163 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701416801; cv=none; b=IYliEyKw4lnxhhVyW1SIu5Z/6j7fo5+gJeyOL3KU8auyYwwf8/BM3hkuG+ULuExpCnVq5FceCJfZA6JeX3CORVtKEKXzqB4zjsZ62mIUv+/1rB/sDizflHJ4LjfAVI4ka9WsDDBPjF0UqYpdTTkqd9/2JqWtKVRqhXK1CSDdkHc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701416801; c=relaxed/simple; bh=rZARusFwrp0kvlt/cb3ZAhQaDehc6y+lqB570U5Y8O8=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=Byx916Qa7DmSHDVYvt57SDx2stUcVUFE2bCfTJhX1lR9UIYUEjLw8+MIoJU/96+EZJK6MEimsjLagKuizDq4Z92CZq4iQ2tEi+84DW4NAxFabIwGnl1MsIq0cqMWVrAQZMymE7190zdPX4NOTveYRTTOJDeMqPSVczfx1oNjTuk= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from loongson.cn (unknown [114.243.104.185]) by gateway (Coremail) with SMTP id _____8AxEvBYj2llfiU+AA--.57877S3; Fri, 01 Dec 2023 15:46:32 +0800 (CST) Received: from localhost.localdomain (unknown [114.243.104.185]) by localhost.localdomain (Coremail) with SMTP id AQAAf8CxLC9Vj2ll52xRAA--.8882S3; Fri, 01 Dec 2023 15:46:32 +0800 (CST) From: Yang Yujie To: gcc-patches@gcc.gnu.org Cc: ibuclaw@gdcproject.org, chenglulu@loongson.cn, xuchenghua@loongson.cn, Yang Yujie Subject: [PATCH v2 1/3] LoongArch: Adjust D version strings. Date: Fri, 1 Dec 2023 15:46:24 +0800 Message-ID: <20231201074626.2943513-2-yangyujie@loongson.cn> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231201074626.2943513-1-yangyujie@loongson.cn> References: <20231201074626.2943513-1-yangyujie@loongson.cn> MIME-Version: 1.0 X-CM-TRANSID: AQAAf8CxLC9Vj2ll52xRAA--.8882S3 X-CM-SenderInfo: 51dqw5pxmlvqxorr0wxvrqhubq/1tbiAQAMAGVpQqsF8QAAsc X-Coremail-Antispam: 1Uk129KBj93XoWxXrWftrWkXFWxurWDGrWUKFX_yoW5ZFyrpr y7ur13uF4xJFZxZ3Z7K3sxX3Z8AryxG34xXF4akry8ua1UXryvg348tFWYgF4jyay5Cr4S vw18ta43Za1UJwcCm3ZEXasCq-sJn29KB7ZKAUJUUUU8529EdanIXcx71UUUUU7KY7ZEXa sCq-sGcSsGvfJ3Ic02F40EFcxC0VAKzVAqx4xG6I80ebIjqfuFe4nvWSU5nxnvy29KBjDU 0xBIdaVrnRJUUUkFb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I20VC2zVCF04k26cxKx2 IYs7xG6rWj6s0DM7CIcVAFz4kK6r1Y6r17M28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48v e4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_JFI_Gr1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI 0_Gr0_Cr1l84ACjcxK6I8E87Iv67AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVCY1x0267AK xVW8Jr0_Cr1UM2AIxVAIcxkEcVAq07x20xvEncxIr21l57IF6xkI12xvs2x26I8E6xACxx 1l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r106r15McIj6I8E87Iv 67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2 Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s02 6x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r1DMIIYrxkI7VAKI48JMIIF0x vE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r1j6r4UMIIF0xvE 42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6x kF7I0E14v26r1j6r4UYxBIdaVFxhVjvjDU0xZFpf9x07jUsqXUUUUU= X-Spam-Status: No, score=-10.5 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, RCVD_IN_BARRACUDACENTRAL, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org gcc/ChangeLog: * config/loongarch/loongarch-d.cc: Undefine LoongArch32. Define LoongArch_SF, LoongArch_F32, LoongArch_F64 gcc/d/ChangeLog: * dmd/cond.d: Same. * implement-d.texi: Same. --- gcc/config/loongarch/loongarch-d.cc | 27 ++++++++++++++------------- gcc/d/dmd/cond.d | 6 +++--- gcc/d/implement-d.texi | 6 ++++++ 3 files changed, 23 insertions(+), 16 deletions(-) diff --git a/gcc/config/loongarch/loongarch-d.cc b/gcc/config/loongarch/loongarch-d.cc index 9ac483c39a7..4692b78708a 100644 --- a/gcc/config/loongarch/loongarch-d.cc +++ b/gcc/config/loongarch/loongarch-d.cc @@ -29,24 +29,27 @@ along with GCC; see the file COPYING3. If not see void loongarch_d_target_versions (void) { - if (TARGET_64BIT) + if (TARGET_ABI_LP64) d_add_builtin_version ("LoongArch64"); - else - d_add_builtin_version ("LoongArch32"); - if (TARGET_HARD_FLOAT_ABI) + if (TARGET_DOUBLE_FLOAT_ABI) + { + d_add_builtin_version ("LoongArch_F64"); + d_add_builtin_version ("D_HardFloat"); + } + else if (TARGET_SINGLE_FLOAT_ABI) { - d_add_builtin_version ("LoongArch_HardFloat"); + d_add_builtin_version ("LoongArch_F32"); d_add_builtin_version ("D_HardFloat"); } - else if (TARGET_SOFT_FLOAT_ABI) + else { - d_add_builtin_version ("LoongArch_SoftFloat"); + d_add_builtin_version ("LoongArch_SF"); d_add_builtin_version ("D_SoftFloat"); } } -/* Handle a call to `__traits(getTargetInfo, "floatAbi")'. */ +/* Handle trait getTargetInfo with key "floatAbi" */ static tree loongarch_d_handle_target_float_abi (void) @@ -55,10 +58,8 @@ loongarch_d_handle_target_float_abi (void) if (TARGET_HARD_FLOAT_ABI) abi = "hard"; - else if (TARGET_SOFT_FLOAT_ABI) - abi = "soft"; else - abi = ""; + abi = "soft"; return build_string_literal (strlen (abi) + 1, abi); } @@ -69,8 +70,8 @@ void loongarch_d_register_target_info (void) { const struct d_target_info_spec handlers[] = { - {"floatAbi", loongarch_d_handle_target_float_abi}, - {NULL, NULL}, + { "floatAbi", loongarch_d_handle_target_float_abi }, + { NULL, NULL }, }; d_add_target_info_handlers (handlers); diff --git a/gcc/d/dmd/cond.d b/gcc/d/dmd/cond.d index 568b639e0b6..02af0cc9e29 100644 --- a/gcc/d/dmd/cond.d +++ b/gcc/d/dmd/cond.d @@ -693,10 +693,10 @@ extern (C++) final class VersionCondition : DVCondition case "LDC": case "linux": case "LittleEndian": - case "LoongArch32": case "LoongArch64": - case "LoongArch_HardFloat": - case "LoongArch_SoftFloat": + case "LoongArch_F64": + case "LoongArch_F32": + case "LoongArch_SF": case "MinGW": case "MIPS32": case "MIPS64": diff --git a/gcc/d/implement-d.texi b/gcc/d/implement-d.texi index 6f33bc192fe..cc0d1ecf593 100644 --- a/gcc/d/implement-d.texi +++ b/gcc/d/implement-d.texi @@ -1966,6 +1966,12 @@ Version relating to GNU Hurd systems. @item linux Version relating to Linux systems. +@item LoongArch64 +@item LoongArch_SF +@item LoongArch_F32 +@item LoongArch_F64 +Versions relating to the LoongArch family of processors. + @item MinGW Version relating to the MinGW environment.