coreclr-git: Remove patches merged upstream

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: coreclr-git: Remove patches merged upstream
From: jasonwilliams200ok <necmon%yahoo.com@localhost>
Date: Tue, 09 Feb 2016 11:07:37 +0000
Module Name:	pkgsrc-wip
Committed By:	jasonwilliams200ok <necmon%yahoo.com@localhost>
Pushed By:	danglingpointer
Date:		Tue Feb 9 11:07:37 2016 +0000
Changeset:	49490685125a74e4907ff54a23fa80328121aae5

Modified Files:
	coreclr-git/distinfo
	coreclr-git/patches/patch-build.sh
	coreclr-git/patches/patch-src_pal_inc_pal__char16.h
	coreclr-git/patches/patch-src_pal_tools_gen-buildsys-clang.sh
	coreclr-git/patches/patch-src_vm_amd64_externalmethodfixupthunk.S
	coreclr-git/patches/patch-src_vm_amd64_jithelpers__fast.S
	coreclr-git/patches/patch-src_vm_amd64_pinvokestubs.S
	coreclr-git/patches/patch-src_vm_amd64_theprestubamd64.S
	coreclr-git/patches/patch-src_vm_amd64_umthunkstub.S
	coreclr-git/patches/patch-src_vm_amd64_unixasmhelpers.S
	coreclr-git/patches/patch-src_vm_amd64_virtualcallstubamd64.S
Removed Files:
	coreclr-git/patches/patch-src_pal_src_include_pal_context.h
	coreclr-git/patches/patch-src_pal_src_thread_context.cpp

Log Message:
coreclr-git: Remove patches merged upstream

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

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

diffstat:
 coreclr-git/distinfo                               | 22 ++++++++--------
 coreclr-git/patches/patch-build.sh                 |  2 +-
 .../patches/patch-src_pal_inc_pal__char16.h        |  2 +-
 .../patch-src_pal_src_include_pal_context.h        | 25 ------------------
 .../patches/patch-src_pal_src_thread_context.cpp   | 30 ----------------------
 .../patch-src_pal_tools_gen-buildsys-clang.sh      |  2 +-
 .../patch-src_vm_amd64_externalmethodfixupthunk.S  |  2 +-
 .../patches/patch-src_vm_amd64_jithelpers__fast.S  |  2 +-
 .../patches/patch-src_vm_amd64_pinvokestubs.S      |  2 +-
 .../patches/patch-src_vm_amd64_theprestubamd64.S   |  2 +-
 .../patches/patch-src_vm_amd64_umthunkstub.S       |  2 +-
 .../patches/patch-src_vm_amd64_unixasmhelpers.S    |  2 +-
 .../patch-src_vm_amd64_virtualcallstubamd64.S      |  2 +-
 13 files changed, 20 insertions(+), 77 deletions(-)

diffs:
diff --git a/coreclr-git/distinfo b/coreclr-git/distinfo
index 6154a09..d52170d 100644
--- a/coreclr-git/distinfo
+++ b/coreclr-git/distinfo
@@ -1,14 +1,12 @@
 $NetBSD$
 
