diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2019-05-24 05:34:44 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-24 05:34:44 -0700 |
| commit | e4134398fd3c91cf3db99972f66fa74d5aa32bcf (patch) | |
| tree | 4a2a5e515a8c2b23818203e3a81a7794013e7516 /src/jit | |
| parent | d5d18896900561b7aaf38ba9501a8525a4b9caea (diff) | |
| download | coreclr-e4134398fd3c91cf3db99972f66fa74d5aa32bcf.tar.gz coreclr-e4134398fd3c91cf3db99972f66fa74d5aa32bcf.tar.bz2 coreclr-e4134398fd3c91cf3db99972f66fa74d5aa32bcf.zip | |
Remove dependency on IEEMemoryManager (#24755)
Diffstat (limited to 'src/jit')
| -rw-r--r-- | src/jit/ClrJit.PAL.exports | 1 | ||||
| -rw-r--r-- | src/jit/ClrJit.exports | 1 | ||||
| -rw-r--r-- | src/jit/armelnonjit/armelnonjit.def | 1 | ||||
| -rw-r--r-- | src/jit/dll/clrjit.def | 1 | ||||
| -rw-r--r-- | src/jit/ee_il_dll.cpp | 2 | ||||
| -rw-r--r-- | src/jit/jittelemetry.cpp | 2 | ||||
| -rw-r--r-- | src/jit/protojit/protojit.def | 1 | ||||
| -rw-r--r-- | src/jit/protononjit/protononjit.def | 1 |
8 files changed, 2 insertions, 8 deletions
diff --git a/src/jit/ClrJit.PAL.exports b/src/jit/ClrJit.PAL.exports index f53923fa68..b27c61f6b1 100644 --- a/src/jit/ClrJit.PAL.exports +++ b/src/jit/ClrJit.PAL.exports @@ -1,6 +1,5 @@ getJit jitStartup -sxsJitStartup DllMain PAL_RegisterModule PAL_UnregisterModule diff --git a/src/jit/ClrJit.exports b/src/jit/ClrJit.exports index 60a223bab1..41a37dbcf9 100644 --- a/src/jit/ClrJit.exports +++ b/src/jit/ClrJit.exports @@ -5,4 +5,3 @@ EXPORTS getJit jitStartup - sxsJitStartup diff --git a/src/jit/armelnonjit/armelnonjit.def b/src/jit/armelnonjit/armelnonjit.def index 1603af74ca..e229be40aa 100644 --- a/src/jit/armelnonjit/armelnonjit.def +++ b/src/jit/armelnonjit/armelnonjit.def @@ -4,4 +4,3 @@ EXPORTS getJit jitStartup - sxsJitStartup diff --git a/src/jit/dll/clrjit.def b/src/jit/dll/clrjit.def index 1603af74ca..e229be40aa 100644 --- a/src/jit/dll/clrjit.def +++ b/src/jit/dll/clrjit.def @@ -4,4 +4,3 @@ EXPORTS getJit jitStartup - sxsJitStartup diff --git a/src/jit/ee_il_dll.cpp b/src/jit/ee_il_dll.cpp index 882c9bcbca..a1f3c8c2c6 100644 --- a/src/jit/ee_il_dll.cpp +++ b/src/jit/ee_il_dll.cpp @@ -176,12 +176,14 @@ HINSTANCE GetModuleInst() return (g_hInst); } +#ifndef FEATURE_CORECLR extern "C" DLLEXPORT void __stdcall sxsJitStartup(CoreClrCallbacks const& cccallbacks) { #ifndef SELF_NO_HOST InitUtilcode(cccallbacks); #endif } +#endif // FEATURE_CORECLR #endif // !FEATURE_MERGE_JIT_AND_ENGINE diff --git a/src/jit/jittelemetry.cpp b/src/jit/jittelemetry.cpp index 9498791981..021fb45cc4 100644 --- a/src/jit/jittelemetry.cpp +++ b/src/jit/jittelemetry.cpp @@ -69,8 +69,6 @@ // This roughly translates to InitUtilcode() being called before jitDllOnProcessAttach. // // For CLRJIT.dll, compStartup is called on jitOnDllProcessAttach(). -// This can be called twice through sxsJitStartup -- so prevent double initialization. -// UtilCode is init-ed by this time. The same is true for CoreCLR. // // 2) For CLRJIT.dll and CoreCLR, compShutdown will be called during jitOnDllProcessDetach(). // diff --git a/src/jit/protojit/protojit.def b/src/jit/protojit/protojit.def index 1603af74ca..e229be40aa 100644 --- a/src/jit/protojit/protojit.def +++ b/src/jit/protojit/protojit.def @@ -4,4 +4,3 @@ EXPORTS getJit jitStartup - sxsJitStartup diff --git a/src/jit/protononjit/protononjit.def b/src/jit/protononjit/protononjit.def index 1603af74ca..e229be40aa 100644 --- a/src/jit/protononjit/protononjit.def +++ b/src/jit/protononjit/protononjit.def @@ -4,4 +4,3 @@ EXPORTS getJit jitStartup - sxsJitStartup |