From 56d4ba8a9338c3ff7378d18378f38ad847f130f2 Mon Sep 17 00:00:00 2001
From: danmosemsft <danmose@microsoft.com>
Date: Sat, 11 Feb 2017 07:20:12 -0800
Subject: Revert "Remove always defined FEATURE_CORESYSTEM"

This reverts commit 751771a8976f909af772e35c167bd7e3ffbe44c8.
---
 src/vm/comutilnative.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/vm/comutilnative.cpp')

diff --git a/src/vm/comutilnative.cpp b/src/vm/comutilnative.cpp
index 04ad7a8c1a..1c9703a0ac 100644
--- a/src/vm/comutilnative.cpp
+++ b/src/vm/comutilnative.cpp
@@ -1500,6 +1500,12 @@ void QCALLTYPE Buffer::MemMove(void *dst, void *src, size_t length)
 {
     QCALL_CONTRACT;
 
+#if defined(FEATURE_CORECLR) && !defined(FEATURE_CORESYSTEM)
+    // Callers of memcpy do expect and handle access violations in some scenarios.
+    // Access violations in the runtime dll are turned into fail fast by the vector exception handler by default.
+    // We need to supress this behavior for CoreCLR using AVInRuntimeImplOkayHolder because of memcpy is statically linked in.
+    AVInRuntimeImplOkayHolder avOk;
+#endif
 
     memmove(dst, src, length);
 }
-- 
cgit v1.2.3