From: Jonghyun Park <parjong@gmail.com>
Date: Thu, 6 Jul 2017 06:05:34 +0000 (+0900)
Subject: [x86/Linux] Enable thread-abort reraise loop prevention (#12646)
X-Git-Tag: accepted/tizen/base/20180629.140029~1083^2~266
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e5557aea38564be9c2e1630ae7b075c3b76837b3;p=platform%2Fupstream%2Fcoreclr.git

[x86/Linux] Enable thread-abort reraise loop prevention (#12646)
---

diff --git a/src/vm/exceptionhandling.cpp b/src/vm/exceptionhandling.cpp
index dd95badf..c6d42ed 100644
--- a/src/vm/exceptionhandling.cpp
+++ b/src/vm/exceptionhandling.cpp
@@ -1490,7 +1490,7 @@ void ExceptionTracker::InitializeCrawlFrame(CrawlFrame* pcfThisFrame, Thread* pT
 #endif // ESTABLISHER_FRAME_ADDRESS_IS_CALLER_SP
     }
 
-#if defined(_TARGET_ARM_) || defined(_TARGET_ARM64_)
+#ifdef ADJUST_PC_UNWOUND_TO_CALL
     // Further below, we will adjust the ControlPC based upon whether we are at a callsite or not.
     // We need to do this for "RegDisplay.ControlPC" field as well so that when data structures like
     // EECodeInfo initialize themselves using this field, they will have the correct absolute value
@@ -1509,12 +1509,12 @@ void ExceptionTracker::InitializeCrawlFrame(CrawlFrame* pcfThisFrame, Thread* pT
         fAdjustRegdisplayControlPC = true;
 
     }
+#endif // ADJUST_PC_UNWOUND_TO_CALL
 
 #if defined(_TARGET_ARM_)
     // Remove the Thumb bit
     ControlPCForEHSearch = ThumbCodeToDataPointer<DWORD_PTR, DWORD_PTR>(ControlPCForEHSearch);
 #endif
-#endif // _TARGET_ARM_ || _TARGET_ARM64_
 
 #ifdef ADJUST_PC_UNWOUND_TO_CALL
     // If the OS indicated that the IP is a callsite, then adjust the ControlPC by decrementing it