coreclr-git: Remove merged patches, eliminate the ones to reprepare

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: coreclr-git: Remove merged patches, eliminate the ones to reprepare
From: Kamil Rytarowski <n54%gmx.com@localhost>
Date: Tue, 02 Feb 2016 23:02:40 +0000
Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Wed Feb 3 00:02:40 2016 +0100
Changeset:	76709162304e7ed3518c31aa75c4f473bfd08be4

Modified Files:
	coreclr-git/distinfo
	coreclr-git/patches/patch-src_pal_src_thread_context.cpp
	coreclr-git/patches/patch-src_vm_threadsuspend.cpp
Removed Files:
	coreclr-git/patches/patch-src_pal_src_config.h.in
	coreclr-git/patches/patch-src_pal_src_configure.cmake
	coreclr-git/patches/patch-src_pal_src_include_pal_context.h

Log Message:
coreclr-git: Remove merged patches, eliminate the ones to reprepare

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

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

diffstat:
 coreclr-git/distinfo                               |   7 +-
 coreclr-git/patches/patch-src_pal_src_config.h.in  |  16 ---
 .../patches/patch-src_pal_src_configure.cmake      |  37 -----
 .../patch-src_pal_src_include_pal_context.h        | 152 ---------------------
 .../patches/patch-src_pal_src_thread_context.cpp   |   2 +-
 coreclr-git/patches/patch-src_vm_threadsuspend.cpp |   4 +-
 6 files changed, 5 insertions(+), 213 deletions(-)

diffs:
diff --git a/coreclr-git/distinfo b/coreclr-git/distinfo
index 21a5f8d..9e4080f 100644
--- a/coreclr-git/distinfo
+++ b/coreclr-git/distinfo
@@ -2,15 +2,12 @@ $NetBSD$
 
 SHA1 (patch-src_debug_ee_debugger.h) = 43cd45cafa38911900b395ec1596496938d62a81
 SHA1 (patch-src_pal_inc_pal__char16.h) = 205f6a8533838c192b36bbb00155da1b02e0f629
-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_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) = 9f059a29685a95edcf88c936603b562f4457de9a
+SHA1 (patch-src_pal_src_thread_context.cpp) = c982763c5b6c9905fd1f14b1271baae5a2fbf052
 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
@@ -23,4 +20,4 @@ SHA1 (patch-src_pal_tests_palsuite_c__runtime_swscanf_test7_test7.c) = c9c466c9b
 SHA1 (patch-src_pal_tests_palsuite_c__runtime_swscanf_test8_test8.c) = 308f4de7dc624572db2090e4b1c81b3ee4a6d902
 SHA1 (patch-src_utilcode_delayloadhelpers.cpp) = 8e3d9d1897d2af39d4e2eaf47b4f9060cd6914d7
 SHA1 (patch-src_vm_jitinterfacegen.cpp) = 6e990673242964381238929116e78a67e7ea7967
