From 8493c03a5f9e4d2aaf4e56e5c228642e221993bd Mon Sep 17 00:00:00 2001 From: Mike McLaughlin Date: Wed, 28 Sep 2016 23:50:20 -0700 Subject: [PATCH] Fix ifdefs used to select the symbol reader dll name (#7406) --- src/vm/ceeload.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/vm/ceeload.h b/src/vm/ceeload.h index ce2e76e..d9944c1 100644 --- a/src/vm/ceeload.h +++ b/src/vm/ceeload.h @@ -96,14 +96,16 @@ class PersistentInlineTrackingMap; // The native symbol reader dll name #ifdef FEATURE_CORECLR -#if defined(_TARGET_AMD64_) +#if defined(_AMD64_) #define NATIVE_SYMBOL_READER_DLL W("Microsoft.DiaSymReader.Native.amd64.dll") -#elif defined(_TARGET_X86_) +#elif defined(_X86_) #define NATIVE_SYMBOL_READER_DLL W("Microsoft.DiaSymReader.Native.x86.dll") -#elif defined(_TARGET_ARM_) +#elif defined(_ARM_) #define NATIVE_SYMBOL_READER_DLL W("Microsoft.DiaSymReader.Native.arm.dll") -#elif defined(_TARGET_ARM64_) -#define NATIVE_SYMBOL_READER_DLL W("Microsoft.DiaSymReader.Native.arm64.dll") +#elif defined(_ARM64_) +// Use diasymreader until the package has an arm64 version - issue #7360 +//#define NATIVE_SYMBOL_READER_DLL W("Microsoft.DiaSymReader.Native.arm64.dll") +#define NATIVE_SYMBOL_READER_DLL W("diasymreader.dll") #endif #else #define NATIVE_SYMBOL_READER_DLL W("diasymreader.dll") -- 2.7.4