coreclr-git: Trivial fixes to push build further

[Kamil Rytarowski <n54%gmx.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Tue Feb 2 01:14:16 2016 +0100
Changeset:	728130155dec9934426346a2d6618db8fd06bc95

Modified Files:
	coreclr-git/distinfo
Added Files:
	coreclr-git/patches/patch-src_pal_src_debug_debug.cpp
	coreclr-git/patches/patch-src_utilcode_delayloadhelpers.cpp
	coreclr-git/patches/patch-src_vm_jitinterfacegen.cpp
	coreclr-git/patches/patch-src_vm_threadsuspend.cpp

Log Message:
coreclr-git: Trivial fixes to push build further

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=728130155dec9934426346a2d6618db8fd06bc95

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 coreclr-git/distinfo                               |  3 ++
 .../patches/patch-src_pal_src_debug_debug.cpp      | 42 ++++++++++++++++++++++
 .../patch-src_utilcode_delayloadhelpers.cpp        | 18 ++++++++++
 .../patches/patch-src_vm_jitinterfacegen.cpp       | 19 ++++++++++
 coreclr-git/patches/patch-src_vm_threadsuspend.cpp | 32 +++++++++++++++++
 5 files changed, 114 insertions(+)

diffs:
diff --git a/coreclr-git/distinfo b/coreclr-git/distinfo
index 4f98210..33eaaf2 100644
--- a/coreclr-git/distinfo
+++ b/coreclr-git/distinfo
@@ -14,3 +14,6 @@ SHA1 (patch-src_pal_src_include_pal_context.h) = 32e5535866b4c7046bb05cc152b2e6d
 SHA1 (patch-src_pal_src_include_pal_synchcache.hpp) = 7ace14659295f07fd62e0d2a5f2b2d55541debfb
 SHA1 (patch-src_pal_src_thread_context.cpp) = badf337b8b9c561db9cbf928ea2f35b54178a7e0
 SHA1 (patch-src_pal_src_thread_thread.cpp) = 7c11ae04827da599d2e2b64ae8d57efc62b2494b
+SHA1 (patch-src_utilcode_delayloadhelpers.cpp) = 8e3d9d1897d2af39d4e2eaf47b4f9060cd6914d7
+SHA1 (patch-src_vm_jitinterfacegen.cpp) = 6e990673242964381238929116e78a67e7ea7967
+SHA1 (patch-src_vm_threadsuspend.cpp) = dd56cdb5daa9f3f14af13ee172d618386f14f704
diff --git a/coreclr-git/patches/patch-src_pal_src_debug_debug.cpp b/coreclr-git/patches/patch-src_pal_src_debug_debug.cpp
new file mode 100644
index 0000000..aa8a09d
--- /dev/null
+++ b/coreclr-git/patches/patch-src_pal_src_debug_debug.cpp
@@ -0,0 +1,42 @@
+$NetBSD$
+
+--- src/pal/src/debug/debug.cpp.orig	2016-01-28 19:04:13.000000000 +0000
++++ src/pal/src/debug/debug.cpp
+@@ -146,7 +146,8 @@ FlushInstructionCache(
+ 
+     if (lpBaseAddress != NULL)
+     {
+-        Ret = DBG_FlushInstructionCache(lpBaseAddress, dwSize);
++//        Ret = DBG_FlushInstructionCache(lpBaseAddress, dwSize);
++        Ret = TRUE;
+     }
+     else
+     {
+@@ -459,11 +460,13 @@ GetThreadContext(
+     {
+         if (!pTargetThread->IsDummy())
+         {
++#if 0
+             ret = CONTEXT_GetThreadContext(
+                 GetCurrentProcessId(),
+                 pTargetThread->GetPThreadSelf(),
+                 lpContext
+                 );
++#endif
+         }
+         else
+         {
+@@ -521,11 +524,13 @@ SetThreadContext(
+     {
+         if (!pTargetThread->IsDummy())
+         {
++#if 0
+             ret = CONTEXT_SetThreadContext(
+                 GetCurrentProcessId(),
+                 pTargetThread->GetPThreadSelf(),
+                 lpContext
+                 );
++#endif
+         }
+         else
+         {
diff --git a/coreclr-git/patches/patch-src_utilcode_delayloadhelpers.cpp b/coreclr-git/patches/patch-src_utilcode_delayloadhelpers.cpp
new file mode 100644
index 0000000..5dfd1dc
--- /dev/null
+++ b/coreclr-git/patches/patch-src_utilcode_delayloadhelpers.cpp
@@ -0,0 +1,18 @@
+$NetBSD$
+
+--- src/utilcode/delayloadhelpers.cpp.orig	2016-01-28 19:04:13.000000000 +0000
++++ src/utilcode/delayloadhelpers.cpp
+@@ -93,7 +93,7 @@ namespace DelayLoad
+             HMODULE hMod = nullptr;
+             IfFailRet(m_pModule->GetValue(&hMod));
+ 
+-            LPVOID pvFunc = ::GetProcAddress(hMod, m_szFunctionName);
++            LPVOID pvFunc = reinterpret_cast<LPVOID>(::GetProcAddress(hMod, m_szFunctionName));
+             hr = (pvFunc == nullptr) ? HRESULT_FROM_GetLastError() : S_OK;
+             
+             {   // Lock scope
+@@ -112,4 +112,3 @@ namespace DelayLoad
+         return m_hr;
+     }
+ }
+-
diff --git a/coreclr-git/patches/patch-src_vm_jitinterfacegen.cpp b/coreclr-git/patches/patch-src_vm_jitinterfacegen.cpp
new file mode 100644
index 0000000..ae56a57
--- /dev/null
+++ b/coreclr-git/patches/patch-src_vm_jitinterfacegen.cpp
@@ -0,0 +1,19 @@
+$NetBSD$
+
+--- src/vm/jitinterfacegen.cpp.orig	2016-01-28 19:04:13.000000000 +0000
++++ src/vm/jitinterfacegen.cpp
+@@ -224,10 +224,10 @@ void InitJITHelpers1()
+         if (GCHeap::UseAllocationContexts())
+         {
+ #ifdef FEATURE_IMPLICIT_TLS
+-            SetJitHelperFunction(CORINFO_HELP_NEWSFAST, JIT_NewS_MP_FastPortable);
+-            SetJitHelperFunction(CORINFO_HELP_NEWSFAST_ALIGN8, JIT_NewS_MP_FastPortable);
+-            SetJitHelperFunction(CORINFO_HELP_NEWARR_1_VC, JIT_NewArr1VC_MP_FastPortable);
+-            SetJitHelperFunction(CORINFO_HELP_NEWARR_1_OBJ, JIT_NewArr1OBJ_MP_FastPortable);
++            SetJitHelperFunction(CORINFO_HELP_NEWSFAST, reinterpret_cast<void*>(JIT_NewS_MP_FastPortable));
++            SetJitHelperFunction(CORINFO_HELP_NEWSFAST_ALIGN8, reinterpret_cast<void*>(JIT_NewS_MP_FastPortable));
++            SetJitHelperFunction(CORINFO_HELP_NEWARR_1_VC, reinterpret_cast<void*>(JIT_NewArr1VC_MP_FastPortable));
++            SetJitHelperFunction(CORINFO_HELP_NEWARR_1_OBJ, reinterpret_cast<void*>(JIT_NewArr1OBJ_MP_FastPortable));
+ 
+             ECall::DynamicallyAssignFCallImpl(GetEEFuncEntryPoint(AllocateString_MP_FastPortable), ECall::FastAllocateString);
+ #else // !FEATURE_IMPLICIT_TLS
diff --git a/coreclr-git/patches/patch-src_vm_threadsuspend.cpp b/coreclr-git/patches/patch-src_vm_threadsuspend.cpp
new file mode 100644
index 0000000..003a14c
--- /dev/null
+++ b/coreclr-git/patches/patch-src_vm_threadsuspend.cpp
@@ -0,0 +1,32 @@
+$NetBSD$
+
+--- src/vm/threadsuspend.cpp.orig	2016-01-28 19:04:13.000000000 +0000
++++ src/vm/threadsuspend.cpp
+@@ -8445,23 +8445,23 @@ void PALAPI HandleGCSuspensionForInterru
+         ClrFlsValueSwitch threadStackWalking(TlsIdx_StackWalkerWalkingThread, pThread);
+ 
+         // Hijack the return address to point to the appropriate routine based on the method's return type.
+-        void *pvHijackAddr = OnHijackScalarTripThread;
++        void *pvHijackAddr = reinterpret_cast<void*>(OnHijackScalarTripThread);
+         MethodDesc *pMethodDesc = codeInfo.GetMethodDesc();
+         MethodTable* pMT = NULL;
+         MetaSig::RETURNTYPE type = pMethodDesc->ReturnsObject(INDEBUG_COMMA(false) &pMT);
+         if (type == MetaSig::RETOBJ)
+         {
+-            pvHijackAddr = OnHijackObjectTripThread;
++            pvHijackAddr = reinterpret_cast<void*>(OnHijackObjectTripThread);
+         }
+         else if (type == MetaSig::RETBYREF)
+         {
+-            pvHijackAddr = OnHijackInteriorPointerTripThread;
++            pvHijackAddr = reinterpret_cast<void*>(OnHijackInteriorPointerTripThread);
+         }
+ #ifdef FEATURE_UNIX_AMD64_STRUCT_PASSING
+         else if (type == MetaSig::RETVALUETYPE)
+         {
+             pThread->SetHijackReturnTypeClass(pMT->GetClass());
+-            pvHijackAddr = OnHijackStructInRegsTripThread;
++            pvHijackAddr = reinterpret_cast<void*>(OnHijackStructInRegsTripThread);
+         }
+ #endif // FEATURE_UNIX_AMD64_STRUCT_PASSING
+