From c37c2faf49387f120acac397edd8443a528c87d3 Mon Sep 17 00:00:00 2001 From: Jonghyun Park Date: Thu, 30 Mar 2017 02:25:15 +0900 Subject: [PATCH] [x86/Linux] Use Portable ArrayInitializeWorker (dotnet/coreclr#10550) Commit migrated from https://github.com/dotnet/coreclr/commit/4cd34ab9504fae49506ccaea61b2dbba03710a40 --- src/coreclr/src/classlibnative/bcltype/arraynative.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/coreclr/src/classlibnative/bcltype/arraynative.cpp b/src/coreclr/src/classlibnative/bcltype/arraynative.cpp index 53a3654..c54d2f3 100644 --- a/src/coreclr/src/classlibnative/bcltype/arraynative.cpp +++ b/src/coreclr/src/classlibnative/bcltype/arraynative.cpp @@ -175,7 +175,7 @@ void ArrayInitializeWorker(ARRAYBASEREF * arrayRef, PCODE ctorFtn = pCanonMT->GetSlot(slot); -#ifdef _X86_ +#if defined(_TARGET_X86_) && !defined(FEATURE_PAL) BEGIN_CALL_TO_MANAGED(); @@ -206,7 +206,7 @@ void ArrayInitializeWorker(ARRAYBASEREF * arrayRef, } END_CALL_TO_MANAGED(); -#else // _X86_ +#else // _TARGET_X86_ && !FEATURE_PAL // // This is quite a bit slower, but it is portable. // @@ -230,7 +230,7 @@ void ArrayInitializeWorker(ARRAYBASEREF * arrayRef, offset += size; } -#endif // _X86_ +#endif // !_TARGET_X86_ || FEATURE_PAL } -- 2.7.4