pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
coreclr-git: Eliminate merged patch for casting pointers
Module Name: pkgsrc-wip
Committed By: Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By: kamil
Date: Wed Feb 3 02:25:35 2016 +0100
Changeset: 15a018f7743fb6b02b70baf44725a8fbe17d4bc8
Modified Files:
coreclr-git/distinfo
Removed Files:
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: Eliminate merged patch for casting pointers
It landed upstream in an improved version.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=15a018f7743fb6b02b70baf44725a8fbe17d4bc8
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
coreclr-git/distinfo | 3 --
.../patch-src_utilcode_delayloadhelpers.cpp | 18 ------------
.../patches/patch-src_vm_jitinterfacegen.cpp | 19 -------------
coreclr-git/patches/patch-src_vm_threadsuspend.cpp | 32 ----------------------
4 files changed, 72 deletions(-)
diffs:
diff --git a/coreclr-git/distinfo b/coreclr-git/distinfo
index 954c211..c9848a2 100644
--- a/coreclr-git/distinfo
+++ b/coreclr-git/distinfo
@@ -21,6 +21,3 @@ SHA1 (patch-src_pal_tests_palsuite_c__runtime_swscanf_test5_test5.c) = b3d756b03
SHA1 (patch-src_pal_tests_palsuite_c__runtime_swscanf_test6_test6.c) = b34a7ff156a208e4d2fb7d5be1fad00a056b1dd3
SHA1 (patch-src_pal_tests_palsuite_c__runtime_swscanf_test7_test7.c) = c9c466c9bf16d92cbc49edd7871ef49df8b5d7e8
SHA1 (patch-src_pal_tests_palsuite_c__runtime_swscanf_test8_test8.c) = 308f4de7dc624572db2090e4b1c81b3ee4a6d902
-SHA1 (patch-src_utilcode_delayloadhelpers.cpp) = 8e3d9d1897d2af39d4e2eaf47b4f9060cd6914d7
-SHA1 (patch-src_vm_jitinterfacegen.cpp) = 6e990673242964381238929116e78a67e7ea7967
-SHA1 (patch-src_vm_threadsuspend.cpp) = 8a7e2bea569a4eb6a9896b9bcfc9cadc803b4315
diff --git a/coreclr-git/patches/patch-src_utilcode_delayloadhelpers.cpp b/coreclr-git/patches/patch-src_utilcode_delayloadhelpers.cpp
deleted file mode 100644
index 5dfd1dc..0000000
--- a/coreclr-git/patches/patch-src_utilcode_delayloadhelpers.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-$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
deleted file mode 100644
index ae56a57..0000000
--- a/coreclr-git/patches/patch-src_vm_jitinterfacegen.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-$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
deleted file mode 100644
index e3672e0..0000000
--- a/coreclr-git/patches/patch-src_vm_threadsuspend.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD$
-
---- src/vm/threadsuspend.cpp.orig 2016-02-02 22:59:18.000000000 +0000
-+++ src/vm/threadsuspend.cpp
-@@ -8447,23 +8447,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
-
Home |
Main Index |
Thread Index |
Old Index