Fix build breaks in Linux ARM port

CMakeLists.txt

@@ -552,6 +552,13 @@ else ()
   clr_unknown_arch()
 endif ()
 
+if (WIN32)
+  set(FEATURE_EVENT_TRACE 1)
+endif()
+if(CLR_CMAKE_PLATFORM_LINUX AND CLR_CMAKE_PLATFORM_ARCH_AMD64)
+  set(FEATURE_EVENT_TRACE 1)
+endif()
+
 if(CLR_CMAKE_PLATFORM_UNIX)
   add_subdirectory(src/ToolBox/SOS/lldbplugin)
   add_subdirectory(src/pal)
@@ -616,23 +623,14 @@ if (CLR_CMAKE_PLATFORM_UNIX)
 
 endif(CLR_CMAKE_PLATFORM_UNIX)
 
-add_definitions(-D_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS)
-add_definitions(-DDEV10)
-add_definitions(-DWIN32)
-add_definitions(-DDEVL=1)
-add_definitions(-D_WIN32_WINNT=0x0602)
-add_definitions(-D_WIN32_IE=0x0900)
-add_definitions(-DWINNT=1)
-add_definitions(-DNT_INST=0)
-add_definitions(-DCONDITION_HANDLING=1)
-add_definitions(-DNTDDI_VERSION=NTDDI_WIN8)
-add_definitions(-DNTMAKEENV)
 add_definitions(-D_BLD_CLR)
-add_definitions(-DWINVER=0x0602)
-add_definitions(-DWIN32_LEAN_AND_MEAN=1)
 add_definitions(-DDEBUGGING_SUPPORTED)
 
 if(WIN32)
+  add_definitions(-DWIN32)
+  add_definitions(-DWINVER=0x0602)
+  add_definitions(-D_WIN32_WINNT=0x0602)
+  add_definitions(-DWIN32_LEAN_AND_MEAN=1)
   if(CLR_CMAKE_PLATFORM_ARCH_AMD64 OR CLR_CMAKE_PLATFORM_ARCH_I386)
     add_definitions(-D_CRT_SECURE_NO_WARNINGS)
     # Only enable edit and continue on windows x86 and x64
@@ -677,12 +675,12 @@ if(CLR_CMAKE_PLATFORM_UNIX)
     add_definitions(-DFEATURE_DBGIPC_TRANSPORT_DI)
     add_definitions(-DFEATURE_DBGIPC_TRANSPORT_VM)
 endif(CLR_CMAKE_PLATFORM_UNIX)
-if (WIN32 OR CLR_CMAKE_PLATFORM_LINUX)
-  add_definitions(-DFEATURE_EVENT_TRACE=1)
-endif (WIN32 OR CLR_CMAKE_PLATFORM_LINUX)
-if (CLR_CMAKE_PLATFORM_LINUX)
-    add_definitions(-DFEATURE_EVENTSOURCE_XPLAT=1)
-endif (CLR_CMAKE_PLATFORM_LINUX)
+if(FEATURE_EVENT_TRACE)
+    add_definitions(-DFEATURE_EVENT_TRACE=1)
+    if(CLR_CMAKE_PLATFORM_UNIX)
+        add_definitions(-DFEATURE_EVENTSOURCE_XPLAT=1)
+    endif(CLR_CMAKE_PLATFORM_UNIX)
+endif(FEATURE_EVENT_TRACE)
 add_definitions(-DFEATURE_EXCEPTIONDISPATCHINFO)
 add_definitions(-DFEATURE_FRAMEWORK_INTERNAL)
 if(NOT CLR_CMAKE_PLATFORM_UNIX_TARGET_ARM)
@@ -778,12 +776,7 @@ else ()
     clr_unknown_arch()
 endif ()
 
-add_definitions(-D_SKIP_IF_SIMULATOR_)
 add_definitions(-D_SECURE_SCL=0)
-add_definitions(-D_NEW_SDK=1)
-add_definitions(-DOFFICIAL_BUILD=0)
-add_definitions(-DBETA=0)
-add_definitions(-DFX_BRANCH_SYNC_COUNTER_VALUE=0)
 add_definitions(-DUNICODE)
 add_definitions(-D_UNICODE)
 

