pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
coreclr-git: Kludge to push build forward
Module Name: pkgsrc-wip
Committed By: Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By: kamil
Date: Tue Feb 2 00:50:30 2016 +0100
Changeset: 2e5885ea885a65499c0b7c047666ff5e0d2cf8bf
Modified Files:
coreclr-git/distinfo
coreclr-git/patches/patch-src_pal_src_CMakeLists.txt
coreclr-git/patches/patch-src_pal_src_exception_seh-unwind.cpp
coreclr-git/patches/patch-src_pal_src_exception_signal.cpp
Log Message:
coreclr-git: Kludge to push build forward
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=2e5885ea885a65499c0b7c047666ff5e0d2cf8bf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
coreclr-git/distinfo | 7 +-
.../patches/patch-src_pal_src_CMakeLists.txt | 4 +-
.../patch-src_pal_src_exception_seh-unwind.cpp | 17 +++-
.../patches/patch-src_pal_src_exception_signal.cpp | 96 ++++++++++++++++++++++
4 files changed, 118 insertions(+), 6 deletions(-)
diffs:
diff --git a/coreclr-git/distinfo b/coreclr-git/distinfo
index 99a7a30..4f98210 100644
--- a/coreclr-git/distinfo
+++ b/coreclr-git/distinfo
@@ -3,12 +3,13 @@ $NetBSD$
SHA1 (patch-src_debug_ee_debugger.h) = 43cd45cafa38911900b395ec1596496938d62a81
SHA1 (patch-src_dlls_mscorpe_pewriter.cpp) = d5e72752a4b4a3a8d0ae4644b0de5109b44d516b
SHA1 (patch-src_pal_inc_pal__char16.h) = 205f6a8533838c192b36bbb00155da1b02e0f629
-SHA1 (patch-src_pal_src_CMakeLists.txt) = 05a13bfb9b266a9596db57050ffeb876c17e4ef1
+SHA1 (patch-src_pal_src_CMakeLists.txt) = 71a097704efc29fad79f2fc88ca8899245a37453
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
-SHA1 (patch-src_pal_src_exception_seh-unwind.cpp) = ffb395a23d66e33e5cf1b0f3f4ff5feff52a56fc
-SHA1 (patch-src_pal_src_exception_signal.cpp) = 1bcb47f927a0c8037876b47ca4d15afb24cbd410
+SHA1 (patch-src_pal_src_debug_debug.cpp) = 0d6bee5d2896de64effafa01d2e2989de82c76fc
+SHA1 (patch-src_pal_src_exception_seh-unwind.cpp) = 64a221a2f57b6654cae73a2aba0b59daf33b8224
+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
diff --git a/coreclr-git/patches/patch-src_pal_src_CMakeLists.txt b/coreclr-git/patches/patch-src_pal_src_CMakeLists.txt
index ac9d7eb..543b41a 100644
--- a/coreclr-git/patches/patch-src_pal_src_CMakeLists.txt
+++ b/coreclr-git/patches/patch-src_pal_src_CMakeLists.txt
@@ -1,8 +1,8 @@
$NetBSD$
---- src/pal/src/CMakeLists.txt.orig 2016-01-31 18:28:53.000000000 +0000
+--- src/pal/src/CMakeLists.txt.orig 2016-02-01 23:37:48.000000000 +0000
+++ src/pal/src/CMakeLists.txt
-@@ -251,6 +251,18 @@ if(CMAKE_SYSTEM_NAME STREQUAL Darwin)
+@@ -250,6 +250,18 @@ if(CMAKE_SYSTEM_NAME STREQUAL Darwin)
)
endif(CMAKE_SYSTEM_NAME STREQUAL Darwin)
diff --git a/coreclr-git/patches/patch-src_pal_src_exception_seh-unwind.cpp b/coreclr-git/patches/patch-src_pal_src_exception_seh-unwind.cpp
index 7d8bb0b..b89973f 100644
--- a/coreclr-git/patches/patch-src_pal_src_exception_seh-unwind.cpp
+++ b/coreclr-git/patches/patch-src_pal_src_exception_seh-unwind.cpp
@@ -10,7 +10,22 @@ $NetBSD$
#endif
// These methods are only used on the AMD64 build
-@@ -584,7 +583,7 @@ RtlpRaiseException(EXCEPTION_RECORD *Exc
+@@ -570,12 +569,14 @@ RtlpRaiseException(EXCEPTION_RECORD *Exc
+ ContextRecord.ContextFlags = CONTEXT_FULL;
+ CONTEXT_CaptureContext(&ContextRecord);
+
++#if 0
+ // Find the caller of RtlpRaiseException.
+ PAL_VirtualUnwind(&ContextRecord, NULL);
+
+ // The frame we're looking at now is RaiseException. We have to unwind one
+ // level further to get the actual context user code could be resumed at.
+ PAL_VirtualUnwind(&ContextRecord, NULL);
++#endif
+
+ #if defined(_X86_)
+ ExceptionRecord->ExceptionAddress = (void *) ContextRecord.Eip;
+@@ -584,7 +585,7 @@ RtlpRaiseException(EXCEPTION_RECORD *Exc
#elif defined(_ARM_) || defined(_ARM64_)
ExceptionRecord->ExceptionAddress = (void *) ContextRecord.Pc;
#else
diff --git a/coreclr-git/patches/patch-src_pal_src_exception_signal.cpp b/coreclr-git/patches/patch-src_pal_src_exception_signal.cpp
index 900c374..af832dc 100644
--- a/coreclr-git/patches/patch-src_pal_src_exception_signal.cpp
+++ b/coreclr-git/patches/patch-src_pal_src_exception_signal.cpp
@@ -11,3 +11,99 @@ $NetBSD$
/* local type definitions *****************************************************/
+@@ -194,10 +194,10 @@ static void sigill_handler(int code, sig
+
+ ucontext = (native_context_t *)context;
+
+- record.ExceptionCode = CONTEXTGetExceptionCodeForSignal(siginfo, ucontext);
++// record.ExceptionCode = CONTEXTGetExceptionCodeForSignal(siginfo, ucontext);
+ record.ExceptionFlags = EXCEPTION_IS_SIGNAL;
+ record.ExceptionRecord = NULL;
+- record.ExceptionAddress = GetNativeContextPC(ucontext);
++// record.ExceptionAddress = GetNativeContextPC(ucontext);
+ record.NumberParameters = 0;
+
+ pointers.ExceptionRecord = &record;
+@@ -241,10 +241,10 @@ static void sigfpe_handler(int code, sig
+
+ ucontext = (native_context_t *)context;
+
+- record.ExceptionCode = CONTEXTGetExceptionCodeForSignal(siginfo, ucontext);
++// record.ExceptionCode = CONTEXTGetExceptionCodeForSignal(siginfo, ucontext);
+ record.ExceptionFlags = EXCEPTION_IS_SIGNAL;
+ record.ExceptionRecord = NULL;
+- record.ExceptionAddress = GetNativeContextPC(ucontext);
++// record.ExceptionAddress = GetNativeContextPC(ucontext);
+ record.NumberParameters = 0;
+
+ pointers.ExceptionRecord = &record;
+@@ -288,10 +288,10 @@ static void sigsegv_handler(int code, si
+
+ ucontext = (native_context_t *)context;
+
+- record.ExceptionCode = CONTEXTGetExceptionCodeForSignal(siginfo, ucontext);
++// record.ExceptionCode = CONTEXTGetExceptionCodeForSignal(siginfo, ucontext);
+ record.ExceptionFlags = EXCEPTION_IS_SIGNAL;
+ record.ExceptionRecord = NULL;
+- record.ExceptionAddress = GetNativeContextPC(ucontext);
++// record.ExceptionAddress = GetNativeContextPC(ucontext);
+ record.NumberParameters = 2;
+
+ if (record.ExceptionCode == EXCEPTION_ACCESS_VIOLATION)
+@@ -358,10 +358,10 @@ static void sigtrap_handler(int code, si
+
+ ucontext = (native_context_t *)context;
+
+- record.ExceptionCode = CONTEXTGetExceptionCodeForSignal(siginfo, ucontext);
++// record.ExceptionCode = CONTEXTGetExceptionCodeForSignal(siginfo, ucontext);
+ record.ExceptionFlags = EXCEPTION_IS_SIGNAL;
+ record.ExceptionRecord = NULL;
+- record.ExceptionAddress = GetNativeContextPC(ucontext);
++// record.ExceptionAddress = GetNativeContextPC(ucontext);
+ record.NumberParameters = 0;
+
+ pointers.ExceptionRecord = &record;
+@@ -406,10 +406,10 @@ static void sigbus_handler(int code, sig
+
+ ucontext = (native_context_t *)context;
+
+- record.ExceptionCode = CONTEXTGetExceptionCodeForSignal(siginfo, ucontext);
++// record.ExceptionCode = CONTEXTGetExceptionCodeForSignal(siginfo, ucontext);
+ record.ExceptionFlags = EXCEPTION_IS_SIGNAL;
+ record.ExceptionRecord = NULL;
+- record.ExceptionAddress = GetNativeContextPC(ucontext);
++// record.ExceptionAddress = GetNativeContextPC(ucontext);
+ record.NumberParameters = 2;
+
+ // TODO: First parameter says whether a read (0) or write (non-0) caused the
+@@ -508,18 +508,19 @@ static void inject_activation_handler(in
+ native_context_t *ucontext = (native_context_t *)context;
+
+ CONTEXT winContext;
++#if 0
+ CONTEXTFromNativeContext(
+ ucontext,
+ &winContext,
+ CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_FLOATING_POINT);
+-
++#endif
+ if (g_safeActivationCheckFunction(CONTEXTGetPC(&winContext)))
+ {
+ g_activationFunction(&winContext);
+ }
+
+ // Activation function may have modified the context, so update it.
+- CONTEXTToNativeContext(&winContext, ucontext);
++// CONTEXTToNativeContext(&winContext, ucontext);
+ }
+ }
+ }
+@@ -625,7 +626,7 @@ static void common_signal_handler(PEXCEP
+ // Fill context record with required information. from pal.h :
+ // On non-Win32 platforms, the CONTEXT pointer in the
+ // PEXCEPTION_POINTERS will contain at least the CONTEXT_CONTROL registers.
+- CONTEXTFromNativeContext(ucontext, &context, CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_FLOATING_POINT);
++// CONTEXTFromNativeContext(ucontext, &context, CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_FLOATING_POINT);
+
+ pointers->ContextRecord = &context;
+
Home |
Main Index |
Thread Index |
Old Index