Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Disable X86-64 detection macro for Arm64 emulation on MSVC #3540

Merged
merged 3 commits into from
Jan 31, 2025
+3 −1
Merged

Disable X86-64 detection macro for Arm64 emulation on MSVC #3540

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c94e6ff
disable X86-64 detection macro for Arm64 emulation on MSVC
fbusato Jan 27, 2025
afa315e
Merge branch 'main' into fix-arm64-emu-macro
fbusato Jan 28, 2025
faac2ec
Merge branch 'main' into fix-arm64-emu-macro
fbusato Jan 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion libcudacxx/include/cuda/std/__cccl/architecture.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@
#endif

// X86 64-bit
#if defined(_M_X64) || defined(__amd64__) || defined(__x86_64__)

// _M_X64 is defined even if we are compiling in Arm64 emulation mode
#if (defined(_M_X64) && !defined(_M_ARM64EC)) || defined(__amd64__) || defined(__x86_64__)
# define _CCCL_ARCH_X86_64_() 1
#else
# define _CCCL_ARCH_X86_64_() 0
Expand Down
Loading