From 9ca389532edf878aa9635b8fb5bc0a54226c524e Mon Sep 17 00:00:00 2001 From: Hyeongseok Oh Date: Thu, 13 Apr 2017 20:09:32 +0900 Subject: [PATCH] [ARM32/Linux] Build libcoreclrtraceptprovider.so (dotnet/coreclr#10406) * Build libcoreclrtraceptprovider.so for ARM32 and modify cmake - Build libcoreclrtraceptprovider.so for ARM32 - Include libcoreclrtraceptprovider.so in nuget package - Don't build libcoreclrtraceptprovider.so for Tizen: lttng is not supported in Tizen - Exclude packaging libcoreclrtraceptprovider.so based on os-name excluded for tizen * Remove libcoreclrtraceptprovider.so before test for ARM32/Linux Remove libcoreclrtraceptprovider.so before test for ARM32/Linux in CI CI test environment using docker with qemu has some problem to use lttng library Commit migrated from https://github.com/dotnet/coreclr/commit/e5faef44cac6e86b12b3b586742183293bdd34a7 --- src/coreclr/CMakeLists.txt | 6 +++++- src/coreclr/clrdefinitions.cmake | 10 ++++++++-- .../runtime.Linux.Microsoft.NETCore.Runtime.CoreCLR.props | 3 +-- src/coreclr/src/pal/CMakeLists.txt | 10 ++++++++-- src/coreclr/tests/scripts/arm32_ci_test.sh | 6 +++++- 5 files changed, 27 insertions(+), 8 deletions(-) diff --git a/src/coreclr/CMakeLists.txt b/src/coreclr/CMakeLists.txt index 257cf2d..f18b67b 100644 --- a/src/coreclr/CMakeLists.txt +++ b/src/coreclr/CMakeLists.txt @@ -166,7 +166,11 @@ if(CMAKE_SYSTEM_NAME STREQUAL Linux) # Detect Linux ID if(DEFINED CLR_CMAKE_LINUX_ID) - if(CLR_CMAKE_LINUX_ID STREQUAL alpine) + if(CLR_CMAKE_LINUX_ID STREQUAL ubuntu) + set(CLR_CMAKE_TARGET_UBUNTU_LINUX 1) + elseif(CLR_CMAKE_LINUX_ID STREQUAL tizen) + set(CLR_CMAKE_TARGET_TIZEN_LINUX 1) + elseif(CLR_CMAKE_LINUX_ID STREQUAL alpine) set(CLR_CMAKE_PLATFORM_ALPINE_LINUX 1) endif() if(CLR_CMAKE_LINUX_ID STREQUAL ubuntu) diff --git a/src/coreclr/clrdefinitions.cmake b/src/coreclr/clrdefinitions.cmake index c4bfb8e..cb39e1f 100644 --- a/src/coreclr/clrdefinitions.cmake +++ b/src/coreclr/clrdefinitions.cmake @@ -7,8 +7,14 @@ endif() if (WIN32) set(FEATURE_EVENT_TRACE 1) endif() -if(CLR_CMAKE_PLATFORM_LINUX AND CLR_CMAKE_TARGET_ARCH_AMD64) - set(FEATURE_EVENT_TRACE 1) +if(CLR_CMAKE_PLATFORM_LINUX) + if(CLR_CMAKE_TARGET_ARCH_AMD64) + set(FEATURE_EVENT_TRACE 1) + elseif(CLR_CMAKE_TARGET_ARCH_ARM) + if(NOT(CLR_CMAKE_TARGET_TIZEN_LINUX)) + set(FEATURE_EVENT_TRACE 1) + endif() + endif() endif() if (CLR_CMAKE_TARGET_ARCH_AMD64) diff --git a/src/coreclr/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Linux.Microsoft.NETCore.Runtime.CoreCLR.props b/src/coreclr/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Linux.Microsoft.NETCore.Runtime.CoreCLR.props index db8b031..4ad2538 100644 --- a/src/coreclr/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Linux.Microsoft.NETCore.Runtime.CoreCLR.props +++ b/src/coreclr/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Linux.Microsoft.NETCore.Runtime.CoreCLR.props @@ -4,8 +4,7 @@ <_PlatformDoesNotSupportNiFiles Condition="'$(Platform)' == 'arm'">true <_PlatformDoesNotSupportNiFiles Condition="'$(Platform)' == 'armel'">true <_PlatformDoesNotSupportNiFiles Condition="'$(Platform)' == 'x86'">true - <_PlatformDoesNotSupportEventTrace Condition="'$(Platform)' == 'arm'">true - <_PlatformDoesNotSupportEventTrace Condition="'$(Platform)' == 'armel'">true + <_PlatformDoesNotSupportEventTrace Condition="'$(_runtimeOSFamily)' == 'tizen'">true <_PlatformDoesNotSupportEventTrace Condition="'$(Platform)' == 'x86'">true diff --git a/src/coreclr/src/pal/CMakeLists.txt b/src/coreclr/src/pal/CMakeLists.txt index 8e3228b..453bddd 100644 --- a/src/coreclr/src/pal/CMakeLists.txt +++ b/src/coreclr/src/pal/CMakeLists.txt @@ -5,8 +5,14 @@ project(COREPAL) if (WIN32) set(FEATURE_EVENT_TRACE 1) endif() -if(CLR_CMAKE_PLATFORM_LINUX AND CLR_CMAKE_TARGET_ARCH_AMD64) - set(FEATURE_EVENT_TRACE 1) +if(CLR_CMAKE_PLATFORM_LINUX) + if(CLR_CMAKE_TARGET_ARCH_AMD64) + set(FEATURE_EVENT_TRACE 1) + elseif(CLR_CMAKE_TARGET_ARCH_ARM) + if(NOT(CLR_CMAKE_TARGET_TIZEN_LINUX)) + set(FEATURE_EVENT_TRACE 1) + endif() + endif() endif() include_directories(${COREPAL_SOURCE_DIR}/inc) diff --git a/src/coreclr/tests/scripts/arm32_ci_test.sh b/src/coreclr/tests/scripts/arm32_ci_test.sh index 33a951e..995bbf8 100755 --- a/src/coreclr/tests/scripts/arm32_ci_test.sh +++ b/src/coreclr/tests/scripts/arm32_ci_test.sh @@ -97,7 +97,7 @@ if [ "$__abi" == "armel" ]; then mkdir -p ${__ROOTFS_DIR} tar -zxf mic-output/tizen.tar.gz -C ${__ROOTFS_DIR} apt-get update - apt-get -y -qq --force-yes install --reinstall qemu binfmt-support qemu-user-static + apt-get -y -qq --force-yes --reinstall install qemu binfmt-support qemu-user-static __qemuARM=$(which qemu-arm-static) cp $__qemuARM ${CORECLR_DIR}/cross/rootfs/armel/usr/bin/ cp $__qemuARM ${__ROOTFS_DIR}/usr/bin/ @@ -112,6 +112,10 @@ mount -o bind /dev/pts ${__ROOTFS_DIR}/dev/pts mount -o bind /sys ${__ROOTFS_DIR}/sys mount -o bind ${CORECLR_DIR} ${__ROOTFS_DIR}${ARM_CHROOT_HOME_DIR} +# Test environment emulation using docker and qemu has some problem to use lttng library. +# We should remove libcoreclrtraceptprovider.so to avoid test hang. +rm -f ${__ROOTFS_DIR}${ARM_CHROOT_HOME_DIR}/bin/Product/${__buildDirName}/libcoreclrtraceptprovider.so + chroot ${__ROOTFS_DIR} /bin/bash -x <