From 16ecaf1bddfae2285c1f035f56fe86a7452e208e Mon Sep 17 00:00:00 2001 From: Hyeongseok Oh Date: Fri, 10 Feb 2017 19:36:29 +0900 Subject: [PATCH] [Linux/ARM] Fix cross-architecture component build error: disable unused code (#8866) * [ARM32/Linux] Fix cross-architecture component build error: unused function comparing CONTEXT with T_CONTEXT. - change build script: remove duplicate test build in cross-component build --- build.sh | 2 ++ src/vm/exceptionhandling.h | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build.sh b/build.sh index 8d03121..4d0544a 100755 --- a/build.sh +++ b/build.sh @@ -277,6 +277,8 @@ build_cross_arch_component() export __CMakeBinDir="$__CrossComponentBinDir" export CROSSCOMPONENT=1 + __IncludeTests= + if [ $CROSSCOMPILE == 1 ]; then TARGET_ROOTFS="$ROOTFS_DIR" if [ -n "$CAC_ROOTFS_DIR" ]; then diff --git a/src/vm/exceptionhandling.h b/src/vm/exceptionhandling.h index 8b675d5..e324d28 100644 --- a/src/vm/exceptionhandling.h +++ b/src/vm/exceptionhandling.h @@ -389,7 +389,7 @@ public: bool IsStackOverflowException(); -#ifdef FEATURE_PAL +#if defined(FEATURE_PAL) && !defined(CROSS_COMPILE) void TakeExceptionPointersOwnership(PAL_SEHException* ex) { _ASSERTE(ex->GetExceptionRecord() == m_ptrs.ExceptionRecord); @@ -397,7 +397,7 @@ public: ex->Clear(); m_fOwnsExceptionPointers = TRUE; } -#endif // FEATURE_PAL +#endif // FEATURE_PAL && !CROSS_COMPILE private: DWORD_PTR @@ -428,7 +428,7 @@ private: m_hThrowable = NULL; } -#endif +#endif // !DACCESS_COMPILE void SaveStackTrace(); -- 2.7.4