pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
coreclr-git: Eliminate not needed patches any more
Module Name: pkgsrc-wip
Committed By: Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By: kamil
Date: Tue Feb 2 11:20:09 2016 +0100
Changeset: 04845c46e8cac6aacec61b6f4c23aeb1f02932d0
Modified Files:
coreclr-git/distinfo
coreclr-git/patches/patch-src_dlls_mscorpe_pewriter.cpp
coreclr-git/patches/patch-src_pal_src_CMakeLists.txt
coreclr-git/patches/patch-src_pal_src_thread_context.cpp
coreclr-git/patches/patch-src_pal_src_thread_thread.cpp
Log Message:
coreclr-git: Eliminate not needed patches any more
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=04845c46e8cac6aacec61b6f4c23aeb1f02932d0
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
coreclr-git/distinfo | 8 ++++----
.../patches/patch-src_dlls_mscorpe_pewriter.cpp | 11 -----------
.../patches/patch-src_pal_src_CMakeLists.txt | 21 ---------------------
.../patches/patch-src_pal_src_thread_context.cpp | 20 +-------------------
.../patches/patch-src_pal_src_thread_thread.cpp | 12 ------------
5 files changed, 5 insertions(+), 67 deletions(-)
diffs:
diff --git a/coreclr-git/distinfo b/coreclr-git/distinfo
index d263232..5a65ea5 100644
--- a/coreclr-git/distinfo
+++ b/coreclr-git/distinfo
@@ -1,9 +1,9 @@
$NetBSD$
SHA1 (patch-src_debug_ee_debugger.h) = 43cd45cafa38911900b395ec1596496938d62a81
-SHA1 (patch-src_dlls_mscorpe_pewriter.cpp) = d5e72752a4b4a3a8d0ae4644b0de5109b44d516b
+SHA1 (patch-src_dlls_mscorpe_pewriter.cpp) = adc83b19e793491b1c6ea0fd8b46cd9f32e592fc
SHA1 (patch-src_pal_inc_pal__char16.h) = 205f6a8533838c192b36bbb00155da1b02e0f629
-SHA1 (patch-src_pal_src_CMakeLists.txt) = 71a097704efc29fad79f2fc88ca8899245a37453
+SHA1 (patch-src_pal_src_CMakeLists.txt) = adc83b19e793491b1c6ea0fd8b46cd9f32e592fc
SHA1 (patch-src_pal_src_config.h.in) = 05c67c2131ed0eec3ba6fb80de08e101c9ec98cb
SHA1 (patch-src_pal_src_configure.cmake) = 0bcb4ff8c0def2f146d29e75e781aa414fb5db23
SHA1 (patch-src_pal_src_cruntime_file.cpp) = 315ad5db53ef2b893a77aa131ce97999214e0e11
@@ -12,8 +12,8 @@ SHA1 (patch-src_pal_src_exception_seh-unwind.cpp) = 64a221a2f57b6654cae73a2aba0b
SHA1 (patch-src_pal_src_exception_signal.cpp) = ba0cabad71792a0108ffd9ec29254751f1e95997
SHA1 (patch-src_pal_src_include_pal_context.h) = 32e5535866b4c7046bb05cc152b2e6db9dc9cf9b
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_pal_src_thread_context.cpp) = 9f059a29685a95edcf88c936603b562f4457de9a
+SHA1 (patch-src_pal_src_thread_thread.cpp) = adc83b19e793491b1c6ea0fd8b46cd9f32e592fc
SHA1 (patch-src_pal_tests_palsuite_c__runtime_sscanf_test4_test4.c) = 01e8f755465d5d9e2beb7333d711759c75c3a9a7
SHA1 (patch-src_pal_tests_palsuite_c__runtime_sscanf_test5_test5.c) = 94c430a39f26663cca6cdae78548e7b4d776b88f
SHA1 (patch-src_pal_tests_palsuite_c__runtime_sscanf_test6_test6.c) = 2f5f1eb383c460b9c3ae7200466da83b50e3f1ee
diff --git a/coreclr-git/patches/patch-src_dlls_mscorpe_pewriter.cpp b/coreclr-git/patches/patch-src_dlls_mscorpe_pewriter.cpp
index 74fb2ea..afc7651 100644
--- a/coreclr-git/patches/patch-src_dlls_mscorpe_pewriter.cpp
+++ b/coreclr-git/patches/patch-src_dlls_mscorpe_pewriter.cpp
@@ -1,13 +1,2 @@
$NetBSD$
---- src/dlls/mscorpe/pewriter.cpp.orig 2016-01-28 19:04:13.000000000 +0000
-+++ src/dlls/mscorpe/pewriter.cpp
-@@ -1544,7 +1544,7 @@ void PEWriter::setSectionIndex(IMAGE_SEC
- h->SectionIndex = VAL32(m_iSeedSections + DWORD(s - SpecialNames));
- break;
- }
-- s++;
-+// s++;
- }
-
- }
diff --git a/coreclr-git/patches/patch-src_pal_src_CMakeLists.txt b/coreclr-git/patches/patch-src_pal_src_CMakeLists.txt
index 543b41a..afc7651 100644
--- a/coreclr-git/patches/patch-src_pal_src_CMakeLists.txt
+++ b/coreclr-git/patches/patch-src_pal_src_CMakeLists.txt
@@ -1,23 +1,2 @@
$NetBSD$
---- src/pal/src/CMakeLists.txt.orig 2016-02-01 23:37:48.000000000 +0000
-+++ src/pal/src/CMakeLists.txt
-@@ -250,6 +250,18 @@ if(CMAKE_SYSTEM_NAME STREQUAL Darwin)
- )
- endif(CMAKE_SYSTEM_NAME STREQUAL Darwin)
-
-+if(CMAKE_SYSTEM_NAME STREQUAL NetBSD)
-+# TODO: Port libunwind
-+# find_library(UNWIND unwind)
-+ find_library(INTL intl)
-+ target_link_libraries(coreclrpal
-+ pthread
-+ rt
-+# ${UNWIND}
-+ ${INTL}
-+ )
-+endif(CMAKE_SYSTEM_NAME STREQUAL NetBSD)
-+
- add_subdirectory(examples)
-
- if(FEATURE_EVENT_TRACE)
diff --git a/coreclr-git/patches/patch-src_pal_src_thread_context.cpp b/coreclr-git/patches/patch-src_pal_src_thread_context.cpp
index fd469ce..70346bd 100644
--- a/coreclr-git/patches/patch-src_pal_src_thread_context.cpp
+++ b/coreclr-git/patches/patch-src_pal_src_thread_context.cpp
@@ -1,6 +1,6 @@
$NetBSD$
---- src/pal/src/thread/context.cpp.orig 2016-02-01 01:55:12.000000000 +0000
+--- src/pal/src/thread/context.cpp.orig 2016-02-02 10:08:55.000000000 +0000
+++ src/pal/src/thread/context.cpp
@@ -19,6 +19,8 @@ Abstract:
@@ -11,24 +11,6 @@ $NetBSD$
#include "pal/palinternal.h"
#include "pal/dbgmsg.h"
#include "pal/context.h"
-@@ -200,7 +202,7 @@ BOOL CONTEXT_GetRegisters(DWORD processI
- if (ptrace((__ptrace_request)PT_GETREGS, processId, (caddr_t) &ptrace_registers, 0) == -1)
- #elif HAVE_BSD_REGS_T
- struct reg ptrace_registers;
-- if (ptrace(PT_GETREGS, processId, (caddr_t) &ptrace_registers, 0) == -1)
-+ if (PAL_PTRACE(PT_GETREGS, processId, &ptrace_registers, 0) == -1)
- #endif
- {
- ASSERT("Failed ptrace(PT_GETREGS, processId:%d) errno:%d (%s)\n",
-@@ -349,7 +351,7 @@ CONTEXT_SetThreadContext(
- #if HAVE_PT_REGS
- if (ptrace((__ptrace_request)PT_GETREGS, dwProcessId, (caddr_t)&ptrace_registers, 0) == -1)
- #elif HAVE_BSD_REGS_T
-- if (ptrace(PT_GETREGS, dwProcessId, (caddr_t)&ptrace_registers, 0) == -1)
-+ if (PAL_PTRACE(PT_GETREGS, dwProcessId, &ptrace_registers, 0) == -1)
- #endif
- {
- ASSERT("Failed ptrace(PT_GETREGS, processId:%d) errno:%d (%s)\n",
@@ -1351,3 +1353,5 @@ DBG_FlushInstructionCache(
return TRUE;
diff --git a/coreclr-git/patches/patch-src_pal_src_thread_thread.cpp b/coreclr-git/patches/patch-src_pal_src_thread_thread.cpp
index 7ffdcd4..afc7651 100644
--- a/coreclr-git/patches/patch-src_pal_src_thread_thread.cpp
+++ b/coreclr-git/patches/patch-src_pal_src_thread_thread.cpp
@@ -1,14 +1,2 @@
$NetBSD$
---- src/pal/src/thread/thread.cpp.orig 2016-02-01 01:51:45.000000000 +0000
-+++ src/pal/src/thread/thread.cpp
-@@ -1413,7 +1413,9 @@ CorUnix::GetThreadTimesInternal(
-
- pTargetThread->Lock(pThread);
-
-+#if 0
- if (pthread_getcpuclockid(pTargetThread->GetPThreadSelf(), &cid) != 0)
-+#endif
- {
- ASSERT("Unable to get clock from thread\n", hThread);
- SetLastError(ERROR_INTERNAL_ERROR);
Home |
Main Index |
Thread Index |
Old Index