From 80670756034034cb32ccf385130a62991ed6374a Mon Sep 17 00:00:00 2001
From: Jan Kotas <jkotas@microsoft.com>
Date: Tue, 15 Dec 2015 05:13:46 -0800
Subject: Move Thread.Abort under FEATURE_LEGACYSURFACE

---
 src/mscorlib/model.xml | 5 +----
 src/vm/ecalllist.h     | 2 ++
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/mscorlib/model.xml b/src/mscorlib/model.xml
index 5b114cf3fa..ce97c4af58 100644
--- a/src/mscorlib/model.xml
+++ b/src/mscorlib/model.xml
@@ -7854,10 +7854,7 @@
       <Member Name="#ctor(System.Threading.ThreadStart)" />
       <Member Name="#ctor(System.Threading.ParameterizedThreadStart)" />
       <Member Name="MemoryBarrier" />
-      <Member Name="Abort" />
-      <!--
-      //<Member Name="Abort(System.Object)" />
-      -->
+      <Member Name="Abort" Condition="FEATURE_LEGACYSURFACE" />
       <Member Name="Finalize" />
       <Member Name="get_CurrentCulture" />
       <Member Name="get_CurrentThread" />
diff --git a/src/vm/ecalllist.h b/src/vm/ecalllist.h
index 0c8b063154..504802b50d 100644
--- a/src/vm/ecalllist.h
+++ b/src/vm/ecalllist.h
@@ -1323,7 +1323,9 @@ FCFuncStart(gThreadFuncs)
     FCFuncElement("BeginThreadAffinity", ThreadNative::BeginThreadAffinity)
     FCFuncElement("EndThreadAffinity", ThreadNative::EndThreadAffinity)
 #endif // FEATURE_CORECLR
+#ifdef FEATURE_LEGACYSURFACE
     FCFuncElement("AbortInternal", ThreadNative::Abort)
+#endif // FEATURE_LEGACYSURFACE
 #ifndef FEATURE_CORECLR
     FCFuncElement("ResetAbortNative", ThreadNative::ResetAbort)
 #endif // FEATURE_CORECLR
-- 
cgit v1.2.3