diff options
| author | Gaurav Khanna <gkhanna@microsoft.com> | 2016-04-22 12:24:51 -0700 |
|---|---|---|
| committer | Gaurav Khanna <gkhanna@microsoft.com> | 2016-04-26 08:08:20 -0700 |
| commit | 140396f479d5d33bca0daef1f072eef4992ed78e (patch) | |
| tree | 691bb2faa922940c1de7363fd51ac109495e6473 /src/vm/pefile.cpp | |
| parent | b0d809bd6ae65e85591af504e1797b115ea25b23 (diff) | |
| download | coreclr-140396f479d5d33bca0daef1f072eef4992ed78e.tar.gz coreclr-140396f479d5d33bca0daef1f072eef4992ed78e.tar.bz2 coreclr-140396f479d5d33bca0daef1f072eef4992ed78e.zip | |
Keep FEATURE_MERGE_JIT_AND_ENGINE with refactored approach
Diffstat (limited to 'src/vm/pefile.cpp')
| -rw-r--r-- | src/vm/pefile.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/vm/pefile.cpp b/src/vm/pefile.cpp index f6bf408cac..1537ef9c60 100644 --- a/src/vm/pefile.cpp +++ b/src/vm/pefile.cpp @@ -1748,11 +1748,11 @@ static void RuntimeVerifyLog(DWORD level, LoggableAssembly *pLogAsm, const WCHAR static const LPCWSTR CorCompileRuntimeDllNames[NUM_RUNTIME_DLLS] = { #ifdef FEATURE_CORECLR - MAKEDLLNAME_W(W("CORECLR")) + MAKEDLLNAME_W(W("coreclr")), #else MAKEDLLNAME_W(W("CLR")), - MAKEDLLNAME_W(W("CLRJIT")) #endif + MAKEDLLNAME_W(W("clrjit")) }; #if !defined(FEATURE_CORECLR) && !defined(CROSSGEN_COMPILE) @@ -1828,7 +1828,7 @@ extern HMODULE CorCompileGetRuntimeDll(CorCompileRuntimeDlls id) // Currently special cased for every entry. #ifdef FEATURE_CORECLR - static_assert_no_msg(NUM_RUNTIME_DLLS == 1); + static_assert_no_msg(NUM_RUNTIME_DLLS == 2); static_assert_no_msg(CORECLR_INFO == 0); #else // !FEATURE_CORECLR static_assert_no_msg(NUM_RUNTIME_DLLS == 2); |