From bf096232ea1a743d55c278d4242d2d9702ebbc92 Mon Sep 17 00:00:00 2001
From: Jonghyun Park <parjong@gmail.com>
Date: Wed, 14 Dec 2016 19:35:21 +0900
Subject: [PATCH] Move RUNTIME_FUNCTION__BeginAddress into clrnt.h
 (dotnet/coreclr#8632)

RUNTIME_FUNCTION__BeginAddress is defined in corcompile.h for x86, but
is defined in clrnt.h for all the other architectures.

This commit moves RUNTIME_FUNCTION__BeginAddress defines for x86 into
clrnt.h to make it consistent.

Commit migrated from https://github.com/dotnet/coreclr/commit/3a8ebe8cefd0e2e7e14c544bcce687bf87fc7de9
---
 src/coreclr/src/inc/clrnt.h      | 9 +++++++--
 src/coreclr/src/inc/corcompile.h | 1 -
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/coreclr/src/inc/clrnt.h b/src/coreclr/src/inc/clrnt.h
index a1eefe849efcb..0e082c79d5c31 100644
--- a/src/coreclr/src/inc/clrnt.h
+++ b/src/coreclr/src/inc/clrnt.h
@@ -835,13 +835,18 @@ RtlVirtualUnwind_Unsafe(
 //  X86
 //
 
-#if defined(_TARGET_X86_) && !defined(FEATURE_PAL)
+#ifdef _TARGET_X86_
+#ifndef FEATURE_PAL
 
 typedef struct _DISPATCHER_CONTEXT {
     _EXCEPTION_REGISTRATION_RECORD* RegistrationPointer;
 } DISPATCHER_CONTEXT, *PDISPATCHER_CONTEXT;
 
-#endif // _TARGET_X86_ && !FEATURE_PAL
+#endif // !FEATURE_PAL
+
+#define RUNTIME_FUNCTION__BeginAddress(prf)             (prf)->BeginAddress
+
+#endif // _TARGET_X86_
 
 #ifdef _TARGET_ARM_
 #include "daccess.h"
diff --git a/src/coreclr/src/inc/corcompile.h b/src/coreclr/src/inc/corcompile.h
index 37c7fba480ed0..3b517ae21297a 100644
--- a/src/coreclr/src/inc/corcompile.h
+++ b/src/coreclr/src/inc/corcompile.h
@@ -85,7 +85,6 @@ typedef struct _RUNTIME_FUNCTION {
 
 typedef DPTR(RUNTIME_FUNCTION) PTR_RUNTIME_FUNCTION;
 
-#define RUNTIME_FUNCTION__BeginAddress(prf)             (prf)->BeginAddress
 
 // Chained unwind info. Used for cold methods.
 #define RUNTIME_FUNCTION_INDIRECT 0x80000000