From b6f9dbf426d688af91021357c49d9b17c5bdf525 Mon Sep 17 00:00:00 2001
From: Jan Kotas <jkotas@microsoft.com>
Date: Wed, 17 May 2017 05:49:01 -0700
Subject: 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.
---
 clr.coreclr.props | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'clr.coreclr.props')

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>
-- 
cgit v1.2.3