pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
corert-git: Eliminate all local patches, no need for them any more
Module Name: pkgsrc-wip
Committed By: Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By: kamil
Date: Tue Jan 26 08:42:09 2016 +0100
Changeset: 35bd5dab519211ddd81825677e38ad9cfe480d58
Modified Files:
corert-git/distinfo
Removed Files:
corert-git/patches/patch-src_Native_Runtime_gcrhenv.cpp
corert-git/patches/patch-src_Native_Runtime_gcrhscan.cpp
corert-git/patches/patch-src_Native_Runtime_thread.cpp
corert-git/patches/patch-src_Native_Runtime_unix_PalRedhawkUnix.cpp
corert-git/patches/patch-src_Native_gc_env_gcenv.interlocked.inl
Log Message:
corert-git: Eliminate all local patches, no need for them any more
We are now at:
"CoreRT native components successfully built."
There is now need to satisfy the dependency on nuget and msbuild to progress.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=35bd5dab519211ddd81825677e38ad9cfe480d58
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
corert-git/distinfo | 5 ----
.../patches/patch-src_Native_Runtime_gcrhenv.cpp | 22 ----------------
.../patches/patch-src_Native_Runtime_gcrhscan.cpp | 22 ----------------
.../patches/patch-src_Native_Runtime_thread.cpp | 30 ----------------------
...atch-src_Native_Runtime_unix_PalRedhawkUnix.cpp | 22 ----------------
.../patch-src_Native_gc_env_gcenv.interlocked.inl | 13 ----------
6 files changed, 114 deletions(-)
diffs:
diff --git a/corert-git/distinfo b/corert-git/distinfo
index e9114a4..afc7651 100644
--- a/corert-git/distinfo
+++ b/corert-git/distinfo
@@ -1,7 +1,2 @@
$NetBSD$
-SHA1 (patch-src_Native_Runtime_gcrhenv.cpp) = d76cb47a9e0e8e35c9512d61e2ddfc23c0dccbc9
-SHA1 (patch-src_Native_Runtime_gcrhscan.cpp) = 9326e04f09a35cf435a4d38e70cb02f9f59df351
-SHA1 (patch-src_Native_Runtime_thread.cpp) = 90cc0624800bba44cb798b7623ecfbc618853cd8
-SHA1 (patch-src_Native_Runtime_unix_PalRedhawkUnix.cpp) = cacf933e76e3af669391abb929c3c509a9175308
-SHA1 (patch-src_Native_gc_env_gcenv.interlocked.inl) = 0dc2cc6aa827a84e91360976d9217c6e69adb328
diff --git a/corert-git/patches/patch-src_Native_Runtime_gcrhenv.cpp b/corert-git/patches/patch-src_Native_Runtime_gcrhenv.cpp
deleted file mode 100644
index 0ec7be9..0000000
--- a/corert-git/patches/patch-src_Native_Runtime_gcrhenv.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD$
-
---- src/Native/Runtime/gcrhenv.cpp.orig 2016-01-23 11:26:49.000000000 +0000
-+++ src/Native/Runtime/gcrhenv.cpp
-@@ -717,7 +717,7 @@ void RedhawkGCInterface::ScanStackRoots(
- sContext.m_pfnCallback = pfnScanCallback;
- sContext.m_pContext = pContext;
-
-- pThread->GcScanRoots(ScanRootsCallbackWrapper, &sContext);
-+ pThread->GcScanRoots(reinterpret_cast<void*>(ScanRootsCallbackWrapper), &sContext);
- #else
- UNREFERENCED_PARAMETER(pThread);
- UNREFERENCED_PARAMETER(pfnScanCallback);
-@@ -735,7 +735,7 @@ void RedhawkGCInterface::ScanStaticRoots
- sContext.m_pfnCallback = pfnScanCallback;
- sContext.m_pContext = pContext;
-
-- GetRuntimeInstance()->EnumAllStaticGCRefs(ScanRootsCallbackWrapper, &sContext);
-+ GetRuntimeInstance()->EnumAllStaticGCRefs(reinterpret_cast<void*>(ScanRootsCallbackWrapper), &sContext);
- #else
- UNREFERENCED_PARAMETER(pfnScanCallback);
- UNREFERENCED_PARAMETER(pContext);
diff --git a/corert-git/patches/patch-src_Native_Runtime_gcrhscan.cpp b/corert-git/patches/patch-src_Native_Runtime_gcrhscan.cpp
deleted file mode 100644
index 953695a..0000000
--- a/corert-git/patches/patch-src_Native_Runtime_gcrhscan.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD$
-
---- src/Native/Runtime/gcrhscan.cpp.orig 2016-01-23 11:26:49.000000000 +0000
-+++ src/Native/Runtime/gcrhscan.cpp
-@@ -30,7 +30,7 @@
-
- void EnumAllStaticGCRefs(EnumGcRefCallbackFunc * fn, EnumGcRefScanContext * sc)
- {
-- GetRuntimeInstance()->EnumAllStaticGCRefs(fn, sc);
-+ GetRuntimeInstance()->EnumAllStaticGCRefs(reinterpret_cast<void*>(fn), sc);
- }
-
- /*
-@@ -65,7 +65,7 @@ VOID GCToEEInterface::GcScanRoots(EnumGc
- #if defined(FEATURE_EVENT_TRACE) && !defined(DACCESS_COMPILE)
- sc->dwEtwRootKind = kEtwGCRootKindStack;
- #endif
-- pThread->GcScanRoots(fn, sc);
-+ pThread->GcScanRoots(reinterpret_cast<void*>(fn), sc);
-
- #if defined(FEATURE_EVENT_TRACE) && !defined(DACCESS_COMPILE)
- sc->dwEtwRootKind = kEtwGCRootKindOther;
diff --git a/corert-git/patches/patch-src_Native_Runtime_thread.cpp b/corert-git/patches/patch-src_Native_Runtime_thread.cpp
deleted file mode 100644
index 081a345..0000000
--- a/corert-git/patches/patch-src_Native_Runtime_thread.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD$
-
---- src/Native/Runtime/thread.cpp.orig 2016-01-23 11:26:49.000000000 +0000
-+++ src/Native/Runtime/thread.cpp
-@@ -540,9 +540,9 @@ EXTERN_C void FASTCALL RhpGcProbeHijackB
-
- static void* NormalHijackTargets[3] =
- {
-- RhpGcProbeHijackScalar, // GCRK_Scalar = 0,
-- RhpGcProbeHijackObject, // GCRK_Object = 1,
-- RhpGcProbeHijackByref // GCRK_Byref = 2,
-+ reinterpret_cast<void*>(RhpGcProbeHijackScalar), // GCRK_Scalar = 0,
-+ reinterpret_cast<void*>(RhpGcProbeHijackObject), // GCRK_Object = 1,
-+ reinterpret_cast<void*>(RhpGcProbeHijackByref) // GCRK_Byref = 2,
- };
-
- #ifdef FEATURE_GC_STRESS
-@@ -552,9 +552,9 @@ EXTERN_C void FASTCALL RhpGcStressHijack
-
- static void* GcStressHijackTargets[3] =
- {
-- RhpGcStressHijackScalar, // GCRK_Scalar = 0,
-- RhpGcStressHijackObject, // GCRK_Object = 1,
-- RhpGcStressHijackByref // GCRK_Byref = 2,
-+ reinterpret_cast<void*>(RhpGcStressHijackScalar), // GCRK_Scalar = 0,
-+ reinterpret_cast<void*>(RhpGcStressHijackObject), // GCRK_Object = 1,
-+ reinterpret_cast<void*>(RhpGcStressHijackByref) // GCRK_Byref = 2,
- };
- #endif // FEATURE_GC_STRESS
-
diff --git a/corert-git/patches/patch-src_Native_Runtime_unix_PalRedhawkUnix.cpp b/corert-git/patches/patch-src_Native_Runtime_unix_PalRedhawkUnix.cpp
deleted file mode 100644
index 736688c..0000000
--- a/corert-git/patches/patch-src_Native_Runtime_unix_PalRedhawkUnix.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD$
-
---- src/Native/Runtime/unix/PalRedhawkUnix.cpp.orig 2016-01-25 00:17:12.000000000 +0000
-+++ src/Native/Runtime/unix/PalRedhawkUnix.cpp
-@@ -335,7 +335,7 @@ int UTF8ToWideChar(const char* bytes, in
- size_t inbufbytesleft = len;
- size_t outbufbytesleft = bufLen;
-
-- int rc = iconv(cd, &inbuf, &inbufbytesleft, &outbuf, &outbufbytesleft);
-+ int rc = iconv(cd, const_cast<const char **>(&inbuf), &inbufbytesleft, &outbuf, &outbufbytesleft);
- if (rc == -1)
- {
- fprintf(stderr, "iconv_open failed with %d\n", errno);
-@@ -361,7 +361,7 @@ int WideCharToUTF8(const wchar_t* chars,
- size_t inbufbytesleft = len;
- size_t outbufbytesleft = bufLen;
-
-- int rc = iconv(cd, &inbuf, &inbufbytesleft, &outbuf, &outbufbytesleft);
-+ int rc = iconv(cd, const_cast<const char **>(&inbuf), &inbufbytesleft, &outbuf, &outbufbytesleft);
- if (rc == -1)
- {
- fprintf(stderr, "iconv_open failed with %d\n", errno);
diff --git a/corert-git/patches/patch-src_Native_gc_env_gcenv.interlocked.inl b/corert-git/patches/patch-src_Native_gc_env_gcenv.interlocked.inl
deleted file mode 100644
index 65b99f0..0000000
--- a/corert-git/patches/patch-src_Native_gc_env_gcenv.interlocked.inl
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- src/Native/gc/env/gcenv.interlocked.inl.orig 2016-01-23 11:26:49.000000000 +0000
-+++ src/Native/gc/env/gcenv.interlocked.inl
-@@ -193,7 +193,7 @@ __forceinline T Interlocked::CompareExch
- return (T)(TADDR)_InterlockedCompareExchange((long volatile *)(void* volatile *)destination, (long)(void*)exchange, (long)(void*)comparand);
- #endif
- #else
-- return (T)(TADDR)__sync_val_compare_and_swap((void* volatile *)destination, comparand, exchange);
-+ return (T)(TADDR)__sync_val_compare_and_swap((void* volatile *)destination, comparand, reinterpret_cast<void*>(exchange));
- #endif
- }
-
Home |
Main Index |
Thread Index |
Old Index