Skip to content

Changes to support arm64 & arm64EC on MSVC #19

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

Open
aalekhm wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Changes to support arm64 & arm64EC on MSVC #19

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 13 additions & 5 deletions include/Common/EABase/config/eaplatform.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,19 @@
#else
#define EA_PLATFORM_WIN32 1
#endif
#if defined(_M_AMD64) || defined(_AMD64_) || defined(__x86_64__)
#if defined(_M_ARM64) || defined(_M_ARM64EC)
#define EA_PROCESSOR_ARM64 1
#if defined(_M_ARM64)
#define EA_TARGET_ARCHITECTURE_ARM64 1
#else
#define EA_TARGET_ARCHITECTURE_ARM64EC 1
#endif
#define EA_SYSTEM_LITTLE_ENDIAN 1
#define EA_PLATFORM_DESCRIPTION "Windows on ARM64"
#if defined(EA_TARGET_ARCHITECTURE_ARM64EC) // Disable USE_SOFT_INTRINSICS to avoid the uint128_t redefinition caused by <widemath.h> conflicting with EABase.
#define _DISABLE_SOFTINTRIN_
#endif
#elif defined(_M_AMD64) || defined(_AMD64_) || defined(__x86_64__)
#define EA_PROCESSOR_X86_64 1
#define EA_SYSTEM_LITTLE_ENDIAN 1
#define EA_PLATFORM_DESCRIPTION "Windows on x64"
Expand All @@ -553,10 +565,6 @@
#define EA_PROCESSOR_ARM32 1
#define EA_SYSTEM_LITTLE_ENDIAN 1
#define EA_PLATFORM_DESCRIPTION "Windows on ARM"
#elif defined(_M_ARM64)
#define EA_PROCESSOR_ARM64 1
#define EA_SYSTEM_LITTLE_ENDIAN 1
#define EA_PLATFORM_DESCRIPTION "Windows on ARM64"
#else //Possibly other Windows CE variants
#error Unknown processor
#error Unknown endianness
Expand Down