diff options
Diffstat (limited to 'src/vm/ceeload.h')
| -rw-r--r-- | src/vm/ceeload.h | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/src/vm/ceeload.h b/src/vm/ceeload.h index ce2e76e277..d15bd6b3d1 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") @@ -3392,10 +3394,12 @@ public: //----------------------------------------------------------------------------------------- BOOL IsPreV4Assembly(); +#ifdef FEATURE_CER //----------------------------------------------------------------------------------------- // Get reliability contract info, see ConstrainedExecutionRegion.cpp for details. //----------------------------------------------------------------------------------------- DWORD GetReliabilityContract(); +#endif //----------------------------------------------------------------------------------------- // Parse/Return NeutralResourcesLanguageAttribute if it exists (updates Module member variables at ngen time) @@ -3404,13 +3408,15 @@ public: protected: +#ifdef FEATURE_CER Volatile<DWORD> m_dwReliabilityContract; +#endif // initialize Crst controlling the Dynamic IL hashtables void InitializeDynamicILCrst(); -#ifndef DACCESS_COMPILE public: +#if !defined(DACCESS_COMPILE) && defined(FEATURE_CER) // Support for getting and creating information about Constrained Execution Regions rooted in this module. @@ -3441,7 +3447,7 @@ public: LIMITED_METHOD_CONTRACT; return m_pCerCrst; } -#endif // !DACCESS_COMPILE +#endif // !DACCESS_COMPILE && FEATURE_CER #ifdef FEATURE_CORECLR void VerifyAllMethods(); @@ -3454,11 +3460,13 @@ public: } private: +#ifdef FEATURE_CER EEPtrHashTable *m_pCerPrepInfo; // Root methods prepared for Constrained Execution Regions Crst *m_pCerCrst; // Mutex protecting update access to both of the above hashes #ifdef FEATURE_PREJIT CerNgenRootTable *m_pCerNgenRootTable; // Root methods of CERs found during ngen and requiring runtime restoration #endif +#endif // This struct stores the data used by the managed debugging infrastructure. If it turns out that // the debugger is increasing the size of the Module class by too much, we can consider allocating |