From c893bf0699c81d7ea9ca9d37543eb5339d64d116 Mon Sep 17 00:00:00 2001 From: Ben Pye Date: Wed, 16 Sep 2015 23:38:18 +0000 Subject: [PATCH] Fix ARM build regression --- src/debug/inc/dbgipcevents.h | 2 +- src/pal/src/exception/seh-unwind.cpp | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/debug/inc/dbgipcevents.h b/src/debug/inc/dbgipcevents.h index b110a23..c41e355 100644 --- a/src/debug/inc/dbgipcevents.h +++ b/src/debug/inc/dbgipcevents.h @@ -181,7 +181,7 @@ struct MSLAYOUT DebuggerIPCRuntimeOffsets // aren't any embedded buffers in the DebuggerIPCControlBlock). #if defined(DBG_TARGET_X86) || defined(DBG_TARGET_ARM) -#define CorDBIPC_BUFFER_SIZE (1500) // hand tuned to ensure that ipc block in IPCHeader.h fits in 1 page. +#define CorDBIPC_BUFFER_SIZE (2088) // hand tuned to ensure that ipc block in IPCHeader.h fits in 1 page. #else // !_TARGET_X86_ && !_TARGET_ARM_ // This is the size of a DebuggerIPCEvent. You will hit an assert in Cordb::Initialize() (DI\process.cpp) // if this is not defined correctly. AMD64 actually has a page size of 0x1000, not 0x2000. diff --git a/src/pal/src/exception/seh-unwind.cpp b/src/pal/src/exception/seh-unwind.cpp index cf899f7..7a0a81f 100644 --- a/src/pal/src/exception/seh-unwind.cpp +++ b/src/pal/src/exception/seh-unwind.cpp @@ -323,7 +323,8 @@ BOOL PAL_VirtualUnwind(CONTEXT *context, KNONVOLATILE_CONTEXT_POINTERS *contextP #error don't know how to unwind on this platform #endif - +// These methods are only used on the AMD64 build +#ifdef _AMD64_ #ifdef __LINUX__ @@ -539,6 +540,7 @@ BOOL PAL_VirtualUnwindOutOfProc(CONTEXT *context, } #endif // !__LINUX__ +#endif // _AMD64_ /*++ Function: -- 2.7.4