From: Kushal Pal <kushalpal...@gmail.com> 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 <kushalpal...@gmail.com> --- 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