diff options
| author | Steve MacLean <Steve.MacLean@microsoft.com> | 2020-02-01 03:36:44 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-01 03:36:44 +0300 |
| commit | fcd862e06413a000f9cafa9d2f359226c60b9b42 (patch) | |
| tree | 24dd6f209089cbf60490dce817bd29e3c969310c /src/coreclr/clrdefinitions.cmake | |
| parent | 7aff91cded9d5c342302a9bfe12f79a740ca2370 (diff) | |
Rename cross compilation related defines (#2256)
* Rename identifiers to be more consistent
This patch was a machine generated search and replace of
identifiers. The replacement was done in the order listed
for the path specified.
A regex was used to find the identifiers.
s/(^|[^A-CE-Za-z0-9_])${find}($|[^A-Za-z0-9_])
The 'D' character was specifically allowed a s a prefix
to catch add_definitions(-D${find}).
The patch also reverts all managed code changes after replacement.
_ARM_ -> HOST_ARM in src/coreclr
_ARM64_ -> HOST_ARM64 in src/coreclr
_AMD64_ -> HOST_AMD64 in src/coreclr
_X86_ -> HOST_X86 in src/coreclr
_HOST_UNIX_ -> HOST_UNIX in src/coreclr
_HOST_AMD64_ -> HOST_AMD64 in src/coreclr
_HOST_ARM64_ -> HOST_ARM64 in src/coreclr
_HOST_ARM_ -> HOST_ARM in src/coreclr
_HOST_X86_ -> HOST_X86 in src/coreclr
DBG_TARGET_AMD64 -> TARGET_AMD64 in src/coreclr
DBG_TARGET_ARM64 -> TARGET_ARM64 in src/coreclr
DBG_TARGET_ARM -> TARGET_ARM in src/coreclr
DBG_TARGET_X86 -> TARGET_X86 in src/coreclr
_TARGET_AMD64_ -> TARGET_AMD64 in src/coreclr
_TARGET_ARM_ -> TARGET_ARM in src/coreclr
_TARGET_ARM64_ -> TARGET_ARM64 in src/coreclr
_TARGET_X86_ -> TARGET_X86 in src/coreclr
_TARGET_ARMARCH_ -> TARGET_ARMARCH in src/coreclr
_TARGET_XARCH_ -> TARGET_XARCH in src/coreclr
_HOST_64BIT_ -> HOST_64BIT in src/coreclr
BIT64 -> HOST_64BIT in src/coreclr
_TARGET_64BIT_ -> TARGET_64BIT in src/coreclr
DBG_TARGET_64BIT -> TARGET_64BIT in src/coreclr
HOST_IS_WINDOWS_OS -> HOST_WINDOWS in src/coreclr
PLATFORM_UNIX -> HOST_UNIX in src/coreclr/*.cmake
PLATFORM_WINDOWS -> HOST_WINDOWS in src/coreclr/*.cmake
_TARGET_MAC64 -> TARGET_OSX in src/coreclr
FEATURE_PAL -> TARGET_UNIX in src/coreclr
_TARGET_UNIX_ -> TARGET_UNIX in src/coreclr
_TARGET_WINDOWS_ -> TARGET_WINDOWS in src/coreclr
PLATFORM_UNIX -> TARGET_UNIX in src/coreclr
PLATFORM_WINDOWS -> TARGET_WINDOWS in src/coreclr
* Miscellaneous manual fixes to fix compilation
Remove unused defines
Remove BIT32
Remove DBG_TARGET_AMD64_UNIX
Remove DBG_TARGET_ARM64_UNIX
Remove DBG_TARGET_ARM_UNIX
Remove DBG_TARGET_32BIT
Fixes for HOST_<arch> rename
Move TARGET_<Arch> and TARGET_<bit>
Move from clrdefinitions.cmake
to configurecompiler.cmake so it is used globally.
More jit.h
* Whitespace by clang-format
Diffstat (limited to 'src/coreclr/clrdefinitions.cmake')
| -rw-r--r-- | src/coreclr/clrdefinitions.cmake | 33 |
1 files changed, 4 insertions, 29 deletions
diff --git a/src/coreclr/clrdefinitions.cmake b/src/coreclr/clrdefinitions.cmake index 7047cf96a87..d926f9724a2 100644 --- a/src/coreclr/clrdefinitions.cmake +++ b/src/coreclr/clrdefinitions.cmake @@ -16,43 +16,19 @@ add_compile_definitions($<$<BOOL:$<TARGET_PROPERTY:CROSSGEN_COMPONENT>>:CROSS_CO add_compile_definitions($<$<BOOL:$<TARGET_PROPERTY:CROSSGEN_COMPONENT>>:FEATURE_NATIVE_IMAGE_GENERATION>) add_compile_definitions($<$<BOOL:$<TARGET_PROPERTY:CROSSGEN_COMPONENT>>:SELF_NO_HOST>) -if (CLR_CMAKE_TARGET_ARCH_AMD64) - if (CLR_CMAKE_TARGET_UNIX) - add_definitions(-DDBG_TARGET_AMD64_UNIX) - endif() - add_definitions(-D_TARGET_AMD64_) - add_definitions(-D_TARGET_64BIT_) - add_definitions(-DDBG_TARGET_64BIT) - add_definitions(-DDBG_TARGET_AMD64) -elseif (CLR_CMAKE_TARGET_ARCH_ARM64) +if (CLR_CMAKE_TARGET_ARCH_ARM64) if (CLR_CMAKE_TARGET_UNIX) - add_definitions(-DDBG_TARGET_ARM64_UNIX) add_definitions(-DFEATURE_EMULATE_SINGLESTEP) endif() - add_definitions(-D_TARGET_ARM64_) - add_definitions(-D_TARGET_64BIT_) - add_definitions(-DDBG_TARGET_64BIT) - add_definitions(-DDBG_TARGET_ARM64) add_definitions(-DFEATURE_MULTIREG_RETURN) elseif (CLR_CMAKE_TARGET_ARCH_ARM) - if (CLR_CMAKE_TARGET_UNIX) - add_definitions(-DDBG_TARGET_ARM_UNIX) - elseif (WIN32 AND NOT DEFINED CLR_CROSS_COMPONENTS_BUILD) + if (WIN32 AND NOT DEFINED CLR_CROSS_COMPONENTS_BUILD) # Set this to ensure we can use Arm SDK for Desktop binary linkage when doing native (Arm32) build add_definitions(-D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE) add_definitions(-D_ARM_WORKAROUND_) - endif (CLR_CMAKE_TARGET_UNIX) - add_definitions(-D_TARGET_ARM_) - add_definitions(-DDBG_TARGET_32BIT) - add_definitions(-DDBG_TARGET_ARM) + endif (WIN32 AND NOT DEFINED CLR_CROSS_COMPONENTS_BUILD) add_definitions(-DFEATURE_EMULATE_SINGLESTEP) -elseif (CLR_CMAKE_TARGET_ARCH_I386) - add_definitions(-D_TARGET_X86_) - add_definitions(-DDBG_TARGET_32BIT) - add_definitions(-DDBG_TARGET_X86) -else () - clr_unknown_arch() -endif (CLR_CMAKE_TARGET_ARCH_AMD64) +endif (CLR_CMAKE_TARGET_ARCH_ARM64) if (CLR_CMAKE_TARGET_UNIX) @@ -179,7 +155,6 @@ if(FEATURE_MERGE_JIT_AND_ENGINE) endif(FEATURE_MERGE_JIT_AND_ENGINE) add_compile_definitions($<$<NOT:$<BOOL:$<TARGET_PROPERTY:CROSSGEN_COMPONENT>>>:FEATURE_MULTICOREJIT>) if(CLR_CMAKE_TARGET_UNIX) - add_definitions(-DFEATURE_PAL) add_definitions(-DFEATURE_PAL_ANSI) endif(CLR_CMAKE_TARGET_UNIX) if(CLR_CMAKE_TARGET_LINUX AND CLR_CMAKE_HOST_LINUX) |