-SHA1 (patch-build.sh) = b43e77b610481184e99fac986e9d1e4e5f63ba34
-SHA1 (patch-src_pal_inc_pal__char16.h) = 205f6a8533838c192b36bbb00155da1b02e0f629
-SHA1 (patch-src_pal_src_include_pal_context.h) = 211baea6d21db220e621cafb4a6535f453ca8cc7
-SHA1 (patch-src_pal_src_thread_context.cpp) = 04fa57e3023429e9699d777c52999513eed34769
-SHA1 (patch-src_pal_tools_gen-buildsys-clang.sh) = bf18d427782ee8f01df69f640ab291c4f2f154f8
-SHA1 (patch-src_vm_amd64_externalmethodfixupthunk.S) = e1333a44bc0c85f1ceecf2608288c314f81ea75d
-SHA1 (patch-src_vm_amd64_jithelpers__fast.S) = 8b4caa3a355eda6552420fa60c7fdcb886b87754
-SHA1 (patch-src_vm_amd64_pinvokestubs.S) = b16ff26c429dbf4ca08562f1c85bc084a00b13f3
-SHA1 (patch-src_vm_amd64_theprestubamd64.S) = 67f2c136608de2e9626eb73938ea3c2ee20e7b69
-SHA1 (patch-src_vm_amd64_umthunkstub.S) = a5b0893cf383485475276eefa004f6781dc87b94
-SHA1 (patch-src_vm_amd64_unixasmhelpers.S) = f3ca1e949526d884fa48d1a7e3a45939fd93192c
-SHA1 (patch-src_vm_amd64_virtualcallstubamd64.S) = 0c607052fed74cbcae3e17ec7b0d7a9dac235539
+SHA1 (patch-build.sh) = 18610c0707583e6501a01b2c25644cbc91786d3e
+SHA1 (patch-src_pal_inc_pal__char16.h) = ca743d8330802f1a626b1c335461c733eb2a6325
+SHA1 (patch-src_pal_tools_gen-buildsys-clang.sh) = 81e547b9024b498bc9a003037122c71da712d240
+SHA1 (patch-src_vm_amd64_externalmethodfixupthunk.S) = 5e84b369f30ea62e391e1f949d0d01e1995e5192
+SHA1 (patch-src_vm_amd64_jithelpers__fast.S) = b4002abaed826b673c0af58a818c25d6b17e488e
+SHA1 (patch-src_vm_amd64_pinvokestubs.S) = 344e94f87fc08edde9a61f74a495e3bd2ed11248
+SHA1 (patch-src_vm_amd64_theprestubamd64.S) = aa538fbd94baabc52509876c11c0686f132f2961
+SHA1 (patch-src_vm_amd64_umthunkstub.S) = 3f8ba7862225e6f8a997128fec248946585c26d8
+SHA1 (patch-src_vm_amd64_unixasmhelpers.S) = e481f9b074feb2d82405335bd81579b5e2157f3f
+SHA1 (patch-src_vm_amd64_virtualcallstubamd64.S) = bc6632bb7838226e31e522ab85eef401aff828ab
diff --git a/coreclr-git/patches/patch-build.sh b/coreclr-git/patches/patch-build.sh
index 4be9d41..248a982 100644
--- a/coreclr-git/patches/patch-build.sh
+++ b/coreclr-git/patches/patch-build.sh
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- build.sh.orig	2016-02-09 22:37:14.000000000 +0000
+--- build.sh.orig	2016-02-09 05:34:42.000000000 +0000
 +++ build.sh
 @@ -1,10 +1,10 @@
 -#!/usr/bin/env bash
