summaryrefslogtreecommitdiff
path: root/clr.coreclr.props
diff options
context:
space:
mode:
authorJan Kotas <jkotas@microsoft.com>2017-05-17 05:49:01 -0700
committerJan Vorlicek <janvorli@microsoft.com>2017-05-17 05:49:01 -0700
commitb6f9dbf426d688af91021357c49d9b17c5bdf525 (patch)
tree440b4cd19376ddd66e343a9ff83af855e9adc2f0 /clr.coreclr.props
parent4704e9af61bd23695e382bc498553e457d3be77a (diff)
downloadcoreclr-b6f9dbf426d688af91021357c49d9b17c5bdf525.tar.gz
coreclr-b6f9dbf426d688af91021357c49d9b17c5bdf525.tar.bz2
coreclr-b6f9dbf426d688af91021357c49d9b17c5bdf525.zip
Switch multicast delegate stub on Windows x64 to use stubs-as-il (#11624)
Fixes #11611. The old hand generated assembly path did not work well for structs passed by reference.
Diffstat (limited to 'clr.coreclr.props')
-rw-r--r--clr.coreclr.props4
1 files changed, 3 insertions, 1 deletions
diff --git a/clr.coreclr.props b/clr.coreclr.props
index 059fb3a597..e8c2ff8a63 100644
--- a/clr.coreclr.props
+++ b/clr.coreclr.props
@@ -66,6 +66,7 @@
<FeatureXplatEventSource>true</FeatureXplatEventSource>
<FeatureArrayStubAsIL>true</FeatureArrayStubAsIL>
+ <FeatureMulticastStubAsIL>true</FeatureMulticastStubAsIL>
<FeatureStubsAsIL>true</FeatureStubsAsIL>
<!-- Windows specific features -->
@@ -81,7 +82,8 @@
</PropertyGroup>
<PropertyGroup Condition="'$(TargetsWindows)' == 'true'">
- <FeatureArrayStubAsIL Condition="('$(TargetArch)' == 'arm') or ('$(TargetArch)' == 'amd64') or ('$(TargetArch)' == 'arm64')">true</FeatureArrayStubAsIL>
+ <FeatureArrayStubAsIL Condition="'$(TargetArch)' != 'i386'">true</FeatureArrayStubAsIL>
+ <FeatureMulticastStubAsIL Condition="'$(TargetArch)' != 'i386'">true</FeatureMulticastStubAsIL>
<FeatureManagedEtw>true</FeatureManagedEtw>
<FeatureStubsAsIL Condition="'$(TargetArch)' == 'arm64'">true</FeatureStubsAsIL>
<FeatureUseLcid>true</FeatureUseLcid>