diff options
| author | Mike McLaughlin <mikem@microsoft.com> | 2016-09-28 23:50:20 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-28 23:50:20 -0700 |
| commit | 8493c03a5f9e4d2aaf4e56e5c228642e221993bd (patch) | |
| tree | 851e9f5870e124936218c6f155a79e527aea1a11 /src/vm/ceeload.h | |
| parent | 0e2a160b704424b865229a95355ca54753fadf03 (diff) | |
| download | coreclr-8493c03a5f9e4d2aaf4e56e5c228642e221993bd.tar.gz coreclr-8493c03a5f9e4d2aaf4e56e5c228642e221993bd.tar.bz2 coreclr-8493c03a5f9e4d2aaf4e56e5c228642e221993bd.zip | |
Fix ifdefs used to select the symbol reader dll name (#7406)
Diffstat (limited to 'src/vm/ceeload.h')
| -rw-r--r-- | src/vm/ceeload.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/vm/ceeload.h b/src/vm/ceeload.h index ce2e76e277..d9944c15f7 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") |