From c52bec686afe4439b2b6c7acc1fe9df21f005b70 Mon Sep 17 00:00:00 2001
From: Jan Kotas <jkotas@microsoft.com>
Date: Mon, 1 Feb 2016 18:13:41 -0800
Subject: [PATCH] Fix fallout from enabling profiling

- Compiler optimization assumption invalid: EE expects method to exist: System.StubHelpers.StubHelpers:ProfilerBeginTransitionCallback
- Add stubs for ARM
---
 clr.coreclr.props        |  2 --
 src/mscorlib/model.xml   |  4 ++--
 src/vm/arm/unixstubs.cpp | 15 +++++++++++++++
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/clr.coreclr.props b/clr.coreclr.props
index 2373b7b..77b5791 100644
--- a/clr.coreclr.props
+++ b/clr.coreclr.props
@@ -103,8 +103,6 @@
 
     <FeatureStubsAsIL>true</FeatureStubsAsIL>
 
-    <ProfilingSupportedBuild>false</ProfilingSupportedBuild>
-
     <!-- Windows specific features -->
     <FeatureWin32Registry>false</FeatureWin32Registry>
     <FeatureAppX>false</FeatureAppX>
diff --git a/src/mscorlib/model.xml b/src/mscorlib/model.xml
index 49295b5..7d51ae8 100644
--- a/src/mscorlib/model.xml
+++ b/src/mscorlib/model.xml
@@ -11373,8 +11373,8 @@
       <Member Name="MarshalToManagedVaListInternal(System.IntPtr,System.IntPtr)" />
       <Member Name="MarshalToUnmanagedVaListInternal(System.IntPtr,System.UInt32,System.IntPtr)" />
       <Member Name="CalcVaListSize(System.IntPtr)" />
-      <Member Name="ProfilerBeginTransitionCallback(System.IntPtr,System.IntPtr,System.Object)" Platform="Win" /> <!-- EE -->
-      <Member Name="ProfilerEndTransitionCallback(System.IntPtr,System.IntPtr)" Platform="Win" /> <!-- EE -->
+      <Member Name="ProfilerBeginTransitionCallback(System.IntPtr,System.IntPtr,System.Object)" /> <!-- EE -->
+      <Member Name="ProfilerEndTransitionCallback(System.IntPtr,System.IntPtr)" /> <!-- EE -->
       <Member Name="SafeHandleAddRef(System.Runtime.InteropServices.SafeHandle,System.Boolean@)" />
       <Member Name="SafeHandleRelease(System.Runtime.InteropServices.SafeHandle)" />
       <Member Name="ValidateObject(System.Object,System.IntPtr,System.Object)" />
diff --git a/src/vm/arm/unixstubs.cpp b/src/vm/arm/unixstubs.cpp
index 0cfb7c6..9fd4cbf 100644
--- a/src/vm/arm/unixstubs.cpp
+++ b/src/vm/arm/unixstubs.cpp
@@ -35,4 +35,19 @@ extern "C"
     {
         PORTABILITY_ASSERT("Implement for PAL");
     }
+
+    void ProfileEnterNaked(FunctionIDOrClientID functionIDOrClientID)
+    {
+        PORTABILITY_ASSERT("Implement for PAL");
+    }
+
+    void ProfileLeaveNaked(FunctionIDOrClientID functionIDOrClientID)
+    {
+        PORTABILITY_ASSERT("Implement for PAL");
+    }
+
+    void ProfileTailcallNaked(FunctionIDOrClientID functionIDOrClientID)
+    {
+        PORTABILITY_ASSERT("Implement for PAL");
+    }
 };
-- 
2.7.4