diff options
| author | Carol Eidt <carol.eidt@microsoft.com> | 2018-03-15 08:21:25 -0700 |
|---|---|---|
| committer | Carol Eidt <carol.eidt@microsoft.com> | 2018-04-17 16:15:14 -0700 |
| commit | 32480530dbcd0936e4292bdd50e5a94002f8dba2 (patch) | |
| tree | 333c33b54dce6addf25ec10419e7eb8ed742e05f /clrdefinitions.cmake | |
| parent | 963e5a9f08ed7c664036ef9b7050374b66f71d64 (diff) | |
| download | coreclr-32480530dbcd0936e4292bdd50e5a94002f8dba2.tar.gz coreclr-32480530dbcd0936e4292bdd50e5a94002f8dba2.tar.bz2 coreclr-32480530dbcd0936e4292bdd50e5a94002f8dba2.zip | |
Unix/x64 ABI cleanup
Eliminate `FEATURE_UNIX_AMD64_STRUCT_PASSING` and replace it with `UNIX_AMD64_ABI` when used alone. Both are currently defined; it is highly unlikely the latter will work alone; and it significantly clutters up the code, especially the JIT.
Also, fix the altjit support (now `UNIX_AMD64_ABI_ITF`) to *not* call `ClassifyEightBytes` if the struct is too large. Otherwise it asserts.
Diffstat (limited to 'clrdefinitions.cmake')
| -rw-r--r-- | clrdefinitions.cmake | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/clrdefinitions.cmake b/clrdefinitions.cmake index d7583809a2..06a2df17e4 100644 --- a/clrdefinitions.cmake +++ b/clrdefinitions.cmake @@ -200,13 +200,14 @@ add_definitions(-DFEATURE_SYMDIFF) add_definitions(-DFEATURE_TIERED_COMPILATION) if (CLR_CMAKE_PLATFORM_ARCH_AMD64) # Enable the AMD64 Unix struct passing JIT-EE interface for all AMD64 platforms, to enable altjit. - add_definitions(-DFEATURE_UNIX_AMD64_STRUCT_PASSING_ITF) + add_definitions(-DUNIX_AMD64_ABI_ITF) endif (CLR_CMAKE_PLATFORM_ARCH_AMD64) if(CLR_CMAKE_PLATFORM_UNIX_AMD64) add_definitions(-DFEATURE_MULTIREG_RETURN) + add_definitions(-DUNIX_AMD64_ABI) endif (CLR_CMAKE_PLATFORM_UNIX_AMD64) if(CLR_CMAKE_PLATFORM_UNIX AND CLR_CMAKE_TARGET_ARCH_AMD64) - add_definitions(-DFEATURE_UNIX_AMD64_STRUCT_PASSING) + add_definitions(-DUNIX_AMD64_ABI) 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)) |