-SHA1 (patch-src_vm_threadsuspend.cpp) = dd56cdb5daa9f3f14af13ee172d618386f14f704
+SHA1 (patch-src_vm_threadsuspend.cpp) = 8a7e2bea569a4eb6a9896b9bcfc9cadc803b4315
diff --git a/coreclr-git/patches/patch-src_pal_src_config.h.in b/coreclr-git/patches/patch-src_pal_src_config.h.in
deleted file mode 100644
index b3fafca..0000000
--- a/coreclr-git/patches/patch-src_pal_src_config.h.in
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
---- src/pal/src/config.h.in.orig	2016-01-31 18:28:53.000000000 +0000
-+++ src/pal/src/config.h.in
-@@ -59,8 +59,11 @@
- #cmakedefine01 HAVE_TM_GMTOFF
- 
- #cmakedefine01 HAVE_BSD_REGS_T
-+#cmakedefine01 HAVE_REG_R_REGS
-+#cmakedefine01 HAVE_REG__R_REGS
- #cmakedefine01 HAVE_PT_REGS
- #cmakedefine01 HAVE_GREGSET_T
-+#cmakedefine01 HAVE___GREGSET_T
- #cmakedefine01 HAVE_SIGINFO_T
- #cmakedefine01 HAVE_UCONTEXT_T
- #cmakedefine01 HAVE_PTHREAD_RWLOCK_T
diff --git a/coreclr-git/patches/patch-src_pal_src_configure.cmake b/coreclr-git/patches/patch-src_pal_src_configure.cmake
deleted file mode 100644
index e515c0c..0000000
--- a/coreclr-git/patches/patch-src_pal_src_configure.cmake
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD$
-
---- src/pal/src/configure.cmake.orig	2016-01-31 18:28:53.000000000 +0000
-+++ src/pal/src/configure.cmake
-@@ -79,6 +79,7 @@ check_struct_has_member ("struct stat" s
- check_struct_has_member ("struct stat" st_atimensec "sys/types.h;sys/stat.h" HAVE_STAT_NSEC)
- check_struct_has_member ("struct tm" tm_gmtoff time.h HAVE_TM_GMTOFF)
- check_struct_has_member ("ucontext_t" uc_mcontext.gregs[0] ucontext.h HAVE_GREGSET_T)
-+check_struct_has_member ("ucontext_t" uc_mcontext.__gregs[0] ucontext.h HAVE___GREGSET_T)
- 
- set(CMAKE_EXTRA_INCLUDE_FILES machine/reg.h)
- check_type_size("struct reg" BSD_REGS_T)
-@@ -89,7 +90,7 @@ set(CMAKE_EXTRA_INCLUDE_FILES)
- set(CMAKE_EXTRA_INCLUDE_FILES signal.h)
- check_type_size(siginfo_t SIGINFO_T)
- set(CMAKE_EXTRA_INCLUDE_FILES)
--set(CMAKE_EXTRA_INCLUDE_FILES ucontext.h)
-+set(CMAKE_EXTRA_INCLUDE_FILES ucontext.h sys/ucontext.h)
- check_type_size(ucontext_t UCONTEXT_T)
- set(CMAKE_EXTRA_INCLUDE_FILES)
- set(CMAKE_EXTRA_INCLUDE_FILES pthread.h)
-@@ -937,6 +938,7 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL FreeBS
-   set(PAL_PT_READ_D PT_READ_D)
-   set(PAL_PT_WRITE_D PT_WRITE_D)
-   set(HAS_FTRUNCATE_LENGTH_ISSUE 0)
-+  set(HAVE_REG_R_REGS 1)
- 
-   if(EXISTS "/lib/libc.so.7")
-     set(FREEBSD_LIBC "/lib/libc.so.7")
-@@ -960,6 +962,7 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL NetBSD
-   set(PAL_PT_READ_D PT_READ_D)
-   set(PAL_PT_WRITE_D PT_WRITE_D)
-   set(HAS_FTRUNCATE_LENGTH_ISSUE 0)
-+  set(HAVE_REG__R_REGS 1)
- 
- elseif(CMAKE_SYSTEM_NAME STREQUAL SunOS)
-   if(NOT HAVE_LIBUNWIND_H)
diff --git a/coreclr-git/patches/patch-src_pal_src_include_pal_context.h b/coreclr-git/patches/patch-src_pal_src_include_pal_context.h
deleted file mode 100644
index 6d4aaae..0000000
--- a/coreclr-git/patches/patch-src_pal_src_include_pal_context.h
+++ /dev/null
@@ -1,152 +0,0 @@
-$NetBSD$
-
---- src/pal/src/include/pal/context.h.orig	2016-01-28 19:04:13.000000000 +0000
-+++ src/pal/src/include/pal/context.h
-@@ -44,7 +44,58 @@ typedef ucontext_t native_context_t;
- #include <mach/mach_port.h>
- #endif // !HAVE_MACH_EXCEPTIONS else
- 
--#if HAVE_GREGSET_T
-+#if HAVE___GREGSET_T
-+
-+#ifdef BIT64
-+#define MCREG_Rbx(mc)       ((mc).__gregs[_REG_RBX])
-+#define MCREG_Rcx(mc)       ((mc).__gregs[_REG_RCX])
-+#define MCREG_Rdx(mc)       ((mc).__gregs[_REG_RDX])
-+#define MCREG_Rsi(mc)       ((mc).__gregs[_REG_RSI])
-+#define MCREG_Rdi(mc)       ((mc).__gregs[_REG_RDI])
-+#define MCREG_Rbp(mc)       ((mc).__gregs[_REG_RBP])
-+#define MCREG_Rax(mc)       ((mc).__gregs[_REG_RAX])
-+#define MCREG_Rip(mc)       ((mc).__gregs[_REG_RIP])
-+#define MCREG_Rsp(mc)       ((mc).__gregs[_REG_RSP])
-+#define MCREG_SegCs(mc)     ((mc).__gregs[_REG_CS])
-+#define MCREG_SegSs(mc)     ((mc).__gregs[_REG_SS])
-+#define MCREG_R8(mc)        ((mc).__gregs[_REG_R8])
-+#define MCREG_R9(mc)        ((mc).__gregs[_REG_R9])
-+#define MCREG_R10(mc)       ((mc).__gregs[_REG_R10])
-+#define MCREG_R11(mc)       ((mc).__gregs[_REG_R11])
-+#define MCREG_R12(mc)       ((mc).__gregs[_REG_R12])
-+#define MCREG_R13(mc)       ((mc).__gregs[_REG_R13])
-+#define MCREG_R14(mc)       ((mc).__gregs[_REG_R14])
-+#define MCREG_R15(mc)       ((mc).__gregs[_REG_R15])
-+#define MCREG_EFlags(mc)    ((mc).__gregs[_REG_RFLAGS])
-+
-+#define FPREG_Xmm(uc, index) *(M128A*)&((struct fxsave*)((uc)->uc_mcontext.__fpregs)->fx_xmm[index])
-+
-+#define FPREG_St(uc, index) *(M128A*)&((struct fxsave*)((uc)->uc_mcontext.__fpregs)->fx_87_ac[index])
-+
-+#define FPREG_ControlWord(uc) ((struct fxsave*)((uc)->uc_mcontext.__fpregs)->fx_cw)
-+#define FPREG_StatusWord(uc) ((struct fxsave*)((uc)->uc_mcontext.__fpregs)->fx_sw)
-+#define FPREG_TagWord(uc) ((struct fxsave*)((uc)->uc_mcontext.__fpregs)->fx_tw)
-+#define FPREG_MxCsr(uc) ((struct fxsave*)((uc)->uc_mcontext.__fpregs)->fx_mxcsr)
-+#define FPREG_MxCsr_Mask(uc) ((struct fxsave*)((uc)->uc_mcontext.__fpregs)->fx_mxcsr_mask)
-+
-+#else // BIT64
-+
-+#define MCREG_Ebx(mc)       ((mc).__gregs[_REG_EBX])
-+#define MCREG_Ecx(mc)       ((mc).__gregs[_REG_ECX])
-+#define MCREG_Edx(mc)       ((mc).__gregs[_REG_EDX])
-+#define MCREG_Esi(mc)       ((mc).__gregs[_REG_ESI])
-+#define MCREG_Edi(mc)       ((mc).__gregs[_REG_EDI])
-+#define MCREG_Ebp(mc)       ((mc).__gregs[_REG_EBP])
-+#define MCREG_Eax(mc)       ((mc).__gregs[_REG_EAX])
-+#define MCREG_Eip(mc)       ((mc).__gregs[_REG_EIP])
-+#define MCREG_Esp(mc)       ((mc).__gregs[_REG_ESP])
-+#define MCREG_SegCs(mc)     ((mc).__gregs[_REG_CS])
-+#define MCREG_SegSs(mc)     ((mc).__gregs[_REG_SS])
-+#define MCREG_EFlags(mc)    ((mc).__gregs[_REG_RFLAGS])
-+
-+#endif // BIT64
-+
-+#elif HAVE_GREGSET_T
- 
- #ifdef BIT64
- #define MCREG_Rbx(mc)       ((mc).gregs[REG_RBX])
-@@ -293,43 +344,55 @@ typedef ucontext_t native_context_t;
- 
- #if HAVE_BSD_REGS_T
- 
-+/*
-+#ifndef HAVE_BSD_REGS_STYLE
-+#error "struct reg" has unrecognized format
-+#endif
-+*/
-+
-+#if 0
-+#define BSD_REGS_STYLE(reg,RR,rr) ((reg).r_##rr)
-+#else
-+#define BSD_REGS_STYLE(reg,RR,rr) ((reg).regs[_REG_##RR])
-+#endif
-+
- #ifdef BIT64
- 
--#define BSDREG_Rbx(reg)     ((reg).r_rbx)
--#define BSDREG_Rcx(reg)     ((reg).r_rcx)
--#define BSDREG_Rdx(reg)     ((reg).r_rdx)
--#define BSDREG_Rsi(reg)     ((reg).r_rsi)
--#define BSDREG_Rdi(reg)     ((reg).r_rdi)
--#define BSDREG_Rbp(reg)     ((reg).r_rbp)
--#define BSDREG_Rax(reg)     ((reg).r_rax)
--#define BSDREG_Rip(reg)     ((reg).r_rip)
--#define BSDREG_SegCs(reg)   ((reg).r_cs)
--#define BSDREG_SegSs(reg)   ((reg).r_ss)
--#define BSDREG_Rsp(reg)     ((reg).r_rsp)
--#define BSDREG_R8(reg)      ((reg).r_r8)
--#define BSDREG_R9(reg)      ((reg).r_r9)
--#define BSDREG_R10(reg)     ((reg).r_r10)
--#define BSDREG_R11(reg)     ((reg).r_r11)
--#define BSDREG_R12(reg)     ((reg).r_r12)
--#define BSDREG_R13(reg)     ((reg).r_r13)
--#define BSDREG_R14(reg)     ((reg).r_r14)
--#define BSDREG_R15(reg)     ((reg).r_r15)
--#define BSDREG_EFlags(reg)  ((reg).r_rflags)
-+#define BSDREG_Rbx(reg)     BSD_REGS_STYLE((reg),RBX,rbx)
-+#define BSDREG_Rcx(reg)     BSD_REGS_STYLE((reg),RCX,rcx)
-+#define BSDREG_Rdx(reg)     BSD_REGS_STYLE((reg),RDX,rdx)
-+#define BSDREG_Rsi(reg)     BSD_REGS_STYLE((reg),RSI,rsi)
-+#define BSDREG_Rdi(reg)     BSD_REGS_STYLE((reg),RDI,rdi)
-+#define BSDREG_Rbp(reg)     BSD_REGS_STYLE((reg),RBP,rbp)
-+#define BSDREG_Rax(reg)     BSD_REGS_STYLE((reg),RAX,rax)
-+#define BSDREG_Rip(reg)     BSD_REGS_STYLE((reg),RIP,rip)
-+#define BSDREG_SegCs(reg)   BSD_REGS_STYLE((reg),CS,cs)
-+#define BSDREG_SegSs(reg)   BSD_REGS_STYLE((reg),SS,ss)
-+#define BSDREG_Rsp(reg)     BSD_REGS_STYLE((reg),RSP,rsp)
-+#define BSDREG_R8(reg)      BSD_REGS_STYLE((reg),R8,r8)
-+#define BSDREG_R9(reg)      BSD_REGS_STYLE((reg),R9,r9)
-+#define BSDREG_R10(reg)     BSD_REGS_STYLE((reg),R10,r10)
-+#define BSDREG_R11(reg)     BSD_REGS_STYLE((reg),R11,r11)
-+#define BSDREG_R12(reg)     BSD_REGS_STYLE((reg),R12,r12)
-+#define BSDREG_R13(reg)     BSD_REGS_STYLE((reg),R13,r13)
-+#define BSDREG_R14(reg)     BSD_REGS_STYLE((reg),R14,r14)
-+#define BSDREG_R15(reg)     BSD_REGS_STYLE((reg),R15,r15)
-+#define BSDREG_EFlags(reg)  BSD_REGS_STYLE((reg),RFLAGS,rflags)
- 
- #else // BIT64
- 
--#define BSDREG_Ebx(reg)     ((reg).r_ebx)
--#define BSDREG_Ecx(reg)     ((reg).r_ecx)
--#define BSDREG_Edx(reg)     ((reg).r_edx)
--#define BSDREG_Esi(reg)     ((reg).r_esi)
--#define BSDREG_Edi(reg)     ((reg).r_edi)
--#define BSDREG_Ebp(reg)     ((reg).r_ebp)
--#define BSDREG_Eax(reg)     ((reg).r_eax)
--#define BSDREG_Eip(reg)     ((reg).r_eip)
--#define BSDREG_SegCs(reg)   ((reg).r_cs)
--#define BSDREG_EFlags(reg)  ((reg).r_eflags)
--#define BSDREG_Esp(reg)     ((reg).r_esp)
--#define BSDREG_SegSs(reg)   ((reg).r_ss)
-+#define BSDREG_Ebx(reg)     ((reg).BSDREG_REGS(ebx))
-+#define BSDREG_Ecx(reg)     ((reg).BSDREG_REGS(ecx))
-+#define BSDREG_Edx(reg)     ((reg).BSDREG_REGS(edx))
-+#define BSDREG_Esi(reg)     ((reg).BSDREG_REGS(esi))
-+#define BSDREG_Edi(reg)     ((reg).BSDREG_REGS(edi))
-+#define BSDREG_Ebp(reg)     ((reg).BSDREG_REGS(ebp))
-+#define BSDREG_Eax(reg)     ((reg).BSDREG_REGS(eax))
-+#define BSDREG_Eip(reg)     ((reg).BSDREG_REGS(eip))
-+#define BSDREG_SegCs(reg)   ((reg).BSDREG_REGS(cs))
-+#define BSDREG_EFlags(reg)  ((reg).BSDREG_REGS(eflags))
-+#define BSDREG_Esp(reg)     ((reg).BSDREG_REGS(esp))
-+#define BSDREG_SegSs(reg)   ((reg).BSDREG_REGS(ss))
- 
- #endif // BIT64
- 
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 70346bd..1dfdc70 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-02 10:08:55.000000000 +0000
+--- src/pal/src/thread/context.cpp.orig	2016-02-02 22:59:18.000000000 +0000
 +++ src/pal/src/thread/context.cpp
 @@ -19,6 +19,8 @@ Abstract:
  
diff --git a/coreclr-git/patches/patch-src_vm_threadsuspend.cpp b/coreclr-git/patches/patch-src_vm_threadsuspend.cpp
index 003a14c..e3672e0 100644
--- a/coreclr-git/patches/patch-src_vm_threadsuspend.cpp
+++ b/coreclr-git/patches/patch-src_vm_threadsuspend.cpp
@@ -1,8 +1,8 @@
 $NetBSD$
 
---- src/vm/threadsuspend.cpp.orig	2016-01-28 19:04:13.000000000 +0000
+--- src/vm/threadsuspend.cpp.orig	2016-02-02 22:59:18.000000000 +0000
 +++ src/vm/threadsuspend.cpp
-@@ -8445,23 +8445,23 @@ void PALAPI HandleGCSuspensionForInterru
+@@ -8447,23 +8447,23 @@ void PALAPI HandleGCSuspensionForInterru
          ClrFlsValueSwitch threadStackWalking(TlsIdx_StackWalkerWalkingThread, pThread);
  
          // Hijack the return address to point to the appropriate routine based on the method's return type.
Prev by Date: nspr-hg: adapt patch, 3/4 have been included upstream.
Next by Date: coreclr-git: Temporarily there is no libunwind
Previous by Thread: nspr-hg: adapt patch, 3/4 have been included upstream.
Next by Thread: coreclr-git: Temporarily there is no libunwind
Indexes:
Home | Main Index | Thread Index | Old Index