From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by sourceware.org (Postfix) with ESMTPS id 4E4053857BA0 for ; Tue, 30 Jan 2024 12:11:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4E4053857BA0 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 4E4053857BA0 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::32e 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-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-40faf6788d1so1642815e9.0 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=qBFAcqQu80AxCXc2g1X51Z8pEKK42L4oRzknitAdkrW4AuK7O56xaPKJDfz4q7kxmu Dc6RAF+Q1Nrl/7uFiAyYcmvxDurCwrMkK2ih+FPmop03XxXPYQ2kTgHX9MjaM9k7QrOC nY4Mk24hN6esw8NLknke2nkPFUwrZXIT30B/jwZn8uwnvHARbnDybsY2z0NYvTnP6TC7 ew2sPA7jgX/bVDrRi6h8J7Quf7Pr3bwSEjVhWBzg1ec5bPdu1FCzzUV5tewxaUD6PL03 DKOA4SfQF/ID8sW5+CAmtLzSii16qvp5vjjxMm7tzsNoHl5nQSY0dYuu/03vS0mHSrQq oJQw== X-Gm-Message-State: AOJu0YwZmSnk2S84PVwUqnf2rgT2p8d0g4tUnOh/aMZeZ6IU+8E/6LbR a/1nQWGo943j0UbR/1OWCx9Vwk8LtY4WMF8dEzV/lb9luJ9mhboe1id1glPcRQ== X-Google-Smtp-Source: AGHT+IFRBSKADbGGuAKmSauotEtUMMg3gnO3buwSkOJoqzS8QuqnbLEgnLj5y3nRAaPCRfkhSdf+QQ== 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> Reply-To: arthur.cohen@embecosm.com MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: 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 }; -- 2.42.1