src/dlls/mscoree/coreclr/CMakeLists.txt

@@ -114,12 +114,11 @@ else()
     )
 endif(WIN32)
 
-if(CLR_CMAKE_PLATFORM_LINUX)
+if(CLR_CMAKE_PLATFORM_UNIX AND FEATURE_EVENT_TRACE)
     list(APPEND CORECLR_LIBRARIES
         eventprovider
   )
-
-endif(CLR_CMAKE_PLATFORM_LINUX)
+endif(CLR_CMAKE_PLATFORM_UNIX AND FEATURE_EVENT_TRACE)
 
 target_link_libraries(coreclr ${CORECLR_LIBRARIES}) 
 

src/jit/CMakeLists.txt

@@ -80,6 +80,8 @@ elseif(CLR_CMAKE_PLATFORM_ARCH_ARM)
     lowerarm.cpp
     codegenarm.cpp
     unwindarm.cpp
+    codegenlegacy.cpp
+    registerfp.cpp
   )
 elseif(CLR_CMAKE_PLATFORM_ARCH_I386)
   set( ARCH_SOURCES

src/pal/src/CMakeLists.txt

@@ -253,9 +253,9 @@ endif(CMAKE_SYSTEM_NAME STREQUAL Darwin)
 
 add_subdirectory(examples)
 
-if(CMAKE_SYSTEM_NAME STREQUAL Linux)
+if(FEATURE_EVENT_TRACE)
     add_subdirectory($ENV{__IntermediatesDir}/Generated/eventprovider ${CMAKE_CURRENT_BINARY_DIR}/eventprovider)
-endif(CMAKE_SYSTEM_NAME STREQUAL Linux)
+endif(FEATURE_EVENT_TRACE)
 
 # Install the static PAL library for VS
 install (TARGETS coreclrpal DESTINATION lib)

src/pal/src/configure.cmake

@@ -979,7 +979,7 @@ else() # Anything else is Linux
     unset(HAVE_LIBUNWIND_H CACHE)
     message(FATAL_ERROR "Cannot find libunwind. Try installing libunwind8 and libunwind8-dev (or the appropriate packages for your platform)")
   endif()
-  if(NOT HAVE_LTTNG_TRACEPOINT_H)
+  if(NOT HAVE_LTTNG_TRACEPOINT_H AND FEATURE_EVENT_TRACE)
     unset(HAVE_LTTNG_TRACEPOINT_H CACHE)
     message(FATAL_ERROR "Cannot find liblttng-ust-dev. Try installing liblttng-ust-dev  (or the appropriate packages for your platform)")
   endif()

src/scripts/genXplatEventing.py

@@ -495,7 +495,7 @@ def generateSanityTest(sClrEtwAllMan,testDir):
                    )
     set(EVENT_PROVIDER_DEPENDENCIES "")
     set(EVENT_PROVIDER_LINKER_OTPTIONS "")
-    if(CMAKE_SYSTEM_NAME STREQUAL Linux)
+    if(FEATURE_EVENT_TRACE)
         add_definitions(-DFEATURE_EVENT_TRACE=1)
             list(APPEND EVENT_PROVIDER_DEPENDENCIES
                  coreclrtraceptprovider
@@ -505,7 +505,7 @@ def generateSanityTest(sClrEtwAllMan,testDir):
                  ${EVENT_PROVIDER_DEPENDENCIES}
                  )
 
-    endif(CMAKE_SYSTEM_NAME STREQUAL Linux)
+    endif(FEATURE_EVENT_TRACE)
 
     add_dependencies(eventprovidertest  ${EVENT_PROVIDER_DEPENDENCIES} coreclrpal)
     target_link_libraries(eventprovidertest

src/vm/CMakeLists.txt

@@ -268,11 +268,11 @@ set(VM_SOURCES_WKS
     weakreferencenative.cpp
 )
 
-if(CLR_CMAKE_PLATFORM_LINUX OR WIN32)
+if(FEATURE_EVENT_TRACE)
     list(APPEND VM_SOURCES_WKS
         eventtrace.cpp
         )
-endif(CLR_CMAKE_PLATFORM_LINUX OR WIN32)
+endif(FEATURE_EVENT_TRACE)
 
 if(WIN32)