pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
coreclr-git: Sync local patches with upstream sources
Module Name: pkgsrc-wip
Committed By: Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By: kamil
Date: Fri Apr 15 23:23:41 2016 +0200
Changeset: 283415ea273485b07a214115e97b0eee7255897d
Modified Files:
coreclr-git/distinfo
coreclr-git/patches/patch-src_pal_src_CMakeLists.txt
coreclr-git/patches/patch-src_pal_src_cruntime_printf.cpp
Removed Files:
coreclr-git/patches/patch-src_ToolBox_SOS_Strike_strike.h
coreclr-git/patches/patch-src_pal_inc_pal.h
coreclr-git/patches/patch-src_pal_src_cruntime_printfcpp.cpp
coreclr-git/patches/patch-src_pal_src_cruntime_silent__printf.cpp
Log Message:
coreclr-git: Sync local patches with upstream sources
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=283415ea273485b07a214115e97b0eee7255897d
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
coreclr-git/distinfo | 8 +--
.../patches/patch-src_ToolBox_SOS_Strike_strike.h | 18 -----
coreclr-git/patches/patch-src_pal_inc_pal.h | 12 ----
.../patches/patch-src_pal_src_CMakeLists.txt | 2 +-
.../patches/patch-src_pal_src_cruntime_printf.cpp | 79 +---------------------
.../patch-src_pal_src_cruntime_printfcpp.cpp | 24 -------
.../patch-src_pal_src_cruntime_silent__printf.cpp | 26 -------
7 files changed, 4 insertions(+), 165 deletions(-)
diffs:
diff --git a/coreclr-git/distinfo b/coreclr-git/distinfo
index 4294732..99765b2 100644
--- a/coreclr-git/distinfo
+++ b/coreclr-git/distinfo
@@ -1,12 +1,8 @@
$NetBSD$
-SHA1 (patch-src_ToolBox_SOS_Strike_strike.h) = 3c92ad66bb589d01957da754534d25ad7fba91c1
SHA1 (patch-src_coreclr_hosts_unixcoreruncommon_coreruncommon.cpp) = 146372d15f157088d450d4cd37cd2aac590e6d06
-SHA1 (patch-src_pal_inc_pal.h) = 7d3ef148af8b1b24067ba4cb5efc12581ebc6881
-SHA1 (patch-src_pal_src_CMakeLists.txt) = de3994c6630ef6c16e2286e76910477f72cd2179
-SHA1 (patch-src_pal_src_cruntime_printf.cpp) = 8a86c57e1fe3953d158e1860f04bd19d7df1fe08
-SHA1 (patch-src_pal_src_cruntime_printfcpp.cpp) = 4d1ba5fea45402259c67428506f39d9c3128ecbd
-SHA1 (patch-src_pal_src_cruntime_silent__printf.cpp) = 0922321ad05a90cc3b87b1e2663ff4d0b2e4717e
+SHA1 (patch-src_pal_src_CMakeLists.txt) = 8fc5da466e6181beaad5654faecf611498c72373
+SHA1 (patch-src_pal_src_cruntime_printf.cpp) = 42c9c2c1b619f3695330fface7d7e9b5fb8bb182
SHA1 (patch-src_pal_src_init_pal.cpp) = feaf0e6cc704d9a11e66cc6ad3adaca6a0b01f47
SHA1 (patch-src_pal_src_safecrt_output.inl) = ceb1951e8a7e0839fa1c0f5d07fd6c4087afd5df
SHA1 (patch-src_pal_src_safecrt_safecrt__output__l.c) = 5a17a2525ab434336cfef369980562d1ecdcd953
diff --git a/coreclr-git/patches/patch-src_ToolBox_SOS_Strike_strike.h b/coreclr-git/patches/patch-src_ToolBox_SOS_Strike_strike.h
deleted file mode 100644
index af3ae64..0000000
--- a/coreclr-git/patches/patch-src_ToolBox_SOS_Strike_strike.h
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
---- src/ToolBox/SOS/Strike/strike.h.orig 2016-04-08 23:29:23.000000000 +0000
-+++ src/ToolBox/SOS/Strike/strike.h
-@@ -42,8 +42,13 @@
- #define _wcscspn wcscspn
- #define _wcscat wcscat
- #define _wcsstr wcsstr
-+#define _wcsstr wcsstr
- #endif // !PAL_STDCPP_COMPAT
-
-+#ifdef PLATFORM_UNIX
-+#define _vsnprintf vsnprintf
-+#endif
-+
- #define ___in _SAL1_Source_(__in, (), _In_)
- #define ___out _SAL1_Source_(__out, (), _Out_)
-
diff --git a/coreclr-git/patches/patch-src_pal_inc_pal.h b/coreclr-git/patches/patch-src_pal_inc_pal.h
deleted file mode 100644
index 96477cf..0000000
--- a/coreclr-git/patches/patch-src_pal_inc_pal.h
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD$
-
---- src/pal/inc/pal.h.orig 2016-02-18 21:11:19.000000000 +0000
-+++ src/pal/inc/pal.h
-@@ -6050,6 +6050,7 @@ CoCreateGuid(OUT GUID * pguid);
- #define _close PAL__close
- #define _wcstoui64 PAL__wcstoui64
- #define _flushall PAL__flushall
-+#define _vsnprintf PAL__vsnprintf
-
- #ifdef _AMD64_
- #define _mm_getcsr PAL__mm_getcsr
diff --git a/coreclr-git/patches/patch-src_pal_src_CMakeLists.txt b/coreclr-git/patches/patch-src_pal_src_CMakeLists.txt
index 90e847f..7c0fd1d 100644
--- a/coreclr-git/patches/patch-src_pal_src_CMakeLists.txt
+++ b/coreclr-git/patches/patch-src_pal_src_CMakeLists.txt
@@ -1,6 +1,6 @@
$NetBSD$
---- src/pal/src/CMakeLists.txt.orig 2016-04-15 10:25:33.594972569 +0000
+--- src/pal/src/CMakeLists.txt.orig 2016-04-15 10:25:33.000000000 +0000
+++ src/pal/src/CMakeLists.txt
@@ -271,13 +271,16 @@ if(CMAKE_SYSTEM_NAME STREQUAL Linux)
endif(CMAKE_SYSTEM_NAME STREQUAL Linux)
diff --git a/coreclr-git/patches/patch-src_pal_src_cruntime_printf.cpp b/coreclr-git/patches/patch-src_pal_src_cruntime_printf.cpp
index cc81d6a..5904fcf 100644
--- a/coreclr-git/patches/patch-src_pal_src_cruntime_printf.cpp
+++ b/coreclr-git/patches/patch-src_pal_src_cruntime_printf.cpp
@@ -1,6 +1,6 @@
$NetBSD$
---- src/pal/src/cruntime/printf.cpp.orig 2016-01-28 19:04:13.000000000 +0000
+--- src/pal/src/cruntime/printf.cpp.orig 2016-04-15 21:21:27.000000000 +0000
+++ src/pal/src/cruntime/printf.cpp
@@ -45,6 +45,7 @@ static int SscanfFloatCheckExponent(LPCS
void * voidPtr, int * pn);
@@ -10,80 +10,3 @@ $NetBSD$
/*******************************************************************************
Function:
Internal_AddPaddingA
-@@ -295,7 +296,7 @@ wsprintfA(
- ENTRY("wsprintfA (buffer=%p, format=%p (%s))\n", buffer, format, format);
-
- va_start(ap, format);
-- Length = PAL__vsnprintf(buffer, 1024, format, ap);
-+ Length = InternalVsnprintf(CorUnix::InternalGetCurrentThread(), buffer, 1024, format, ap);
- va_end(ap);
-
- LOGEXIT("wsprintfA returns int %d\n", Length);
-@@ -354,7 +355,7 @@ _snprintf(
- buffer, (unsigned long) count, format, format);
-
- va_start(ap, format);
-- Length = PAL__vsnprintf(buffer, count, format, ap);
-+ Length = InternalVsnprintf(CorUnix::InternalGetCurrentThread(), buffer, count, format, ap);
- va_end(ap);
-
- LOGEXIT("_snprintf returns int %d\n", Length);
-@@ -1529,7 +1530,7 @@ PAL_sprintf(
- ENTRY("PAL_sprintf (buffer=%p, format=%p (%s))\n", buffer, format, format);
-
- va_start(ap, format);
-- Length = PAL__vsnprintf(buffer, 0x7fffffff, format, ap);
-+ Length = InternalVsnprintf(CorUnix::InternalGetCurrentThread(), buffer, 0x7fffffff, format, ap);
- va_end(ap);
-
- LOGEXIT("PAL_sprintf returns int %d\n", Length);
-@@ -1613,7 +1614,7 @@ PAL_vsprintf(char *buffer,
- ENTRY("PAL_vsprintf (buffer=%p, format=%p (%s), argptr=%p)\n",
- buffer, format, format, argptr);
-
-- Length = PAL__vsnprintf(buffer, 0x7fffffff, format, argptr);
-+ Length = InternalVsnprintf(CorUnix::InternalGetCurrentThread(), buffer, 0x7fffffff, format, argptr);
-
- LOGEXIT("PAL_vsprintf returns int %d\n", Length);
- PERF_EXIT(vsprintf);
-@@ -1624,35 +1625,6 @@ PAL_vsprintf(char *buffer,
-
- /*++
- Function:
-- _vsnprintf
--
--See MSDN doc.
----*/
--int
--__cdecl
--_vsnprintf(char *buffer,
-- size_t count,
-- const char *format,
-- va_list argptr)
--{
-- LONG Length;
--
-- PERF_ENTRY(_vsnprintf);
-- ENTRY("_vsnprintf (buffer=%p, count=%d, format=%p (%s), argptr=%p)\n",
-- buffer, count, format, format, argptr);
--
-- Length = PAL__vsnprintf(buffer, count, format, argptr);
--
-- LOGEXIT("_vsnprintf returns int %d\n", Length);
-- PERF_EXIT(_vsnprintf);
--
-- return Length;
--}
--
--
--
--/*++
--Function:
- PAL_vswprintf
-
- See MSDN doc.
-@@ -1785,4 +1757,3 @@ static int SscanfFloatCheckExponent(LPCS
- return ret;
- }
- #endif // SSCANF_CANNOT_HANDLE_MISSING_EXPONENT
--
diff --git a/coreclr-git/patches/patch-src_pal_src_cruntime_printfcpp.cpp b/coreclr-git/patches/patch-src_pal_src_cruntime_printfcpp.cpp
deleted file mode 100644
index 778d80e..0000000
--- a/coreclr-git/patches/patch-src_pal_src_cruntime_printfcpp.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD$
-
---- src/pal/src/cruntime/printfcpp.cpp.orig 2016-01-28 19:04:13.000000000 +0000
-+++ src/pal/src/cruntime/printfcpp.cpp
-@@ -1068,7 +1068,18 @@ Parameters:
-
- int __cdecl PAL__vsnprintf(LPSTR Buffer, size_t Count, LPCSTR Format, va_list ap)
- {
-- return CoreVsnprintf(InternalGetCurrentThread(), Buffer, Count, Format, ap);
-+ LONG Length;
-+
-+ PERF_ENTRY(PAL__vsnprintf);
-+ ENTRY("PAL__vsnprintf (buffer=%p, count=%d, format=%p (%s), argptr=%p)\n",
-+ Buffer, Count, Format, Format, ap);
-+
-+ Length = CoreVsnprintf(InternalGetCurrentThread(), Buffer, Count, Format, ap);
-+
-+ LOGEXIT("PAL__vsnprintf returns int %d\n", Length);
-+ PERF_EXIT(PAL__vsnprintf);
-+
-+ return Length;
- }
-
- /*******************************************************************************
diff --git a/coreclr-git/patches/patch-src_pal_src_cruntime_silent__printf.cpp b/coreclr-git/patches/patch-src_pal_src_cruntime_silent__printf.cpp
deleted file mode 100644
index f028963..0000000
--- a/coreclr-git/patches/patch-src_pal_src_cruntime_silent__printf.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
---- src/pal/src/cruntime/silent_printf.cpp.orig 2016-01-28 19:04:13.000000000 +0000
-+++ src/pal/src/cruntime/silent_printf.cpp
-@@ -26,6 +26,7 @@ Revision History:
- #include "pal/cruntime.h"
- #include "pal/locale.h"
- #include "pal/printfcpp.hpp"
-+#include "pal/thread.hpp"
-
- /* clip strings (%s, %S) at this number of characters */
- #define MAX_STR_LEN 300
-@@ -280,7 +281,7 @@ INT Silent_PAL_vsnprintf(LPSTR Buffer, I
- }
- va_list apcopy;
- va_copy(apcopy, ap);
-- TempInt = PAL__vsnprintf(BufferPtr, TempCount, TempBuff, apcopy);
-+ TempInt = InternalVsnprintf(CorUnix::InternalGetCurrentThread(), BufferPtr, TempCount, TempBuff, apcopy);
- va_end(apcopy);
- PAL_printf_arg_remover(&ap, Width, Precision, Type, Prefix);
- }
-@@ -987,4 +988,3 @@ size_t Silent_PAL_wcslen(const wchar_16
-
- return nChar;
- }
--
Home |
Main Index |
Thread Index |
Old Index