Skip to content

Commit

Permalink
Delete mdil support from coreclr
Browse files Browse the repository at this point in the history
[tfs-changeset: 1573006]
  • Loading branch information
jkotas committed Feb 6, 2016
1 parent 0f2a671 commit 15a6b93
Show file tree
Hide file tree
Showing 8 changed files with 1 addition and 4,459 deletions.
1 change: 0 additions & 1 deletion clr.defines.targets
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,6 @@
<CDefines Condition="'$(UseStl)' == 'true'">$(CDefines);USE_STL</CDefines>
<CDefines Condition="'$(FeatureMulticoreJIT)' == 'true'">$(CDefines);FEATURE_MULTICOREJIT</CDefines>
<CDefines Condition="'$(FeatureUseAsmGCWriteBarriers)' == 'true'">$(CDefines);FEATURE_USE_ASM_GC_WRITE_BARRIERS</CDefines>
<CDefines Condition="'$(MDILGenerator)' == 'true'">$(CDefines);MDIL</CDefines>
<CDefines Condition="'$(BinderDebugLog)' == 'true'">$(CDefines);BINDER_DEBUG_LOG</CDefines>
<CDefines Condition="'$(FeatureSymDiff)' == 'true'">$(CDefines);FEATURE_SYMDIFF</CDefines>
<CDefines Condition="'$(FeatureWinDbAppCompat)' == 'true'">$(CDefines);FEATURE_WIN_DB_APPCOMPAT</CDefines>
Expand Down
2 changes: 0 additions & 2 deletions clr.props
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,6 @@
<FeatureVersioningLog>false</FeatureVersioningLog>
<FeatureNativeImageGeneration>true</FeatureNativeImageGeneration>
<FeatureReadyToRunCompiler Condition="'$(FeatureReadyToRun)' == 'true'">true</FeatureReadyToRunCompiler>
<!-- Turn on MDIL generation support in crossgen for phone -->
<MDILGenerator Condition="'$(BuildForCoreSystem)' == 'true' and '$(TargetArch)'=='arm'">true</MDILGenerator>
<!-- Link crossgen with static CRT to make it standalone .exe -->
<LinkUseCMT>true</LinkUseCMT>
<UseMsvcrt>false</UseMsvcrt>
Expand Down
6 changes: 1 addition & 5 deletions src/tools/crossgen/crossgen.nativeproj
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,11 @@
</TargetLib>

<!-- We build RyuJIT only for amd64 and arm64, and use JIT32 for ARM and x86 -->
<TargetLib Condition="'$(MDILGenerator)' != 'true'" Include="$(ClrLibPath)\jit_crossgen.lib">
<TargetLib Include="$(ClrLibPath)\jit_crossgen.lib">
<ProjectReference Condition="'$(_BuildArch)' == 'amd64' or '$(_BuildArch)' == 'arm64'">$(ClrSrcDirectory)jit\crossgen\jit_crossgen.nativeproj</ProjectReference>
<ProjectReference Condition="'$(_BuildArch)' != 'amd64' and '$(_BuildArch)' != 'arm64'">$(ClrSrcDirectory)jit32\crossgen\jit_crossgen.nativeproj</ProjectReference>
</TargetLib>

<TargetLib Condition="'$(MDILGenerator)' == 'true'" Include="$(ClrLibPath)\jitmdil_crossgen.lib">
<ProjectReference>$(ClrSrcDirectory)jitmdil\crossgen\jit_crossgen.nativeproj</ProjectReference>
</TargetLib>

<TargetLib Include="$(ClrLibPath)\gcinfo_crossgen.lib">
<ProjectReference>$(ClrSrcDirectory)gcinfo\crossgen\gcinfo_crossgen.nativeproj</ProjectReference>
</TargetLib>
Expand Down
2 changes: 0 additions & 2 deletions src/tools/dirs.proj
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,6 @@
<ProjectFile Condition="'$(BuildArchitecture)' != 'arm' and '$(BuildArchitecture)' != 'arm64' and '$(BuildProjectName)' != 'CoreSys'" Include="ildbsymbols\ildbsymbols.nativeproj" />
<ProjectFile Include="coregen\coregen.nativeproj" />
<ProjectFile Include="nidump\nidump.nativeproj" Condition="!('$(BuildProjectName)' == 'CoreSys' and ('$(BuildArchitecture)' == 'arm' or '$(BuildArchitecture)' == 'arm64'))"/>
<ProjectFile Include="MDILBind\dirs.proj" Condition="'$(BuildArchitecture)' == 'arm'" />
<ProjectFile Include="mdilxapcompile\mdilxapcompile.csproj" />
<ProjectFile Include="crossgen\crossgen.nativeproj" />
<ProjectFile Include="spawnnowow\spawnnowow.nativeproj" Condition="('$(BuildArchitecture)' == 'i386' or '$(BuildArchitecture)' == 'amd64' or '$(BuildArchitecture)' == 'ia64') and '$(BuildProjectName)' != 'CoreSys'" />
<ProjectFile Condition="'$(BuildProjectName)' == 'CoreSys'" Include="winphoneintegrate\winphoneintegrate.csproj" />
Expand Down
Loading

0 comments on commit 15a6b93

Please sign in to comment.