diff options
| author | Bruce Forstall <brucefo@microsoft.com> | 2017-03-19 19:46:08 -0700 |
|---|---|---|
| committer | Bruce Forstall <brucefo@microsoft.com> | 2017-03-19 19:46:08 -0700 |
| commit | 4ddfdefc0fe2c7f48ff3f2ead52e43ddaa831058 (patch) | |
| tree | 85abd716982b1b940be28937f1f38ddc4dca09d4 | |
| parent | 8b99922f32596822b14d3d62e8c54fca5b19f257 (diff) | |
| download | coreclr-4ddfdefc0fe2c7f48ff3f2ead52e43ddaa831058.tar.gz coreclr-4ddfdefc0fe2c7f48ff3f2ead52e43ddaa831058.tar.bz2 coreclr-4ddfdefc0fe2c7f48ff3f2ead52e43ddaa831058.zip | |
Desktop side of the change to remove COR_JIT_EE_VERSION
1. Bring over the JIT-EE interface file changes,
2. Stop building ctpjit.dll, and delete its build rules,
3. Stop building skipjit.dll.
[tfs-changeset: 1651372]
| -rw-r--r-- | src/jit/DIRS.proj | 4 | ||||
| -rw-r--r-- | src/jit/compiler.cpp | 1 |
2 files changed, 0 insertions, 5 deletions
diff --git a/src/jit/DIRS.proj b/src/jit/DIRS.proj index eb00cc1d64..12ea52fb20 100644 --- a/src/jit/DIRS.proj +++ b/src/jit/DIRS.proj @@ -36,13 +36,9 @@ <ProjectFile Condition="'$(BuildArchitecture)' == 'arm'" Include="protojit\protojit.nativeproj" /> <ProjectFile Condition="'$(BuildArchitecture)' == 'amd64'" Include="protojit\protojit.nativeproj" /> - <ProjectFile Condition="'$(BuildArchitecture)' == 'amd64'" Include="ctp\ctpjit.nativeproj" /> <ProjectFile Condition="'$(BuildArchitecture)' == 'amd64'" Include="arm64altjit\arm64altjit.nativeproj" /> <ProjectFile Condition="'$(BuildArchitecture)' == 'i386'" Include="protojit\protojit.nativeproj" /> <ProjectFile Condition="'$(BuildArchitecture)' == 'i386'" Include="protononjit\protononjit.nativeproj" /> - - <!-- We could build skipjit for all architectures, but we only need it for x86 currently --> - <ProjectFile Condition="'$(BuildArchitecture)' == 'i386'" Include="skipjit\skipjit.nativeproj" /> </ItemGroup> <!--Import the targets--> diff --git a/src/jit/compiler.cpp b/src/jit/compiler.cpp index 5db4d3f726..3f756233cf 100644 --- a/src/jit/compiler.cpp +++ b/src/jit/compiler.cpp @@ -2296,7 +2296,6 @@ void Compiler::compSetProcessor() #ifdef FEATURE_AVX_SUPPORT // COMPlus_EnableAVX can be used to disable using AVX if available on a target machine. - // Note that FEATURE_AVX_SUPPORT is not enabled for ctpjit opts.compCanUseAVX = false; if (!jitFlags.IsSet(JitFlags::JIT_FLAG_PREJIT) && jitFlags.IsSet(JitFlags::JIT_FLAG_USE_AVX2)) { |