diff options
| author | Aaron Robinson <arobins@microsoft.com> | 2018-11-30 10:06:28 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-30 10:06:28 -0800 |
| commit | 87ac2b53d4618f994e67266fd99f479531018059 (patch) | |
| tree | bc90a9cb089b05abf93c78540fa8dd9add1d85e4 /src/inc | |
| parent | 7972722e3a3788fe96056d0a5398f90466588b8f (diff) | |
| download | coreclr-87ac2b53d4618f994e67266fd99f479531018059.tar.gz coreclr-87ac2b53d4618f994e67266fd99f479531018059.tar.bz2 coreclr-87ac2b53d4618f994e67266fd99f479531018059.zip | |
Update how CoreDisTools is discovered (#21261)
* Update Disassembler logic to search for CoreDisTools next to binary _or_ under the path specified by CORE_ROOT
* Update GCCover critical section
Diffstat (limited to 'src/inc')
| -rw-r--r-- | src/inc/CrstTypes.def | 11 | ||||
| -rw-r--r-- | src/inc/crsttypes.h | 2 |
2 files changed, 3 insertions, 10 deletions
diff --git a/src/inc/CrstTypes.def b/src/inc/CrstTypes.def index 537134ab3c..180171ed3a 100644 --- a/src/inc/CrstTypes.def +++ b/src/inc/CrstTypes.def @@ -69,14 +69,7 @@ // running our test suites). Feel free to add meaningful comments to existing rules if you feel they can // usefully clarify the reasons for particular dependencies. // -// CrstTypeTool is a csScript file at file:..\..\bin\CrstTypeTool.csScript. Simply typing "CrstTypeTool" from a -// clrenv command window prompt should rebuild file:CrstTypes.h from the current CrstTypes.def (again, -// remember to check out CrstTypes.h first). -// Note: If you cannot run the script from command line, because of this error: -// Script language type is unsupported. -// Use /? for more help on usage. -// Or because .csscript extension is not associated with anything on your machine, -// Then use "csc.exe CrstTypeTool.csscript" from ClrEnv environment and run the resulting executable. +// See CrstTypeTool.cs for how to consume this file. // // Each Crst type definition is currently in alphabetical order. Please maintain this convention. // @@ -291,7 +284,7 @@ Crst NativeImageCache End Crst GCCover - AcquiredBefore LoaderHeap + AcquiredBefore LoaderHeap ReJITDomainTable End Crst GCMemoryPressure diff --git a/src/inc/crsttypes.h b/src/inc/crsttypes.h index 2dc6a2064c..23358432c2 100644 --- a/src/inc/crsttypes.h +++ b/src/inc/crsttypes.h @@ -227,7 +227,7 @@ int g_rgCrstLevelMap[] = 7, // CrstFriendAccessCache 7, // CrstFuncPtrStubs 5, // CrstFusionAppCtx - 3, // CrstGCCover + 9, // CrstGCCover 0, // CrstGCMemoryPressure 11, // CrstGlobalStrLiteralMap 1, // CrstHandleTable |