From patchwork Tue Jan 30 12:07:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arthur Cohen X-Patchwork-Id: 194098 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2087:b0:106:209c:c626 with SMTP id gs7csp1185173dyb; Tue, 30 Jan 2024 04:31:51 -0800 (PST) X-Google-Smtp-Source: AGHT+IGQGiu5DKwJqmURyQ8nBlZn1DBsPqkNKitH0I5Km+D6Obx30AZASd4X+tpLTyX3iD9nElIr X-Received: by 2002:ad4:5aeb:0:b0:685:d222:cf99 with SMTP id c11-20020ad45aeb000000b00685d222cf99mr9807486qvh.121.1706617910888; Tue, 30 Jan 2024 04:31:50 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706617910; cv=pass; d=google.com; s=arc-20160816; b=eStLxMPHn4nyxDyFp/VceG0O9DI/uB/6VD1ChDFxcGM/eAQGgvz8j1aSCMoNNsg2O7 tZRcVWddPXqnBzeY4/U5vzeINS40xHhHf/pXJWT/IYwLihIOURlD6DPjomd51IxZTVlY m8WeC/SL26Xtp6OElXZ+4G5LwPq3sYYdmQrWFK9g7HmKWc65F4Ebwb7a06y97xpkWlDm 2vW+rUaFC6PfL9PEeS3pRg9pZFq0bXbfhSdh9zb4dbXhbZd4yRKFlSYVG0MZElzCX2DP gWBZjg5tjZrrMYXfje/CDwQ/PayG6axdG4itjMxv/ySxY5j6eVNfhPkmKKFTnOEQM4oa 1VXg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:reply-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature:arc-filter:dmarc-filter:delivered-to; bh=7xZhBKU4DLD2oiNzGr23H8qWI0cAHkl/1jme2PufIfo=; fh=l06p/z5UT27+088UaGrnZSJk+7w7syaJEbG8CLKfrIk=; b=sF8i9J9L0qT4sLI0eb0Q+yjbdBFsBSokqO/WWYvSh4PWFVr6z0jMCG6zUg6XvrB8Jr Ua0f1pjyduwB2WaEJAi4lrRuPfHEqY5bNGcyGRTDGaKYsuNwdZyf16rA+fl3O2CBOTDk w1I+JJw1X7KVA94vFHh+IE3uUrWsiVxHkAeRCHLFITkyYZmSxD2g+fHQ/FG63wGjwErX koMtEyXPlnMvswvY9hDVeFrdZsB5mfZ29N5jWUNJVUyRJP2xpPPxIwSrDmuyLNSER9iX fqLmrt4ybZ/i6NPOF3KkbC74o23rAjUniXFd2TR4XuU9LuLoYFz37Q7IJIp6ll76Rxlw 5mHQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@embecosm.com header.s=google header.b=btYYT3oi; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from server2.sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id jv7-20020a05621429e700b0068c4467ff57si6503322qvb.41.2024.01.30.04.31.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jan 2024 04:31:50 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@embecosm.com header.s=google header.b=btYYT3oi; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 878AC386F419 for ; Tue, 30 Jan 2024 12:31:24 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) by sourceware.org (Postfix) with ESMTPS id 53CB2385782A for ; Tue, 30 Jan 2024 12:11:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 53CB2385782A Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=embecosm.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 53CB2385782A Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::42c ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706616733; cv=none; b=XvZZuvKchTG8Jl/0vxJvBkq1EsslLieec6AH5N6aNlonPg8mnijd949uVRI3Aax+W87SY/9CjELlv5faK9vFUPWb8XSZdlWXMedIVTZpl5JOeoHF87y0YLOVjLa80Y1AnjVF0bvnSmMRVDEnCRBN0MjA3jBw/nJNxUz0Vn5Ro9s= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706616733; c=relaxed/simple; bh=qNRaAWE5Hrg1K3UyVIoqPO/I+RNMn0osnPHKSkccWxU=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=FFJXZAtRWo9VHrPCAfeT6jVDyHGENoxvmsceZpa+M4viI93bue5OWaFB5MbesvQrl3p2GrK+cRW9z/KIfz1AFPtJAkTMpVfyDPnBA6VsKJH9Cds54ATdKEaNQOAgk2TZMnvS5DId5rGNn+bMxiHMTgrRglVlSnH4q3A1KxX4EiI= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-3394b892691so2129837f8f.1 for ; Tue, 30 Jan 2024 04:11:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; t=1706616698; x=1707221498; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=7xZhBKU4DLD2oiNzGr23H8qWI0cAHkl/1jme2PufIfo=; b=btYYT3oiZO8kujhvddMPe/RHbDptrKOHyAHVqjGf/DIhnYw4nI/b7Djd4kYhdYv8vY E00zTms4IWwe6oPCyO2z7GDiS8gQazLgoy+aHQRASUUlmZjtJNI8iclwkKHyodXLfOAZ jLny9Kb6bor46o5jfxa98Ftej9c1hjCXMz+ju68XCY3gY4edgXlZbv4EEyAXNvTnhwTp yi+2aaxwDFZPsLb7YcWDJwKlcLnroin9ip/8ns1af6OgdPBdXqM680sTw/OMpIOkjS95 RpMFyhgS2xakqniMecdWQrH8mnwDC/vAXnQQtPYb+IVIkdtdcuOU8BbjTTCR7HM1VsJT MiWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706616698; x=1707221498; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=7xZhBKU4DLD2oiNzGr23H8qWI0cAHkl/1jme2PufIfo=; b=CCPSInA8G4+nULyAPp2dfEWCeJU1Ty+AV4h9lGUEVdfmM3lpVD+JRVuwPXWU+H80gS eJoEv+TvHSGsEsvxCOLoTE/MFeKMWuS5Cx9Okr2Pekjj8vpMKr8L5H9RD3su7jj28eE1 993sH54ga2dq4gi1lQdMLr2hK3WwXCzj3etqdmAhCRll8u7/u4jXU6vG0tXfSXc0ykc/ CqZOwa27H/8Vc8YhwW1lS+lBtuf+g7u0swDnWzFWMp2snggQWkVX5q+ccMdhCeS6FDm0 hTyLPZf5Fb3d0tQTI8YvIUyp6BStUmwze6JeTSrIwPbLKeY3s5EgfZSAKWVOsSy/AIYr V7uQ== X-Gm-Message-State: AOJu0YzIwCoZA++zvPj9i5JAmZv2UxajV7YFmlXPbcG7SLAYb9IDLJQL N4aZWakULmneFkkbsorXGgfSJm9MmIGH+5SdpqlGnxQxinxAQXw4ty6ySnx6hzG9/OCoHmWe8hN 7RQ== X-Received: by 2002:a5d:68d0:0:b0:33a:eb5a:8d00 with SMTP id p16-20020a5d68d0000000b0033aeb5a8d00mr1309800wrw.26.1706616698243; Tue, 30 Jan 2024 04:11:38 -0800 (PST) Received: from platypus.localdomain ([62.23.166.218]) by smtp.gmail.com with ESMTPSA id f9-20020a056000036900b00339307d9d31sm10569894wrf.112.2024.01.30.04.11.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jan 2024 04:11:38 -0800 (PST) From: arthur.cohen@embecosm.com To: gcc-patches@gcc.gnu.org Cc: gcc-rust@gcc.gnu.org, Kushal Pal Subject: [COMMITTED 066/101] gccrs: Renamed `WIN64` to `WIN_64` Date: Tue, 30 Jan 2024 13:07:22 +0100 Message-ID: <20240130121026.807464-69-arthur.cohen@embecosm.com> X-Mailer: git-send-email 2.42.1 In-Reply-To: <20240130121026.807464-2-arthur.cohen@embecosm.com> References: <20240130121026.807464-2-arthur.cohen@embecosm.com> MIME-Version: 1.0 X-Spam-Status: No, score=-14.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=unavailable 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: , Reply-To: arthur.cohen@embecosm.com Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789518582576491815 X-GMAIL-MSGID: 1789518582576491815 From: Kushal Pal Fixes issue #2768 gcc/rust/ChangeLog: * backend/rust-compile-base.cc (HIRCompileBase::setup_abi_options): Renamed `WIN64` to `WIN_64` * util/rust-abi.cc (get_abi_from_string): Likewise (get_string_from_abi): Likewise * util/rust-abi.h (enum ABI): Likewise Signed-off-by: Kushal Pal --- gcc/rust/backend/rust-compile-base.cc | 2 +- gcc/rust/util/rust-abi.cc | 4 ++-- gcc/rust/util/rust-abi.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gcc/rust/backend/rust-compile-base.cc b/gcc/rust/backend/rust-compile-base.cc index fcab75bef1c..984492f6607 100644 --- a/gcc/rust/backend/rust-compile-base.cc +++ b/gcc/rust/backend/rust-compile-base.cc @@ -463,7 +463,7 @@ HIRCompileBase::setup_abi_options (tree fndecl, ABI abi) break; - case Rust::ABI::WIN64: + case Rust::ABI::WIN_64: abi_tree = get_identifier ("ms_abi"); break; diff --git a/gcc/rust/util/rust-abi.cc b/gcc/rust/util/rust-abi.cc index 05739e16660..d17402e163e 100644 --- a/gcc/rust/util/rust-abi.cc +++ b/gcc/rust/util/rust-abi.cc @@ -40,7 +40,7 @@ get_abi_from_string (const std::string &abi) else if (abi.compare ("sysv64") == 0) return Rust::ABI::SYSV64; else if (abi.compare ("win64") == 0) - return Rust::ABI::WIN64; + return Rust::ABI::WIN_64; return Rust::ABI::UNKNOWN; } @@ -64,7 +64,7 @@ get_string_from_abi (Rust::ABI abi) return "fastcall"; case Rust::ABI::SYSV64: return "sysv64"; - case Rust::ABI::WIN64: + case Rust::ABI::WIN_64: return "win64"; case Rust::ABI::UNKNOWN: diff --git a/gcc/rust/util/rust-abi.h b/gcc/rust/util/rust-abi.h index d794cc35fb3..a0180ed4d95 100644 --- a/gcc/rust/util/rust-abi.h +++ b/gcc/rust/util/rust-abi.h @@ -30,7 +30,7 @@ enum ABI CDECL, STDCALL, FASTCALL, - WIN64, + WIN_64, SYSV64 };