pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
coreclr-git: Eliminate merged patches
Module Name: pkgsrc-wip
Committed By: Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By: kamil
Date: Mon Feb 1 02:59:42 2016 +0100
Changeset: 7cd1ff2728a745b27104beeee5f7fe3241b7ead6
Modified Files:
coreclr-git/distinfo
coreclr-git/patches/patch-src_pal_src_thread_context.cpp
coreclr-git/patches/patch-src_pal_src_thread_thread.cpp
Removed Files:
coreclr-git/patches/patch-src_pal_src_safecrt_safecrt__output__s.c
coreclr-git/patches/patch-src_pal_src_safecrt_safecrt__woutput__s.c
Log Message:
coreclr-git: Eliminate merged patches
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=7cd1ff2728a745b27104beeee5f7fe3241b7ead6
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
coreclr-git/distinfo | 6 ++---
.../patch-src_pal_src_safecrt_safecrt__output__s.c | 10 --------
...patch-src_pal_src_safecrt_safecrt__woutput__s.c | 11 ---------
.../patches/patch-src_pal_src_thread_context.cpp | 28 +---------------------
.../patches/patch-src_pal_src_thread_thread.cpp | 16 -------------
5 files changed, 3 insertions(+), 68 deletions(-)
diffs:
diff --git a/coreclr-git/distinfo b/coreclr-git/distinfo
index 586949f..27a7d10 100644
--- a/coreclr-git/distinfo
+++ b/coreclr-git/distinfo
@@ -7,7 +7,5 @@ SHA1 (patch-src_pal_src_cruntime_file.cpp) = 315ad5db53ef2b893a77aa131ce97999214
SHA1 (patch-src_pal_src_exception_seh-unwind.cpp) = ffb395a23d66e33e5cf1b0f3f4ff5feff52a56fc
SHA1 (patch-src_pal_src_exception_signal.cpp) = 1bcb47f927a0c8037876b47ca4d15afb24cbd410
SHA1 (patch-src_pal_src_include_pal_context.h) = 32e5535866b4c7046bb05cc152b2e6db9dc9cf9b
-SHA1 (patch-src_pal_src_safecrt_safecrt__output__s.c) = ed008b078417d790c989226f50f4fe90f0def1ef
-SHA1 (patch-src_pal_src_safecrt_safecrt__woutput__s.c) = 0d666b335e262ed84a385bd3537cdbd94efa46e4
-SHA1 (patch-src_pal_src_thread_context.cpp) = bd5fe3f1793f32e396ace0a9b0cc06b8424b529a
-SHA1 (patch-src_pal_src_thread_thread.cpp) = eb397c1fdd60e2bd9eb5a5c01c267d86acdd712d
+SHA1 (patch-src_pal_src_thread_context.cpp) = 7dbd841a0628a5ea21abffd6cd90c403e44e1f6c
+SHA1 (patch-src_pal_src_thread_thread.cpp) = adc83b19e793491b1c6ea0fd8b46cd9f32e592fc
diff --git a/coreclr-git/patches/patch-src_pal_src_safecrt_safecrt__output__s.c b/coreclr-git/patches/patch-src_pal_src_safecrt_safecrt__output__s.c
deleted file mode 100644
index 835c479..0000000
--- a/coreclr-git/patches/patch-src_pal_src_safecrt_safecrt__output__s.c
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD$
-
---- src/pal/src/safecrt/safecrt_output_s.c.orig 2016-01-28 19:04:13.000000000 +0000
-+++ src/pal/src/safecrt/safecrt_output_s.c
-@@ -41,4 +41,5 @@ typedef char _TCHAR;
- typedef char TCHAR;
- #define _T(x) x
-
-+#include <stdarg.h>
- #include "output.inl"
diff --git a/coreclr-git/patches/patch-src_pal_src_safecrt_safecrt__woutput__s.c b/coreclr-git/patches/patch-src_pal_src_safecrt_safecrt__woutput__s.c
deleted file mode 100644
index 81063b5..0000000
--- a/coreclr-git/patches/patch-src_pal_src_safecrt_safecrt__woutput__s.c
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD$
-
---- src/pal/src/safecrt/safecrt_woutput_s.c.orig 2016-01-28 19:04:13.000000000 +0000
-+++ src/pal/src/safecrt/safecrt_woutput_s.c
-@@ -54,5 +54,5 @@ typedef wchar_t _TCHAR;
- typedef wchar_t TCHAR;
- #define _T(x) L##x
-
-+#include <stdarg.h>
- #include "output.inl"
--
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 8c2f324..28f097e 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-01-31 18:28:53.000000000 +0000
+--- src/pal/src/thread/context.cpp.orig 2016-02-01 01:55:12.000000000 +0000
+++ src/pal/src/thread/context.cpp
@@ -200,7 +200,7 @@ BOOL CONTEXT_GetRegisters(DWORD processI
if (ptrace((__ptrace_request)PT_GETREGS, processId, (caddr_t) &ptrace_registers, 0) == -1)
@@ -20,29 +20,3 @@ $NetBSD$
#endif
{
ASSERT("Failed ptrace(PT_GETREGS, processId:%d) errno:%d (%s)\n",
-@@ -634,6 +634,7 @@ DWORD CONTEXTGetExceptionCodeForSignal(c
- case SEGV_MAPERR: // Address not mapped to object
- case SEGV_ACCERR: // Invalid permissions for mapped object
- return EXCEPTION_ACCESS_VIOLATION;
-+#ifdef SI_KERNEL
- case SI_KERNEL:
- {
- // Identify privileged instructions that are not identified as such by the system
-@@ -647,6 +648,7 @@ DWORD CONTEXTGetExceptionCodeForSignal(c
- }
- // fall through
- }
-+#endif
- default:
- break;
- }
-@@ -665,7 +667,9 @@ DWORD CONTEXTGetExceptionCodeForSignal(c
- case SIGTRAP:
- switch (siginfo->si_code)
- {
-+#ifdef SI_KERNEL
- case SI_KERNEL:
-+#endif
- case SI_USER:
- case TRAP_BRKPT: // Process breakpoint
- return EXCEPTION_BREAKPOINT;
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 49cefe7..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,18 +1,2 @@
$NetBSD$
---- src/pal/src/thread/thread.cpp.orig 2016-01-31 18:28:53.000000000 +0000
-+++ src/pal/src/thread/thread.cpp
-@@ -621,11 +621,13 @@ CorUnix::InternalCreateThread(
- dwStackSize = CPalThread::s_dwDefaultThreadStackSize;
- }
-
-+#ifdef PTHREAD_STACK_MIN
- if (PTHREAD_STACK_MIN > pthreadStackSize)
- {
- WARN("default stack size is reported as %d, but PTHREAD_STACK_MIN is "
- "%d\n", pthreadStackSize, PTHREAD_STACK_MIN);
- }
-+#endif
-
- if (pthreadStackSize < dwStackSize)
- {
Home |
Main Index |
Thread Index |
Old Index