diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2016-02-02 17:13:27 -0800 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2016-02-02 17:13:27 -0800 |
| commit | 0763592867d3d8179503ce380d8eb45683a4e421 (patch) | |
| tree | a9b51dd11ef9e2a0af3832912ab4d86ced30327c /src/vm | |
| parent | b5a754d6e35dcb3b839fbc4ee7e4cc4b4d27673c (diff) | |
| parent | c8df018ab7ffe635af08089a2605bf95516f5d93 (diff) | |
| download | coreclr-0763592867d3d8179503ce380d8eb45683a4e421.tar.gz coreclr-0763592867d3d8179503ce380d8eb45683a4e421.tar.bz2 coreclr-0763592867d3d8179503ce380d8eb45683a4e421.zip | |
Merge pull request #2974 from krytarowski/netbsd-support-26
Fix build on NetBSD: cast ptr to function to ptr to data
Diffstat (limited to 'src/vm')
| -rw-r--r-- | src/vm/jitinterface.h | 2 | ||||
| -rw-r--r-- | src/vm/threadsuspend.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/vm/jitinterface.h b/src/vm/jitinterface.h index f01f57c90c..97dbd6235b 100644 --- a/src/vm/jitinterface.h +++ b/src/vm/jitinterface.h @@ -1546,7 +1546,7 @@ extern "C" #endif GARY_DECL(VMHELPDEF, hlpDynamicFuncTable, DYNAMIC_CORINFO_HELP_COUNT); -#define SetJitHelperFunction(ftnNum, pFunc) _SetJitHelperFunction(DYNAMIC_##ftnNum, pFunc) +#define SetJitHelperFunction(ftnNum, pFunc) _SetJitHelperFunction(DYNAMIC_##ftnNum, (void*)(pFunc)) void _SetJitHelperFunction(DynamicCorInfoHelpFunc ftnNum, void * pFunc); #ifdef ENABLE_FAST_GCPOLL_HELPER //These should only be called from ThreadStore::TrapReturningThreads! diff --git a/src/vm/threadsuspend.cpp b/src/vm/threadsuspend.cpp index d7be1806a4..257f13b2f4 100644 --- a/src/vm/threadsuspend.cpp +++ b/src/vm/threadsuspend.cpp @@ -8447,23 +8447,23 @@ void PALAPI HandleGCSuspensionForInterruptedThread(CONTEXT *interruptedContext) 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 |