From 3ad25a23856765b7629039663006b5b8b0b9eb0e Mon Sep 17 00:00:00 2001 From: Jonghyun Park Date: Wed, 10 May 2017 12:32:33 -0700 Subject: [PATCH] [ARM/Linux] Enable build with FEATURE_DBGIPC=0 (dotnet/coreclr#11254) * [ARM/Linux] Enable build with FEATURE_DBGIPC=0 * Replace HAVE_ALIGNED_MALLOC with SUPPORT_LOCAL_DEBUGGING Commit migrated from https://github.com/dotnet/coreclr/commit/cdd7d58e75667f108a4843c5aeb61648cd25f340 --- src/coreclr/src/debug/di/cordb.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/coreclr/src/debug/di/cordb.cpp b/src/coreclr/src/debug/di/cordb.cpp index e6ed44d..ae74c34 100644 --- a/src/coreclr/src/debug/di/cordb.cpp +++ b/src/coreclr/src/debug/di/cordb.cpp @@ -20,6 +20,13 @@ #include "dbgtransportmanager.h" #endif // FEATURE_DBGIPC_TRANSPORT_DI +#if defined(PLATFORM_UNIX) || defined(__ANDROID__) +// Local (in-process) debugging is not supported for UNIX and Android. +#define SUPPORT_LOCAL_DEBUGGING 0 +#else +#define SUPPORT_LOCAL_DEBUGGING 1 +#endif + //********** Globals. ********************************************************* #ifndef FEATURE_PAL HINSTANCE g_hInst; // Instance handle to this piece of code. @@ -499,7 +506,7 @@ DbiGetThreadContext(HANDLE hThread, DT_CONTEXT *lpContext) { // if we aren't local debugging this isn't going to work -#if !defined(_ARM_) || defined(FEATURE_DBGIPC_TRANSPORT_DI) || defined(__ANDROID__) +#if !defined(_ARM_) || defined(FEATURE_DBGIPC_TRANSPORT_DI) || !SUPPORT_LOCAL_DEBUGGING _ASSERTE(!"Can't use local GetThreadContext remotely, this needed to go to datatarget"); return FALSE; #else @@ -538,7 +545,7 @@ BOOL DbiSetThreadContext(HANDLE hThread, const DT_CONTEXT *lpContext) { -#if !defined(_ARM_) || defined(FEATURE_DBGIPC_TRANSPORT_DI) || defined(__ANDROID__) +#if !defined(_ARM_) || defined(FEATURE_DBGIPC_TRANSPORT_DI) || !SUPPORT_LOCAL_DEBUGGING _ASSERTE(!"Can't use local GetThreadContext remotely, this needed to go to datatarget"); return FALSE; #else -- 2.7.4