From: Jonghyun Park <parjong@gmail.com>
Date: Thu, 2 Mar 2017 07:50:11 +0000 (+0900)
Subject: [x86/Linux] Clean up EXCEPTION_REGISTRATION_RECORD (dotnet/coreclr#9895)
X-Git-Tag: submit/tizen/20210909.063632~11030^2~7881
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=29a405df0a9480ce8ce94d3520a0dbe50fd818e7;p=platform%2Fupstream%2Fdotnet%2Fruntime.git

[x86/Linux] Clean up EXCEPTION_REGISTRATION_RECORD (dotnet/coreclr#9895)



Commit migrated from https://github.com/dotnet/coreclr/commit/262f09cbb657febc7454ca8a9675d3213d5ee8a0
---

diff --git a/src/coreclr/src/pal/inc/rt/palrt.h b/src/coreclr/src/pal/inc/rt/palrt.h
index 059d3a6..9360058 100644
--- a/src/coreclr/src/pal/inc/rt/palrt.h
+++ b/src/coreclr/src/pal/inc/rt/palrt.h
@@ -1491,11 +1491,6 @@ typedef struct _DISPATCHER_CONTEXT {
 
 #elif defined(_X86_)
 
-typedef struct _EXCEPTION_REGISTRATION_RECORD {
-    struct _EXCEPTION_REGISTRATION_RECORD *Next;
-    PEXCEPTION_ROUTINE Handler;
-} EXCEPTION_REGISTRATION_RECORD;
-
 typedef struct _DISPATCHER_CONTEXT {
     DWORD ControlPc;
     DWORD ImageBase;
diff --git a/src/coreclr/src/vm/frames.h b/src/coreclr/src/vm/frames.h
index b009f22..747cbd6 100644
--- a/src/coreclr/src/vm/frames.h
+++ b/src/coreclr/src/vm/frames.h
@@ -2846,7 +2846,7 @@ protected:
 };
 #endif // _TARGET_X86_ && !FEATURE_PAL
 
-#if defined(_TARGET_X86_)
+#if defined(_TARGET_X86_) && defined(FEATURE_COMINTEROP)
 //-------------------------------------------------------------------------
 // Exception handler for COM to managed frame
 //  and the layout of the exception registration record structure in the stack
@@ -2866,7 +2866,7 @@ struct ComToManagedExRecord
         return &m_frame;
     }
 };
-#endif // _TARGET_X86_
+#endif // _TARGET_X86_ && FEATURE_COMINTEROP
 
 
 //------------------------------------------------------------------------