diff options
| -rw-r--r-- | clrdefinitions.cmake | 2 | ||||
| -rw-r--r-- | src/jit/jit.h | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/clrdefinitions.cmake b/clrdefinitions.cmake index f02e500274..3a730cfec8 100644 --- a/clrdefinitions.cmake +++ b/clrdefinitions.cmake @@ -14,6 +14,7 @@ if (CLR_CMAKE_TARGET_ARCH_AMD64) add_definitions(-DDBG_TARGET_AMD64_UNIX) endif() add_definitions(-D_TARGET_AMD64_=1) + add_definitions(-D_TARGET_64BIT_=1) add_definitions(-DDBG_TARGET_64BIT=1) add_definitions(-DDBG_TARGET_AMD64=1) add_definitions(-DDBG_TARGET_WIN64=1) @@ -22,6 +23,7 @@ elseif (CLR_CMAKE_TARGET_ARCH_ARM64) add_definitions(-DDBG_TARGET_ARM64_UNIX) endif() add_definitions(-D_TARGET_ARM64_=1) + add_definitions(-D_TARGET_64BIT_=1) add_definitions(-DDBG_TARGET_64BIT=1) add_definitions(-DDBG_TARGET_ARM64=1) add_definitions(-DDBG_TARGET_WIN64=1) diff --git a/src/jit/jit.h b/src/jit/jit.h index 553128a798..1f28ae44ad 100644 --- a/src/jit/jit.h +++ b/src/jit/jit.h @@ -161,8 +161,19 @@ #endif #if defined(_TARGET_AMD64_) || defined(_TARGET_ARM64_) +#ifndef _TARGET_64BIT_ #define _TARGET_64BIT_ -#endif +#endif // _TARGET_64BIT_ +#endif // defined(_TARGET_AMD64_) || defined(_TARGET_ARM64_) + +#ifdef _TARGET_64BIT_ +#ifdef _TARGET_X86_ +#error Cannot define both _TARGET_X86_ and _TARGET_64BIT_ +#endif // _TARGET_X86_ +#ifdef _TARGET_ARM_ +#error Cannot define both _TARGET_ARM_ and _TARGET_64BIT_ +#endif // _TARGET_ARM_ +#endif // _TARGET_64BIT_ #if defined(_TARGET_X86_) || defined(_TARGET_AMD64_) #define _TARGET_XARCH_ |