diff options
| author | Egor Chesakov <Egor.Chesakov@microsoft.com> | 2018-03-19 08:44:24 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-19 08:44:24 -0700 |
| commit | 26bf1b30894591775af57e9b3a5906710ea4a9c1 (patch) | |
| tree | 33c8fa4640378f2c2f312bc52424ff66f52b0795 | |
| parent | e7bb40f52d46671f5001012284a2f54eaa658e35 (diff) | |
| parent | c4729ddb3d49a1cda910412d846cb0ec4fe9ad87 (diff) | |
| download | coreclr-26bf1b30894591775af57e9b3a5906710ea4a9c1.tar.gz coreclr-26bf1b30894591775af57e9b3a5906710ea4a9c1.tar.bz2 coreclr-26bf1b30894591775af57e9b3a5906710ea4a9c1.zip | |
Merge pull request #16968 from echesakovMSFT/LimitFeatureUnixAMD64StructPassingWhenTargetUnixAMD64
Define FEATURE_UNIX_AMD64_STRUCT_PASSING only when target Unix/AMD64
| -rw-r--r-- | clrdefinitions.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/clrdefinitions.cmake b/clrdefinitions.cmake index 3a730cfec8..d7583809a2 100644 --- a/clrdefinitions.cmake +++ b/clrdefinitions.cmake @@ -204,8 +204,10 @@ if (CLR_CMAKE_PLATFORM_ARCH_AMD64) endif (CLR_CMAKE_PLATFORM_ARCH_AMD64) if(CLR_CMAKE_PLATFORM_UNIX_AMD64) add_definitions(-DFEATURE_MULTIREG_RETURN) - add_definitions(-DFEATURE_UNIX_AMD64_STRUCT_PASSING) endif (CLR_CMAKE_PLATFORM_UNIX_AMD64) +if(CLR_CMAKE_PLATFORM_UNIX AND CLR_CMAKE_TARGET_ARCH_AMD64) + add_definitions(-DFEATURE_UNIX_AMD64_STRUCT_PASSING) +endif(CLR_CMAKE_PLATFORM_UNIX AND CLR_CMAKE_TARGET_ARCH_AMD64) add_definitions(-DFEATURE_USE_ASM_GC_WRITE_BARRIERS) if(CLR_CMAKE_PLATFORM_ARCH_AMD64 OR (CLR_CMAKE_PLATFORM_ARCH_ARM64 AND NOT WIN32)) add_definitions(-DFEATURE_USE_SOFTWARE_WRITE_WATCH_FOR_GC_HEAP) |