diff --git a/coreclr-git/patches/patch-src_pal_inc_pal__char16.h b/coreclr-git/patches/patch-src_pal_inc_pal__char16.h
index 349876e..e9c1a2e 100644
--- a/coreclr-git/patches/patch-src_pal_inc_pal__char16.h
+++ b/coreclr-git/patches/patch-src_pal_inc_pal__char16.h
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- src/pal/inc/pal_char16.h.orig	2016-01-28 19:04:13.000000000 +0000
+--- src/pal/inc/pal_char16.h.orig	2016-02-06 09:37:43.000000000 +0000
 +++ src/pal/inc/pal_char16.h
 @@ -29,6 +29,8 @@ This file is used to define the wchar_t 
  #ifndef PAL_STDCPP_COMPAT
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 14f02cb..0000000
--- a/coreclr-git/patches/patch-src_pal_src_include_pal_context.h
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD$
-
---- src/pal/src/include/pal/context.h.orig	2016-02-07 15:52:01.000000000 +0000
-+++ src/pal/src/include/pal/context.h
-@@ -68,6 +68,20 @@ typedef ucontext_t native_context_t;
- #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_ErrorOffset(uc) (*(DWORD*) &(((struct fxsave*)(&(uc)->uc_mcontext.__fpregs))->fx_ip))
-+#define FPREG_ErrorSelector(uc) *((WORD*) &(((struct fxsave*)(&(uc)->uc_mcontext.__fpregs))->fx_ip) + 2)
-+#define FPREG_DataOffset(uc) (*(DWORD*) &(((struct fxsave*)(&(uc)->uc_mcontext.__fpregs))->fx_dp))
-+#define FPREG_DataSelector(uc) *((WORD*) &(((struct fxsave*)(&(uc)->uc_mcontext.__fpregs))->fx_dp) + 2)
-+#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])
diff --git a/coreclr-git/patches/patch-src_pal_src_thread_context.cpp b/coreclr-git/patches/patch-src_pal_src_thread_context.cpp
deleted file mode 100644
index 9c6d31d..0000000
--- a/coreclr-git/patches/patch-src_pal_src_thread_context.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD$
-
---- src/pal/src/thread/context.cpp.orig	2016-02-02 22:59:18.000000000 +0000
-+++ src/pal/src/thread/context.cpp
-@@ -423,8 +423,12 @@ void CONTEXTToNativeContext(CONST CONTEX
-     }
- #undef ASSIGN_REG
- 
-+#if HAVE_GREGSET_T || HAVE_GREGSET_T
- #if HAVE_GREGSET_T
-     if (native->uc_mcontext.fpregs == nullptr)
-+#elif HAVE___GREGSET_T
-+    if (native->uc_mcontext.__fpregs == nullptr)
-+#endif
-     {
-         // If the pointer to the floating point state in the native context
-         // is not valid, we can't copy floating point registers regardless of
-@@ -492,8 +496,12 @@ void CONTEXTFromNativeContext(const nati
-     }
- #undef ASSIGN_REG
- 
-+#if HAVE_GREGSET_T || HAVE___GREGSET_T
- #if HAVE_GREGSET_T
-     if (native->uc_mcontext.fpregs == nullptr)
-+#elif HAVE___GREGSET_T
-+    if (native->uc_mcontext.__fpregs == nullptr)
-+#endif
-     {
-         // Reset the CONTEXT_FLOATING_POINT bit(s) so it's clear that the floating point
-         // data in the CONTEXT is not valid. Since CONTEXT_FLOATING_POINT is defined as 
diff --git a/coreclr-git/patches/patch-src_pal_tools_gen-buildsys-clang.sh b/coreclr-git/patches/patch-src_pal_tools_gen-buildsys-clang.sh
index 2365b9f..218b93c 100644
--- a/coreclr-git/patches/patch-src_pal_tools_gen-buildsys-clang.sh
+++ b/coreclr-git/patches/patch-src_pal_tools_gen-buildsys-clang.sh
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- src/pal/tools/gen-buildsys-clang.sh.orig	2016-01-18 21:51:39.000000000 +0000
+--- src/pal/tools/gen-buildsys-clang.sh.orig	2016-02-06 09:37:43.000000000 +0000
 +++ src/pal/tools/gen-buildsys-clang.sh
 @@ -3,16 +3,17 @@
  # This file invokes cmake and generates the build system for gcc.
diff --git a/coreclr-git/patches/patch-src_vm_amd64_externalmethodfixupthunk.S b/coreclr-git/patches/patch-src_vm_amd64_externalmethodfixupthunk.S
index ee14f2a..93fff77 100644
--- a/coreclr-git/patches/patch-src_vm_amd64_externalmethodfixupthunk.S
+++ b/coreclr-git/patches/patch-src_vm_amd64_externalmethodfixupthunk.S
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- src/vm/amd64/externalmethodfixupthunk.S.orig	2016-02-02 01:31:09.000000000 +0000
+--- src/vm/amd64/externalmethodfixupthunk.S.orig	2016-02-06 09:37:43.000000000 +0000
 +++ src/vm/amd64/externalmethodfixupthunk.S
 @@ -18,7 +18,7 @@ NESTED_ENTRY ExternalMethodFixupStub, _T
          mov             rdx, 0                              // sectionIndex
diff --git a/coreclr-git/patches/patch-src_vm_amd64_jithelpers__fast.S b/coreclr-git/patches/patch-src_vm_amd64_jithelpers__fast.S
index d45a3d0..12bb040 100644
--- a/coreclr-git/patches/patch-src_vm_amd64_jithelpers__fast.S
+++ b/coreclr-git/patches/patch-src_vm_amd64_jithelpers__fast.S
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- src/vm/amd64/jithelpers_fast.S.orig	2016-01-28 19:04:13.000000000 +0000
+--- src/vm/amd64/jithelpers_fast.S.orig	2016-02-06 09:37:43.000000000 +0000
 +++ src/vm/amd64/jithelpers_fast.S
 @@ -19,7 +19,7 @@ LEAF_END JIT_PatchedCodeStart, _TEXT
  LEAF_ENTRY JIT_WriteBarrier, _TEXT
diff --git a/coreclr-git/patches/patch-src_vm_amd64_pinvokestubs.S b/coreclr-git/patches/patch-src_vm_amd64_pinvokestubs.S
index 7630e29..970e450 100644
--- a/coreclr-git/patches/patch-src_vm_amd64_pinvokestubs.S
+++ b/coreclr-git/patches/patch-src_vm_amd64_pinvokestubs.S
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- src/vm/amd64/pinvokestubs.S.orig	2016-01-28 19:04:13.000000000 +0000
+--- src/vm/amd64/pinvokestubs.S.orig	2016-02-06 09:37:43.000000000 +0000
 +++ src/vm/amd64/pinvokestubs.S
 @@ -22,7 +22,7 @@ LEAF_ENTRY GenericPInvokeCalliHelper, _T
          //
diff --git a/coreclr-git/patches/patch-src_vm_amd64_theprestubamd64.S b/coreclr-git/patches/patch-src_vm_amd64_theprestubamd64.S
index 0a64329..eb82143 100644
--- a/coreclr-git/patches/patch-src_vm_amd64_theprestubamd64.S
+++ b/coreclr-git/patches/patch-src_vm_amd64_theprestubamd64.S
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- src/vm/amd64/theprestubamd64.S.orig	2016-01-28 19:04:13.000000000 +0000
+--- src/vm/amd64/theprestubamd64.S.orig	2016-02-06 09:37:43.000000000 +0000
 +++ src/vm/amd64/theprestubamd64.S
 @@ -14,7 +14,7 @@ NESTED_ENTRY ThePreStub, _TEXT, NoHandle
          //
diff --git a/coreclr-git/patches/patch-src_vm_amd64_umthunkstub.S b/coreclr-git/patches/patch-src_vm_amd64_umthunkstub.S
index a7d9f75..bf0ad7f 100644
--- a/coreclr-git/patches/patch-src_vm_amd64_umthunkstub.S
+++ b/coreclr-git/patches/patch-src_vm_amd64_umthunkstub.S
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- src/vm/amd64/umthunkstub.S.orig	2016-01-28 19:04:13.000000000 +0000
+--- src/vm/amd64/umthunkstub.S.orig	2016-02-06 09:37:43.000000000 +0000
 +++ src/vm/amd64/umthunkstub.S
 @@ -17,7 +17,7 @@ NESTED_ENTRY TheUMEntryPrestub, _TEXT, U
      END_PROLOGUE
diff --git a/coreclr-git/patches/patch-src_vm_amd64_unixasmhelpers.S b/coreclr-git/patches/patch-src_vm_amd64_unixasmhelpers.S
index 8b8ce19..664bf99 100644
--- a/coreclr-git/patches/patch-src_vm_amd64_unixasmhelpers.S
+++ b/coreclr-git/patches/patch-src_vm_amd64_unixasmhelpers.S
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- src/vm/amd64/unixasmhelpers.S.orig	2016-01-28 19:04:13.000000000 +0000
+--- src/vm/amd64/unixasmhelpers.S.orig	2016-02-06 09:37:43.000000000 +0000
 +++ src/vm/amd64/unixasmhelpers.S
 @@ -26,7 +26,7 @@ LEAF_ENTRY PrecodeFixupThunk, _TEXT
          lea     METHODDESC_REGISTER,[rax+r11*8]
diff --git a/coreclr-git/patches/patch-src_vm_amd64_virtualcallstubamd64.S b/coreclr-git/patches/patch-src_vm_amd64_virtualcallstubamd64.S
index 60e8684..f5c8cf0 100644
--- a/coreclr-git/patches/patch-src_vm_amd64_virtualcallstubamd64.S
+++ b/coreclr-git/patches/patch-src_vm_amd64_virtualcallstubamd64.S
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- src/vm/amd64/virtualcallstubamd64.S.orig	2016-01-28 19:04:13.000000000 +0000
+--- src/vm/amd64/virtualcallstubamd64.S.orig	2016-02-06 09:37:43.000000000 +0000
 +++ src/vm/amd64/virtualcallstubamd64.S
 @@ -35,7 +35,7 @@ NESTED_ENTRY ResolveWorkerAsmStub, _TEXT
          and             rcx,  7                                    // flags
Prev by Date: swift: chat/swift updated to 3.0beta2
Next by Date: corefx-git: Remove merged patches Also add back those which were accidentally removed in 63c5b19.
Previous by Thread: swift: chat/swift updated to 3.0beta2
Next by Thread: corefx-git: Remove merged patches Also add back those which were accidentally removed in 63c5b19.
Indexes:
Home | Main Index | Thread Index | Old Index