pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

corert-git: Remove merged patches upstream



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sun Jan 24 23:48:12 2016 +0100
Changeset:	f5c8d51788144cbd9e80a9c1ac896b18c6384c5d

Modified Files:
	corert-git/distinfo
Removed Files:
	corert-git/patches/patch-src_Native_Runtime_CachedInterfaceDispatch.cpp
	corert-git/patches/patch-src_Native_Runtime_EHHelpers.cpp

Log Message:
corert-git: Remove merged patches upstream

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

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

diffstat:
 corert-git/distinfo                                         |  2 --
 .../patch-src_Native_Runtime_CachedInterfaceDispatch.cpp    | 12 ------------
 corert-git/patches/patch-src_Native_Runtime_EHHelpers.cpp   | 13 -------------
 3 files changed, 27 deletions(-)

diffs:
diff --git a/corert-git/distinfo b/corert-git/distinfo
index 6168987..dac3d07 100644
--- a/corert-git/distinfo
+++ b/corert-git/distinfo
@@ -1,7 +1,5 @@
 $NetBSD$
 
-SHA1 (patch-src_Native_Runtime_CachedInterfaceDispatch.cpp) = 1485afd92ab2748e8d5f97708124e06aebd592f2
-SHA1 (patch-src_Native_Runtime_EHHelpers.cpp) = 2f64d4d24096fe6e36ef79aa80f1600bd96eda58
 SHA1 (patch-src_Native_Runtime_gcrhenv.cpp) = d76cb47a9e0e8e35c9512d61e2ddfc23c0dccbc9
 SHA1 (patch-src_Native_Runtime_gcrhscan.cpp) = 9326e04f09a35cf435a4d38e70cb02f9f59df351
 SHA1 (patch-src_Native_Runtime_thread.cpp) = 90cc0624800bba44cb798b7623ecfbc618853cd8
diff --git a/corert-git/patches/patch-src_Native_Runtime_CachedInterfaceDispatch.cpp b/corert-git/patches/patch-src_Native_Runtime_CachedInterfaceDispatch.cpp
deleted file mode 100644
index b3c3303..0000000
--- a/corert-git/patches/patch-src_Native_Runtime_CachedInterfaceDispatch.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD$
-
---- src/Native/Runtime/CachedInterfaceDispatch.cpp.orig	2016-01-23 11:26:49.000000000 +0000
-+++ src/Native/Runtime/CachedInterfaceDispatch.cpp
-@@ -544,6 +544,6 @@ COOP_PINVOKE_HELPER(PTR_Code, RhpResolve
-                                                                    PInvokeTransitionFrame * pTransitionFrame))
- {
-     CID_COUNTER_INC(CacheMisses);
--    return (PTR_Code)ManagedCallout2((UIntTarget)pObject, (UIntTarget)pCell, RhpCidResolve, pTransitionFrame);
-+    return (PTR_Code)ManagedCallout2((UIntTarget)pObject, (UIntTarget)pCell, reinterpret_cast<void*>(RhpCidResolve), pTransitionFrame);
- }
- #endif // FEATURE_CACHED_INTERFACE_DISPATCH
diff --git a/corert-git/patches/patch-src_Native_Runtime_EHHelpers.cpp b/corert-git/patches/patch-src_Native_Runtime_EHHelpers.cpp
deleted file mode 100644
index e857b28..0000000
--- a/corert-git/patches/patch-src_Native_Runtime_EHHelpers.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- src/Native/Runtime/EHHelpers.cpp.orig	2016-01-23 11:26:49.000000000 +0000
-+++ src/Native/Runtime/EHHelpers.cpp
-@@ -445,7 +445,7 @@ Int32 __stdcall RhpVectoredExceptionHand
-         {
-             // Get the module handle for this runtime. Do this by passing an address definitely within the
-             // module (the address of this function) to GetModuleHandleEx with the "from address" flag.
--            HANDLE hRuntimeModule = PalGetModuleHandleFromPointer(RhpVectoredExceptionHandler);
-+            HANDLE hRuntimeModule = PalGetModuleHandleFromPointer(reinterpret_cast<void*>(RhpVectoredExceptionHandler));
-             if (!hRuntimeModule)
-             {
-                 ASSERT_UNCONDITIONALLY("Failed to locate our own module handle");


Home | Main Index | Thread Index | Old Index