Rename PAL_CMAKE_* CLR_CMAKE_* (#1984)

* Rename PAL_CMAKE_* CLR_CMAKE_*

Remove separatation between CLR_CMAKE and PAL_CMAKE defines

Revise PAL_CMAKE_PLATFORM* defines to use CLR_CMAKE_HOST* defines

Revise other PAL_CMAKE_* defines to use CLR_CMAKE_* equivalents.

Remove redundant compiler configuration

diff --git a/src/coreclr/configurecompiler.cmake b/src/coreclr/configurecompiler.cmake
index 3c75a20..e52c7e7 100644 (file)
--- a/src/coreclr/configurecompiler.cmake
+++ b/src/coreclr/configurecompiler.cmake
@@ -376,8 +376,10 @@ if (CLR_CMAKE_HOST_ARCH_AMD64)
   add_definitions(-DBIT64)
 elseif (CLR_CMAKE_HOST_ARCH_I386)
   add_definitions(-D_X86_)
+  add_definitions(-DBIT32)
 elseif (CLR_CMAKE_HOST_ARCH_ARM)
   add_definitions(-D_ARM_)
+  add_definitions(-DBIT32)
 elseif (CLR_CMAKE_HOST_ARCH_ARM64)
   add_definitions(-D_ARM64_)
   add_definitions(-DBIT64)

diff --git a/src/coreclr/src/pal/src/CMakeLists.txt b/src/coreclr/src/pal/src/CMakeLists.txt
index 55c66b4..d9e350d 100644 (file)
--- a/src/coreclr/src/pal/src/CMakeLists.txt
+++ b/src/coreclr/src/pal/src/CMakeLists.txt
@@ -15,15 +15,15 @@ if(NOT CLR_CMAKE_USE_SYSTEM_LIBUNWIND)
 
   add_subdirectory(libunwind)
 elseif(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)
-    if(PAL_CMAKE_PLATFORM_ARCH_ARM)
+    if(CLR_CMAKE_HOST_ARCH_ARM)
       find_library(UNWIND_ARCH NAMES unwind-arm)
     endif()
 
-    if(PAL_CMAKE_PLATFORM_ARCH_ARM64)
+    if(CLR_CMAKE_HOST_ARCH_ARM64)
       find_library(UNWIND_ARCH NAMES unwind-aarch64)
     endif()
 
-    if(PAL_CMAKE_PLATFORM_ARCH_AMD64)
+    if(CLR_CMAKE_HOST_ARCH_AMD64)
       find_library(UNWIND_ARCH NAMES unwind-x86_64)
     endif()
 
@@ -64,47 +64,6 @@ include_directories(include)
 
 # Compile options
 
-if(CLR_CROSS_COMPONENTS_BUILD)
-    if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL x86_64 OR CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL amd64)
-        if(CLR_CMAKE_TARGET_ARCH STREQUAL "arm" OR CLR_CMAKE_TARGET_ARCH STREQUAL "armel")
-            if($ENV{CROSSCOMPILE} STREQUAL "1")
-                set(PAL_CMAKE_PLATFORM_ARCH_I386 1)
-                add_definitions(-D_X86_)
-            else()
-                set(PAL_CMAKE_PLATFORM_ARCH_AMD64 1)
-                add_definitions(-D_AMD64_)
-            endif()
-        else()
-            set(PAL_CMAKE_PLATFORM_ARCH_AMD64 1)
-            add_definitions(-D_AMD64_)
-        endif()
-    elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL i686)
-        set(PAL_CMAKE_PLATFORM_ARCH_I386 1)
-        add_definitions(-D_X86_)
-    else()
-        message(FATAL_ERROR "Only AMD64, I386 host for cross-architecture component is supported")
-    endif()
-else()
-    if(CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64 OR CMAKE_SYSTEM_PROCESSOR STREQUAL amd64 OR CMAKE_SYSTEM_PROCESSOR STREQUAL AMD64)
-        set(PAL_CMAKE_PLATFORM_ARCH_AMD64 1)
-        add_definitions(-D_AMD64_)
-    elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL armv7l)
-        set(PAL_CMAKE_PLATFORM_ARCH_ARM 1)
-        add_definitions(-D_ARM_)
-    elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL arm)
-        set(PAL_CMAKE_PLATFORM_ARCH_ARM 1)
-        add_definitions(-D_ARM_)
-    elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64)
-        set(PAL_CMAKE_PLATFORM_ARCH_ARM64 1)
-        add_definitions(-D_ARM64_)
-    elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL i686)
-        set(PAL_CMAKE_PLATFORM_ARCH_I386 1)
-        add_definitions(-D_X86_)
-    else()
-        message(FATAL_ERROR "Only ARM, AMD64, ARM64 and I386 is supported")
-    endif()
-endif()
-
 if(CMAKE_SYSTEM_NAME STREQUAL Darwin)
   add_definitions(-D_TARGET_MAC64)
   add_definitions(-DXSTATE_SUPPORTED)
