pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
coreclr-git: Add hack patches to push build further
Module Name: pkgsrc-wip
Committed By: Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By: kamil
Date: Fri Jan 29 02:19:41 2016 +0100
Changeset: c8a2a5a6cba0fe09daa3a08eb13824d33e20b789
Modified Files:
coreclr-git/distinfo
Added Files:
coreclr-git/patches/patch-src_pal_inc_pal__char16.h
coreclr-git/patches/patch-src_pal_src_exception_seh-unwind.cpp
coreclr-git/patches/patch-src_pal_src_exception_signal.cpp
coreclr-git/patches/patch-src_pal_src_misc_sysinfo.cpp
Log Message:
coreclr-git: Add hack patches to push build further
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=c8a2a5a6cba0fe09daa3a08eb13824d33e20b789
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
coreclr-git/distinfo | 4 +++
.../patches/patch-src_pal_inc_pal__char16.h | 20 +++++++++++++
.../patch-src_pal_src_exception_seh-unwind.cpp | 21 +++++++++++++
.../patches/patch-src_pal_src_exception_signal.cpp | 13 ++++++++
.../patches/patch-src_pal_src_misc_sysinfo.cpp | 35 ++++++++++++++++++++++
5 files changed, 93 insertions(+)
diffs:
diff --git a/coreclr-git/distinfo b/coreclr-git/distinfo
index b1a788b..61b0fc4 100644
--- a/coreclr-git/distinfo
+++ b/coreclr-git/distinfo
@@ -1,6 +1,10 @@
$NetBSD$
+SHA1 (patch-src_pal_inc_pal__char16.h) = 46aab244c78afbef9af1fd93afafb2ed731894e6
SHA1 (patch-src_pal_src_config.h.in) = bbf370ef53a770051ef1b64ff57e093061563828
SHA1 (patch-src_pal_src_configure.cmake) = fc41e4af9fe7f770ae3f53fabb7a035d26541fe2
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_include_pal_context.h) = 962cf83ef0ba0a4e2e57e344809a566f12f2e01d
+SHA1 (patch-src_pal_src_misc_sysinfo.cpp) = 5d296ac73315f080e44e5c7b9c1087b49fe9cf32
diff --git a/coreclr-git/patches/patch-src_pal_inc_pal__char16.h b/coreclr-git/patches/patch-src_pal_inc_pal__char16.h
new file mode 100644
index 0000000..9b3bd84
--- /dev/null
+++ b/coreclr-git/patches/patch-src_pal_inc_pal__char16.h
@@ -0,0 +1,20 @@
+$NetBSD$
+
+--- src/pal/inc/pal_char16.h.orig 2016-01-28 19:04:13.000000000 +0000
++++ src/pal/inc/pal_char16.h
+@@ -28,8 +28,8 @@ This file is used to define the wchar_t
+
+ #ifndef PAL_STDCPP_COMPAT
+ #if defined (PLATFORM_UNIX) && defined(__GNUC__)
+-#undef wchar_t
+-#define wchar_t __wchar_16_cpp__
++//#undef wchar_t
++//#define wchar_t __wchar_16_cpp__
+ #endif // PLATFORM_UNIX
+
+ // Set up the wchar_t type (which got preprocessed to __wchar_16_cpp__).
+@@ -49,4 +49,3 @@ typedef unsigned short wchar_t;
+ #endif // !_WCHAR_T_DEFINED
+ #endif // !_WCHAR_T_DEFINED || !_MSC_VER
+ #endif // !PAL_STDCPP_COMPAT
+-
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
new file mode 100644
index 0000000..7d8bb0b
--- /dev/null
+++ b/coreclr-git/patches/patch-src_pal_src_exception_seh-unwind.cpp
@@ -0,0 +1,21 @@
+$NetBSD$
+
+--- src/pal/src/exception/seh-unwind.cpp.orig 2016-01-28 19:04:13.000000000 +0000
++++ src/pal/src/exception/seh-unwind.cpp
+@@ -297,7 +297,6 @@ BOOL PAL_VirtualUnwind(CONTEXT *context,
+ }
+
+ #else
+-#error don't know how to unwind on this platform
+ #endif
+
+ // These methods are only used on the AMD64 build
+@@ -584,7 +583,7 @@ RtlpRaiseException(EXCEPTION_RECORD *Exc
+ #elif defined(_ARM_) || defined(_ARM64_)
+ ExceptionRecord->ExceptionAddress = (void *) ContextRecord.Pc;
+ #else
+-#error unsupported architecture
++#warning unsupported architecture
+ #endif
+
+ throw PAL_SEHException(ExceptionRecord, &ContextRecord);
diff --git a/coreclr-git/patches/patch-src_pal_src_exception_signal.cpp b/coreclr-git/patches/patch-src_pal_src_exception_signal.cpp
new file mode 100644
index 0000000..900c374
--- /dev/null
+++ b/coreclr-git/patches/patch-src_pal_src_exception_signal.cpp
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/pal/src/exception/signal.cpp.orig 2016-01-28 19:04:13.000000000 +0000
++++ src/pal/src/exception/signal.cpp
+@@ -45,7 +45,7 @@ using namespace CorUnix;
+
+ SET_DEFAULT_DEBUG_CHANNEL(EXCEPT);
+
+-#define INJECT_ACTIVATION_SIGNAL SIGRTMIN
++#define INJECT_ACTIVATION_SIGNAL 0
+
+ /* local type definitions *****************************************************/
+
diff --git a/coreclr-git/patches/patch-src_pal_src_misc_sysinfo.cpp b/coreclr-git/patches/patch-src_pal_src_misc_sysinfo.cpp
new file mode 100644
index 0000000..0df7eaa
--- /dev/null
+++ b/coreclr-git/patches/patch-src_pal_src_misc_sysinfo.cpp
@@ -0,0 +1,35 @@
+$NetBSD$
+
+--- src/pal/src/misc/sysinfo.cpp.orig 2016-01-28 19:04:13.000000000 +0000
++++ src/pal/src/misc/sysinfo.cpp
+@@ -36,6 +36,7 @@ Revision History:
+ #if HAVE_SYS_VMPARAM_H
+ #include <sys/vmparam.h>
+ #endif // HAVE_SYS_VMPARAM_H
++#include <machine/vmparam.h>
+
+ #if HAVE_MACH_VM_TYPES_H
+ #include <mach/vm_types.h>
+@@ -130,7 +131,7 @@ GetSystemInfo(
+ lpSystemInfo->dwActiveProcessorMask_PAL_Undefined = 0;
+
+ #if HAVE_SYSCONF
+-#if defined(__hppa__) || ( defined (_IA64_) && defined (_HPUX_) )
++#if ( (defined(__hppa__) || defined (_IA64_)) && defined (_HPUX_) )
+ struct pst_dynamic psd;
+ if (pstat_getdynamic(&psd, sizeof(psd), (size_t)1, 0) != -1) {
+ nrcpus = psd.psd_proc_cnt;
+@@ -139,7 +140,7 @@ GetSystemInfo(
+ ASSERT("pstat_getdynamic failed (%d)\n", errno);
+ }
+
+-#else // !__hppa__
++#else // !_HPUX_
+ nrcpus = sysconf(_SC_NPROCESSORS_ONLN);
+ if (nrcpus < 1)
+ {
+@@ -351,4 +352,3 @@ PAL_GetLogicalProcessorCacheSizeFromOS()
+
+ return cacheSize;
+ }
+-
Home |
Main Index |
Thread Index |
Old Index