pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

coreclr-git: Add kludges to builds 23% of sources



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Mon Feb 1 03:44:20 2016 +0100
Changeset:	f76534b177d4fdcc4037f388a975780c687de15c

Modified Files:
	coreclr-git/distinfo
	coreclr-git/patches/patch-src_pal_src_thread_context.cpp
Added Files:
	coreclr-git/patches/patch-src_debug_ee_debugger.h
	coreclr-git/patches/patch-src_dlls_mscorpe_pewriter.cpp
	coreclr-git/patches/patch-src_pal_src_CMakeLists.txt
	coreclr-git/patches/patch-src_vm_method.cpp

Log Message:
coreclr-git: Add kludges to builds 23% of sources

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f76534b177d4fdcc4037f388a975780c687de15c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 coreclr-git/distinfo                               |  6 +++++-
 coreclr-git/patches/patch-src_debug_ee_debugger.h  | 18 +++++++++++++++++
 .../patches/patch-src_dlls_mscorpe_pewriter.cpp    | 13 ++++++++++++
 .../patches/patch-src_pal_src_CMakeLists.txt       | 23 ++++++++++++++++++++++
 .../patches/patch-src_pal_src_thread_context.cpp   | 19 ++++++++++++++++--
 coreclr-git/patches/patch-src_vm_method.cpp        | 13 ++++++++++++
 6 files changed, 89 insertions(+), 3 deletions(-)

diffs:
diff --git a/coreclr-git/distinfo b/coreclr-git/distinfo
index d7ba2cb..ff7319c 100644
--- a/coreclr-git/distinfo
+++ b/coreclr-git/distinfo
@@ -1,6 +1,9 @@
 $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_config.h.in) = 05c67c2131ed0eec3ba6fb80de08e101c9ec98cb
 SHA1 (patch-src_pal_src_configure.cmake) = 0bcb4ff8c0def2f146d29e75e781aa414fb5db23
 SHA1 (patch-src_pal_src_cruntime_file.cpp) = 315ad5db53ef2b893a77aa131ce97999214e0e11
@@ -8,5 +11,6 @@ SHA1 (patch-src_pal_src_exception_seh-unwind.cpp) = ffb395a23d66e33e5cf1b0f3f4ff
 SHA1 (patch-src_pal_src_exception_signal.cpp) = 1bcb47f927a0c8037876b47ca4d15afb24cbd410
 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) = 7dbd841a0628a5ea21abffd6cd90c403e44e1f6c
+SHA1 (patch-src_pal_src_thread_context.cpp) = badf337b8b9c561db9cbf928ea2f35b54178a7e0
 SHA1 (patch-src_pal_src_thread_thread.cpp) = 7c11ae04827da599d2e2b64ae8d57efc62b2494b
+SHA1 (patch-src_vm_method.cpp) = 03c4633e4866794c7ba0162e9f72f127f44603fb
diff --git a/coreclr-git/patches/patch-src_debug_ee_debugger.h b/coreclr-git/patches/patch-src_debug_ee_debugger.h
new file mode 100644
index 0000000..6431471
--- /dev/null
+++ b/coreclr-git/patches/patch-src_debug_ee_debugger.h
@@ -0,0 +1,18 @@
+$NetBSD$
+
+--- src/debug/ee/debugger.h.orig	2016-01-28 19:04:13.000000000 +0000
++++ src/debug/ee/debugger.h
+@@ -3643,7 +3643,7 @@ template<class T> void DeleteInteropSafe
+ 
+     if (p != NULL)
+     {
+-        p->~T();
++//        p->~T();
+ 
+         _ASSERTE(g_pDebugger != NULL);
+         DebuggerHeap * pHeap = g_pDebugger->GetInteropSafeHeap_NoThrow();
+@@ -3973,4 +3973,3 @@ void FixupDispatcherContext(T_DISPATCHER
+ #endif
+ 
+ #endif /* DEBUGGER_H_ */
+-
diff --git a/coreclr-git/patches/patch-src_dlls_mscorpe_pewriter.cpp b/coreclr-git/patches/patch-src_dlls_mscorpe_pewriter.cpp
new file mode 100644
index 0000000..74fb2ea
--- /dev/null
+++ b/coreclr-git/patches/patch-src_dlls_mscorpe_pewriter.cpp
@@ -0,0 +1,13 @@
+$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
new file mode 100644
index 0000000..ac9d7eb
--- /dev/null
+++ b/coreclr-git/patches/patch-src_pal_src_CMakeLists.txt
@@ -0,0 +1,23 @@
+$NetBSD$
+
+--- src/pal/src/CMakeLists.txt.orig	2016-01-31 18:28:53.000000000 +0000
++++ src/pal/src/CMakeLists.txt
+@@ -251,6 +251,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 28f097e..fd469ce 100644
--- a/coreclr-git/patches/patch-src_pal_src_thread_context.cpp
+++ b/coreclr-git/patches/patch-src_pal_src_thread_context.cpp
@@ -2,7 +2,16 @@ $NetBSD$
 
 --- 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
+@@ -19,6 +19,8 @@ Abstract:
+ 
+ --*/
+ 
++#if 0
++
+ #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;
@@ -11,7 +20,7 @@ $NetBSD$
  #endif
          {
              ASSERT("Failed ptrace(PT_GETREGS, processId:%d) errno:%d (%s)\n",
-@@ -349,7 +349,7 @@ CONTEXT_SetThreadContext(
+@@ -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
@@ -20,3 +29,9 @@ $NetBSD$
  #endif
          {
              ASSERT("Failed ptrace(PT_GETREGS, processId:%d) errno:%d (%s)\n",
+@@ -1351,3 +1353,5 @@ DBG_FlushInstructionCache(
+ 
+     return TRUE;
+ }
++
++#endif
diff --git a/coreclr-git/patches/patch-src_vm_method.cpp b/coreclr-git/patches/patch-src_vm_method.cpp
new file mode 100644
index 0000000..8c0e094
--- /dev/null
+++ b/coreclr-git/patches/patch-src_vm_method.cpp
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/vm/method.cpp.orig	2016-01-28 19:04:13.000000000 +0000
++++ src/vm/method.cpp
+@@ -5193,7 +5193,7 @@ LPVOID NDirectMethodDesc::FindEntryPoint
+     if (GetEntrypointName()[0] == '#')
+     {
+         long ordinal = atol(GetEntrypointName()+1);
+-        return GetProcAddress(hMod, (LPCSTR)(size_t)((UINT16)ordinal));
++        return reinterpret_cast<LPVOID>(GetProcAddress(hMod, (LPCSTR)(size_t)((UINT16)ordinal)));
+     }
+ 
+     // Just look for the unmangled name.  If it is unicode fcn, we are going


Home | Main Index | Thread Index | Old Index