@@ -126,24 +85,20 @@ add_definitions(-DFEATURE_PAL)
 add_definitions(-DCORECLR)
 add_definitions(-DPIC)
 add_definitions(-D_FILE_OFFSET_BITS=64)
-if(PAL_CMAKE_PLATFORM_ARCH_AMD64)
-  add_definitions(-DBIT64)
+if(CLR_CMAKE_HOST_ARCH_AMD64)
   set(PAL_ARCH_SOURCES_DIR amd64)
-elseif(PAL_CMAKE_PLATFORM_ARCH_ARM)
-  add_definitions(-DBIT32)
+elseif(CLR_CMAKE_HOST_ARCH_ARM)
   set(PAL_ARCH_SOURCES_DIR arm)
-elseif(PAL_CMAKE_PLATFORM_ARCH_ARM64)
-  add_definitions(-DBIT64)
+elseif(CLR_CMAKE_HOST_ARCH_ARM64)
   set(PAL_ARCH_SOURCES_DIR arm64)
-elseif(PAL_CMAKE_PLATFORM_ARCH_I386)
-  add_definitions(-DBIT32)
+elseif(CLR_CMAKE_HOST_ARCH_I386)
   set(PAL_ARCH_SOURCES_DIR i386)
 endif()
 
-if(PAL_CMAKE_PLATFORM_ARCH_AMD64 AND CMAKE_SYSTEM_NAME STREQUAL Linux AND NOT CLR_CMAKE_HOST_ALPINE_LINUX)
+if(CLR_CMAKE_HOST_ARCH_AMD64 AND CMAKE_SYSTEM_NAME STREQUAL Linux AND NOT CLR_CMAKE_HOST_ALPINE_LINUX)
   # Currently the _xstate is not available on Alpine Linux
   add_definitions(-DXSTATE_SUPPORTED)
-endif(PAL_CMAKE_PLATFORM_ARCH_AMD64 AND CMAKE_SYSTEM_NAME STREQUAL Linux AND NOT CLR_CMAKE_HOST_ALPINE_LINUX)
+endif(CLR_CMAKE_HOST_ARCH_AMD64 AND CMAKE_SYSTEM_NAME STREQUAL Linux AND NOT CLR_CMAKE_HOST_ALPINE_LINUX)
 
 if(CLR_CMAKE_HOST_ALPINE_LINUX)
   # Setting RLIMIT_NOFILE breaks debugging of coreclr on Alpine Linux for some reason
@@ -170,11 +125,11 @@ if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)
   )
 endif(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)
 
-if(PAL_CMAKE_PLATFORM_ARCH_ARM)
+if(CLR_CMAKE_HOST_ARCH_ARM)
   if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     set_source_files_properties(exception/seh.cpp PROPERTIES COMPILE_FLAGS -Wno-error=inline-asm)
   endif()
-endif(PAL_CMAKE_PLATFORM_ARCH_ARM)
+endif(CLR_CMAKE_HOST_ARCH_ARM)
 
 set(SOURCES
   cruntime/file.cpp

diff --git a/src/coreclr/src/pal/tests/CMakeLists.txt b/src/coreclr/src/pal/tests/CMakeLists.txt
index d9f260b..3e46072 100644 (file)
--- a/src/coreclr/src/pal/tests/CMakeLists.txt
+++ b/src/coreclr/src/pal/tests/CMakeLists.txt
@@ -1,34 +1,11 @@
 cmake_minimum_required(VERSION 3.14.2)
 
-if(CLR_CMAKE_HOST_ARCH_I386)
-    set(PAL_CMAKE_PLATFORM_ARCH_I386 1)
-elseif(CLR_CMAKE_HOST_ARCH_AMD64)
-    set(PAL_CMAKE_PLATFORM_ARCH_AMD64 1)
-elseif(CLR_CMAKE_HOST_ARCH_ARM)
-    set(PAL_CMAKE_PLATFORM_ARCH_ARM 1)
-elseif(CLR_CMAKE_HOST_ARCH_ARM64)
-    set(PAL_CMAKE_PLATFORM_ARCH_ARM64 1)
-endif()
-
 # Compile options
 add_definitions(-DPLATFORM_UNIX)
 add_definitions(-DLP64COMPATIBLE)
 add_definitions(-DFEATURE_PAL)
 add_definitions(-DCORECLR)
 add_definitions(-DPIC)
-if(PAL_CMAKE_PLATFORM_ARCH_I386)
-  add_definitions(-DBIT32)
-elseif(PAL_CMAKE_PLATFORM_ARCH_AMD64)
-  add_definitions(-DBIT64)
-  add_definitions(-DBIT64)
-elseif(PAL_CMAKE_PLATFORM_ARCH_ARM)
-  add_definitions(-DBIT32)
-elseif(PAL_CMAKE_PLATFORM_ARCH_ARM64)
-  add_definitions(-DBIT64)
-  add_definitions(-DBIT64)
-else()
-  message(FATAL_ERROR "Only ARM, ARM64, I386, and AMD64 is supported")
-endif()
 
 # C++ emits errors and warnings for c-string literal fed into char* parameter
 # this is just to take care of the warnings