pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
coreclr-git: Eliminate merged patches, improve existings ones
Module Name: pkgsrc-wip
Committed By: Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By: kamil
Date: Sat Feb 6 03:20:18 2016 +0100
Changeset: f0c3d423e89dc3a6135857481f2e2caa5fe8fe1d
Modified Files:
coreclr-git/distinfo
coreclr-git/patches/patch-src_pal_src_CMakeLists.txt
coreclr-git/patches/patch-src_pal_src_exception_seh-unwind.cpp
Added Files:
coreclr-git/patches/patch-src_pal_src_synchmgr_synchmanager.hpp
Removed Files:
coreclr-git/patches/patch-src_debug_ee_controller.h
coreclr-git/patches/patch-src_debug_ee_debugger.h
coreclr-git/patches/patch-src_pal_src_include_pal_synchcache.hpp
coreclr-git/patches/patch-src_pal_tests_palsuite_c__runtime_sscanf_test4_test4.c
coreclr-git/patches/patch-src_pal_tests_palsuite_c__runtime_sscanf_test5_test5.c
coreclr-git/patches/patch-src_pal_tests_palsuite_c__runtime_sscanf_test6_test6.c
coreclr-git/patches/patch-src_pal_tests_palsuite_c__runtime_sscanf_test7_test7.c
coreclr-git/patches/patch-src_pal_tests_palsuite_c__runtime_sscanf_test8_test8.c
coreclr-git/patches/patch-src_pal_tests_palsuite_c__runtime_swscanf_test4_test4.c
coreclr-git/patches/patch-src_pal_tests_palsuite_c__runtime_swscanf_test5_test5.c
coreclr-git/patches/patch-src_pal_tests_palsuite_c__runtime_swscanf_test6_test6.c
coreclr-git/patches/patch-src_pal_tests_palsuite_c__runtime_swscanf_test7_test7.c
coreclr-git/patches/patch-src_pal_tests_palsuite_c__runtime_swscanf_test8_test8.c
Log Message:
coreclr-git: Eliminate merged patches, improve existings ones
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f0c3d423e89dc3a6135857481f2e2caa5fe8fe1d
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
coreclr-git/distinfo | 18 ++-------
.../patches/patch-src_debug_ee_controller.h | 13 ------
coreclr-git/patches/patch-src_debug_ee_debugger.h | 47 ----------------------
.../patches/patch-src_pal_src_CMakeLists.txt | 4 +-
.../patch-src_pal_src_exception_seh-unwind.cpp | 2 +-
.../patch-src_pal_src_include_pal_synchcache.hpp | 18 ---------
.../patch-src_pal_src_synchmgr_synchmanager.hpp | 29 +++++++++++++
..._tests_palsuite_c__runtime_sscanf_test4_test4.c | 22 ----------
..._tests_palsuite_c__runtime_sscanf_test5_test5.c | 22 ----------
..._tests_palsuite_c__runtime_sscanf_test6_test6.c | 21 ----------
..._tests_palsuite_c__runtime_sscanf_test7_test7.c | 22 ----------
..._tests_palsuite_c__runtime_sscanf_test8_test8.c | 22 ----------
...tests_palsuite_c__runtime_swscanf_test4_test4.c | 21 ----------
...tests_palsuite_c__runtime_swscanf_test5_test5.c | 21 ----------
...tests_palsuite_c__runtime_swscanf_test6_test6.c | 22 ----------
...tests_palsuite_c__runtime_swscanf_test7_test7.c | 21 ----------
...tests_palsuite_c__runtime_swscanf_test8_test8.c | 22 ----------
17 files changed, 35 insertions(+), 312 deletions(-)
diffs:
diff --git a/coreclr-git/distinfo b/coreclr-git/distinfo
index aa72094..18c7a17 100644
--- a/coreclr-git/distinfo
+++ b/coreclr-git/distinfo
@@ -1,21 +1,9 @@
$NetBSD$
-SHA1 (patch-src_debug_ee_controller.h) = f1a11bdadd82b706d37236cf41d629aee247cd86
-SHA1 (patch-src_debug_ee_debugger.h) = 4f93c0da59999e326bfec29b57a202acf0341309
SHA1 (patch-src_pal_inc_pal__char16.h) = 205f6a8533838c192b36bbb00155da1b02e0f629
-SHA1 (patch-src_pal_src_CMakeLists.txt) = 7f5b7e7f669efa42fb1bc230949e508a0df080ed
+SHA1 (patch-src_pal_src_CMakeLists.txt) = 1a8b4d357578a851306c6930f8de1b7e64eeab0a
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_seh-unwind.cpp) = 3a0c587cf9a4f00a0da2cd7a7a59a24b330e1f3d
SHA1 (patch-src_pal_src_exception_signal.cpp) = ba0cabad71792a0108ffd9ec29254751f1e95997
-SHA1 (patch-src_pal_src_include_pal_synchcache.hpp) = 7ace14659295f07fd62e0d2a5f2b2d55541debfb
+SHA1 (patch-src_pal_src_synchmgr_synchmanager.hpp) = 54696c8ee6a10bfa9858e3145b552c56c58dfbbf
SHA1 (patch-src_pal_src_thread_context.cpp) = c982763c5b6c9905fd1f14b1271baae5a2fbf052
-SHA1 (patch-src_pal_tests_palsuite_c__runtime_sscanf_test4_test4.c) = f9d52fa5a7f6c215186a33b2847a77799c5d9093
-SHA1 (patch-src_pal_tests_palsuite_c__runtime_sscanf_test5_test5.c) = 5a2527106707efab05e990965bc336219d62f2c3
-SHA1 (patch-src_pal_tests_palsuite_c__runtime_sscanf_test6_test6.c) = 816c3b7bda86664adc06cf2bc52d4c6063a34c76
-SHA1 (patch-src_pal_tests_palsuite_c__runtime_sscanf_test7_test7.c) = 1ab27ca6fe6b68f74fed6c22a1af7d648d2e9e93
-SHA1 (patch-src_pal_tests_palsuite_c__runtime_sscanf_test8_test8.c) = 5a87decf74f703b574e109a22b81a974eae4b8b9
-SHA1 (patch-src_pal_tests_palsuite_c__runtime_swscanf_test4_test4.c) = 823d59ec0b678eee2ac7a222022fe3caaf3149f4
-SHA1 (patch-src_pal_tests_palsuite_c__runtime_swscanf_test5_test5.c) = f9636dd137d86cd7950d735f092fb13df8505b95
-SHA1 (patch-src_pal_tests_palsuite_c__runtime_swscanf_test6_test6.c) = e51600bfd6ab73c95c51ed5bc468f4baec49022b
-SHA1 (patch-src_pal_tests_palsuite_c__runtime_swscanf_test7_test7.c) = aa77ae6c78aef8800f5e441ad64efd9167472cc1
-SHA1 (patch-src_pal_tests_palsuite_c__runtime_swscanf_test8_test8.c) = 61ab6bca0b3d7740bb06fd97ead821f81890a4dc
diff --git a/coreclr-git/patches/patch-src_debug_ee_controller.h b/coreclr-git/patches/patch-src_debug_ee_controller.h
deleted file mode 100644
index c770a05..0000000
--- a/coreclr-git/patches/patch-src_debug_ee_controller.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- src/debug/ee/controller.h.orig 2016-01-28 19:04:13.000000000 +0000
-+++ src/debug/ee/controller.h
-@@ -540,6 +540,8 @@ class DebuggerPatchTable : private CHash
- {
- VPTR_BASE_CONCRETE_VTABLE_CLASS(DebuggerPatchTable);
-
-+ virtual ~DebuggerPatchTable() = default;
-+
- friend class DebuggerRCThread;
- private:
- //incremented so that we can get DPT-wide unique PIDs.
diff --git a/coreclr-git/patches/patch-src_debug_ee_debugger.h b/coreclr-git/patches/patch-src_debug_ee_debugger.h
deleted file mode 100644
index e2c0db9..0000000
--- a/coreclr-git/patches/patch-src_debug_ee_debugger.h
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD$
-
---- src/debug/ee/debugger.h.orig 2016-01-28 19:04:13.000000000 +0000
-+++ src/debug/ee/debugger.h
-@@ -3084,6 +3084,8 @@ public:
-
- class DebuggerPendingFuncEvalTable : private CHashTableAndData<CNewZeroData>
- {
-+ public: virtual ~DebuggerPendingFuncEvalTable() = default;
-+
- private:
-
- BOOL Cmp(SIZE_T k1, const HASHENTRY * pc2)
-@@ -3167,6 +3169,10 @@ typedef DPTR(struct DebuggerModuleEntry)
-
- class DebuggerModuleTable : private CHashTableAndData<CNewZeroData>
- {
-+#ifdef DACCESS_COMPILE
-+ public: virtual ~DebuggerModuleTable() = default;
-+#endif
-+
- private:
-
- BOOL Cmp(SIZE_T k1, const HASHENTRY * pc2)
-@@ -3206,7 +3212,7 @@ public:
- #ifndef DACCESS_COMPILE
-
- DebuggerModuleTable();
-- ~DebuggerModuleTable();
-+ virtual ~DebuggerModuleTable();
-
- void AddModule(DebuggerModule *module);
-
-@@ -3274,6 +3280,8 @@ class DebuggerMethodInfoTable : private
- {
- VPTR_BASE_CONCRETE_VTABLE_CLASS(DebuggerMethodInfoTable);
-
-+ virtual ~DebuggerMethodInfoTable() = default;
-+
- private:
- BOOL Cmp(SIZE_T k1, const HASHENTRY * pc2)
- {
-@@ -3973,4 +3981,3 @@ void FixupDispatcherContext(T_DISPATCHER
- #endif
-
- #endif /* DEBUGGER_H_ */
--
diff --git a/coreclr-git/patches/patch-src_pal_src_CMakeLists.txt b/coreclr-git/patches/patch-src_pal_src_CMakeLists.txt
index e696317..377f8ef 100644
--- a/coreclr-git/patches/patch-src_pal_src_CMakeLists.txt
+++ b/coreclr-git/patches/patch-src_pal_src_CMakeLists.txt
@@ -1,8 +1,8 @@
$NetBSD$
---- src/pal/src/CMakeLists.txt.orig 2016-02-02 22:59:18.000000000 +0000
+--- src/pal/src/CMakeLists.txt.orig 2016-02-06 02:05:27.000000000 +0000
+++ src/pal/src/CMakeLists.txt
-@@ -251,12 +251,12 @@ if(CMAKE_SYSTEM_NAME STREQUAL Linux)
+@@ -263,12 +263,12 @@ if(CMAKE_SYSTEM_NAME STREQUAL Linux)
endif(CMAKE_SYSTEM_NAME STREQUAL Linux)
if(CMAKE_SYSTEM_NAME STREQUAL NetBSD)
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
index b89973f..d568562 100644
--- a/coreclr-git/patches/patch-src_pal_src_exception_seh-unwind.cpp
+++ b/coreclr-git/patches/patch-src_pal_src_exception_seh-unwind.cpp
@@ -1,6 +1,6 @@
$NetBSD$
---- src/pal/src/exception/seh-unwind.cpp.orig 2016-01-28 19:04:13.000000000 +0000
+--- src/pal/src/exception/seh-unwind.cpp.orig 2016-02-06 02:05:27.000000000 +0000
+++ src/pal/src/exception/seh-unwind.cpp
@@ -297,7 +297,6 @@ BOOL PAL_VirtualUnwind(CONTEXT *context,
}
diff --git a/coreclr-git/patches/patch-src_pal_src_include_pal_synchcache.hpp b/coreclr-git/patches/patch-src_pal_src_include_pal_synchcache.hpp
deleted file mode 100644
index 5f2097d..0000000
--- a/coreclr-git/patches/patch-src_pal_src_include_pal_synchcache.hpp
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
---- src/pal/src/include/pal/synchcache.hpp.orig 2016-01-28 19:04:13.000000000 +0000
-+++ src/pal/src/include/pal/synchcache.hpp
-@@ -143,7 +143,7 @@ namespace CorUnix
- return;
- }
-
-- pobj->~T();
-+// pobj->~T();
-
- Lock(pthrCurrent);
- if (m_iDepth < m_iMaxDepth)
-@@ -394,4 +394,3 @@ namespace CorUnix
- }
-
- #endif // _SYNCH_CACHE_H_
--
diff --git a/coreclr-git/patches/patch-src_pal_src_synchmgr_synchmanager.hpp b/coreclr-git/patches/patch-src_pal_src_synchmgr_synchmanager.hpp
new file mode 100644
index 0000000..37e46a1
--- /dev/null
+++ b/coreclr-git/patches/patch-src_pal_src_synchmgr_synchmanager.hpp
@@ -0,0 +1,29 @@
+$NetBSD$
+
+--- src/pal/src/synchmgr/synchmanager.hpp.orig 2016-01-28 19:04:13.000000000 +0000
++++ src/pal/src/synchmgr/synchmanager.hpp
+@@ -452,6 +452,7 @@ namespace CorUnix
+
+ public:
+ CSynchWaitController() : m_pProcLocalData(NULL) {}
++ virtual ~CSynchWaitController() = default;
+
+ //
+ // ISynchWaitController methods
+@@ -479,8 +480,9 @@ namespace CorUnix
+ {
+ public:
+ // NB: For perforformance purposes this class is supposed
+- // to have no constructor or destructor
+-
++ // to have no constructor
++ virtual ~CSynchStateController() = default;
++
+ //
+ // ISynchStateController methods
+ //
+@@ -1021,4 +1023,3 @@ namespace CorUnix
+ }
+
+ #endif // _SINCHMANAGER_HPP_
+-
diff --git a/coreclr-git/patches/patch-src_pal_tests_palsuite_c__runtime_sscanf_test4_test4.c b/coreclr-git/patches/patch-src_pal_tests_palsuite_c__runtime_sscanf_test4_test4.c
deleted file mode 100644
index 26e5f3d..0000000
--- a/coreclr-git/patches/patch-src_pal_tests_palsuite_c__runtime_sscanf_test4_test4.c
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD$
-
---- src/pal/tests/palsuite/c_runtime/sscanf/test4/test4.c.orig 2016-01-28 19:04:13.000000000 +0000
-+++ src/pal/tests/palsuite/c_runtime/sscanf/test4/test4.c
-@@ -19,6 +19,8 @@
-
- int __cdecl main(int argc, char *argv[])
- {
-+ int n65535 = 65535; /* Walkaround compiler strictness */
-+
- if (PAL_Initialize(argc, argv))
- {
- return FAIL;
-@@ -29,7 +31,7 @@ int __cdecl main(int argc, char *argv[])
- DoNumTest("-1", "%d", -1);
- DoNumTest("0x1234", "%d", 0);
- DoNumTest("012", "%d", 12);
-- DoShortNumTest("-1", "%hd", 65535);
-+ DoShortNumTest("-1", "%hd", n65535);
- DoShortNumTest("65536", "%hd", 0);
- DoNumTest("-1", "%ld", -1);
- DoNumTest("65536", "%ld", 65536);
diff --git a/coreclr-git/patches/patch-src_pal_tests_palsuite_c__runtime_sscanf_test5_test5.c b/coreclr-git/patches/patch-src_pal_tests_palsuite_c__runtime_sscanf_test5_test5.c
deleted file mode 100644
index ba3950b..0000000
--- a/coreclr-git/patches/patch-src_pal_tests_palsuite_c__runtime_sscanf_test5_test5.c
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD$
-
---- src/pal/tests/palsuite/c_runtime/sscanf/test5/test5.c.orig 2016-01-28 19:04:13.000000000 +0000
-+++ src/pal/tests/palsuite/c_runtime/sscanf/test5/test5.c
-@@ -18,6 +18,8 @@
-
- int __cdecl main(int argc, char *argv[])
- {
-+ int n65535 = 65535; /* Walkaround compiler strictness */
-+
- if (PAL_Initialize(argc, argv))
- {
- return FAIL;
-@@ -28,7 +30,7 @@ int __cdecl main(int argc, char *argv[])
- DoNumTest("-1", "%i", -1);
- DoNumTest("0x1234", "%i", 0x1234);
- DoNumTest("012", "%i", 10);
-- DoShortNumTest("-1", "%hi", 65535);
-+ DoShortNumTest("-1", "%hi", n65535);
- DoShortNumTest("65536", "%hi", 0);
- DoNumTest("-1", "%li", -1);
- DoNumTest("65536", "%li", 65536);
diff --git a/coreclr-git/patches/patch-src_pal_tests_palsuite_c__runtime_sscanf_test6_test6.c b/coreclr-git/patches/patch-src_pal_tests_palsuite_c__runtime_sscanf_test6_test6.c
deleted file mode 100644
index d3de150..0000000
--- a/coreclr-git/patches/patch-src_pal_tests_palsuite_c__runtime_sscanf_test6_test6.c
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD$
-
---- src/pal/tests/palsuite/c_runtime/sscanf/test6/test6.c.orig 2016-01-28 19:04:13.000000000 +0000
-+++ src/pal/tests/palsuite/c_runtime/sscanf/test6/test6.c
-@@ -18,6 +18,7 @@
-
- int __cdecl main(int argc, char *argv[])
- {
-+ int n65535 = 65535; /* Walkaround compiler strictness */
-
- if (PAL_Initialize(argc, argv))
- {
-@@ -29,7 +30,7 @@ int __cdecl main(int argc, char *argv[])
- DoNumTest("-1", "%o", -1);
- DoNumTest("0x1234", "%o", 0);
- DoNumTest("012", "%o", 10);
-- DoShortNumTest("-1", "%ho", 65535);
-+ DoShortNumTest("-1", "%ho", n65535);
- DoShortNumTest("200000", "%ho", 0);
- DoNumTest("-1", "%lo", -1);
- DoNumTest("200000", "%lo", 65536);
diff --git a/coreclr-git/patches/patch-src_pal_tests_palsuite_c__runtime_sscanf_test7_test7.c b/coreclr-git/patches/patch-src_pal_tests_palsuite_c__runtime_sscanf_test7_test7.c
deleted file mode 100644
index 62df5ad..0000000
--- a/coreclr-git/patches/patch-src_pal_tests_palsuite_c__runtime_sscanf_test7_test7.c
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD$
-
---- src/pal/tests/palsuite/c_runtime/sscanf/test7/test7.c.orig 2016-01-28 19:04:13.000000000 +0000
-+++ src/pal/tests/palsuite/c_runtime/sscanf/test7/test7.c
-@@ -18,6 +18,8 @@
-
- int __cdecl main(int argc, char *argv[])
- {
-+ int n65535 = 65535; /* Walkaround compiler strictness */
-+
- if (PAL_Initialize(argc, argv))
- {
- return FAIL;
-@@ -28,7 +30,7 @@ int __cdecl main(int argc, char *argv[])
- DoNumTest("-1", "%x", -1);
- DoNumTest("0x1234", "%x", 0x1234);
- DoNumTest("012", "%x", 0x12);
-- DoShortNumTest("-1", "%hx", 65535);
-+ DoShortNumTest("-1", "%hx", n65535);
- DoShortNumTest("10000", "%hx", 0);
- DoNumTest("-1", "%lx", -1);
- DoNumTest("10000", "%lx", 65536);
diff --git a/coreclr-git/patches/patch-src_pal_tests_palsuite_c__runtime_sscanf_test8_test8.c b/coreclr-git/patches/patch-src_pal_tests_palsuite_c__runtime_sscanf_test8_test8.c
deleted file mode 100644
index 5d79542..0000000
--- a/coreclr-git/patches/patch-src_pal_tests_palsuite_c__runtime_sscanf_test8_test8.c
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD$
-
---- src/pal/tests/palsuite/c_runtime/sscanf/test8/test8.c.orig 2016-01-28 19:04:13.000000000 +0000
-+++ src/pal/tests/palsuite/c_runtime/sscanf/test8/test8.c
-@@ -18,6 +18,8 @@
-
- int __cdecl main(int argc, char *argv[])
- {
-+ int n65535 = 65535; /* Walkaround compiler strictness */
-+
- if (PAL_Initialize(argc, argv))
- {
- return FAIL;
-@@ -28,7 +30,7 @@ int __cdecl main(int argc, char *argv[])
- DoNumTest("-1", "%u", -1);
- DoNumTest("0x1234", "%u", 0);
- DoNumTest("012", "%u", 12);
-- DoShortNumTest("-1", "%hu", 65535);
-+ DoShortNumTest("-1", "%hu", n65535);
- DoShortNumTest("65536", "%hu", 0);
- DoNumTest("-1", "%lu", -1);
- DoNumTest("65536", "%lu", 65536);
diff --git a/coreclr-git/patches/patch-src_pal_tests_palsuite_c__runtime_swscanf_test4_test4.c b/coreclr-git/patches/patch-src_pal_tests_palsuite_c__runtime_swscanf_test4_test4.c
deleted file mode 100644
index 3550c97..0000000
--- a/coreclr-git/patches/patch-src_pal_tests_palsuite_c__runtime_swscanf_test4_test4.c
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD$
-
---- src/pal/tests/palsuite/c_runtime/swscanf/test4/test4.c.orig 2016-01-28 19:04:13.000000000 +0000
-+++ src/pal/tests/palsuite/c_runtime/swscanf/test4/test4.c
-@@ -19,6 +19,7 @@
-
- int __cdecl main(int argc, char *argv[])
- {
-+ int n65535 = 65535; /* Walkaround compiler strictness */
-
- if (PAL_Initialize(argc, argv))
- {
-@@ -30,7 +31,7 @@ int __cdecl main(int argc, char *argv[])
- DoNumTest(convert("-1"), convert("%d"), -1);
- DoNumTest(convert("0x1234"), convert("%d"), 0);
- DoNumTest(convert("012"), convert("%d"), 12);
-- DoShortNumTest(convert("-1"), convert("%hd"), 65535);
-+ DoShortNumTest(convert("-1"), convert("%hd"), n65535);
- DoShortNumTest(convert("65536"), convert("%hd"), 0);
- DoNumTest(convert("-1"), convert("%ld"), -1);
- DoNumTest(convert("65536"), convert("%ld"), 65536);
diff --git a/coreclr-git/patches/patch-src_pal_tests_palsuite_c__runtime_swscanf_test5_test5.c b/coreclr-git/patches/patch-src_pal_tests_palsuite_c__runtime_swscanf_test5_test5.c
deleted file mode 100644
index 35ccea9..0000000
--- a/coreclr-git/patches/patch-src_pal_tests_palsuite_c__runtime_swscanf_test5_test5.c
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD$
-
---- src/pal/tests/palsuite/c_runtime/swscanf/test5/test5.c.orig 2016-01-28 19:04:13.000000000 +0000
-+++ src/pal/tests/palsuite/c_runtime/swscanf/test5/test5.c
-@@ -19,6 +19,7 @@
-
- int __cdecl main(int argc, char *argv[])
- {
-+ int n65535 = 65535; /* Walkaround compiler strictness */
-
- if (PAL_Initialize(argc, argv))
- {
-@@ -30,7 +31,7 @@ int __cdecl main(int argc, char *argv[])
- DoNumTest(convert("-1"), convert("%i"), -1);
- DoNumTest(convert("0x1234"), convert("%i"), 0x1234);
- DoNumTest(convert("012"), convert("%i"), 10);
-- DoShortNumTest(convert("-1"), convert("%hi"), 65535);
-+ DoShortNumTest(convert("-1"), convert("%hi"), n65535);
- DoShortNumTest(convert("65536"), convert("%hi"), 0);
- DoNumTest(convert("-1"), convert("%li"), -1);
- DoNumTest(convert("65536"), convert("%li"), 65536);
diff --git a/coreclr-git/patches/patch-src_pal_tests_palsuite_c__runtime_swscanf_test6_test6.c b/coreclr-git/patches/patch-src_pal_tests_palsuite_c__runtime_swscanf_test6_test6.c
deleted file mode 100644
index 8e4f4af..0000000
--- a/coreclr-git/patches/patch-src_pal_tests_palsuite_c__runtime_swscanf_test6_test6.c
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD$
-
---- src/pal/tests/palsuite/c_runtime/swscanf/test6/test6.c.orig 2016-01-28 19:04:13.000000000 +0000
-+++ src/pal/tests/palsuite/c_runtime/swscanf/test6/test6.c
-@@ -19,6 +19,8 @@
-
- int __cdecl main(int argc, char *argv[])
- {
-+ int n65535 = 65535; /* Walkaround compiler strictness */
-+
- if (PAL_Initialize(argc, argv))
- {
- return FAIL;
-@@ -29,7 +31,7 @@ int __cdecl main(int argc, char *argv[])
- DoNumTest(convert("-1"), convert("%o"), -1);
- DoNumTest(convert("0x1234"), convert("%o"), 0);
- DoNumTest(convert("012"), convert("%o"), 10);
-- DoShortNumTest(convert("-1"), convert("%ho"), 65535);
-+ DoShortNumTest(convert("-1"), convert("%ho"), n65535);
- DoShortNumTest(convert("200000"), convert("%ho"), 0);
- DoNumTest(convert("-1"), convert("%lo"), -1);
- DoNumTest(convert("200000"), convert("%lo"), 65536);
diff --git a/coreclr-git/patches/patch-src_pal_tests_palsuite_c__runtime_swscanf_test7_test7.c b/coreclr-git/patches/patch-src_pal_tests_palsuite_c__runtime_swscanf_test7_test7.c
deleted file mode 100644
index 316459e..0000000
--- a/coreclr-git/patches/patch-src_pal_tests_palsuite_c__runtime_swscanf_test7_test7.c
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD$
-
---- src/pal/tests/palsuite/c_runtime/swscanf/test7/test7.c.orig 2016-01-28 19:04:13.000000000 +0000
-+++ src/pal/tests/palsuite/c_runtime/swscanf/test7/test7.c
-@@ -19,6 +19,7 @@
-
- int __cdecl main(int argc, char *argv[])
- {
-+ int n65535 = 65535; /* Walkaround compiler strictness */
-
- if (PAL_Initialize(argc, argv))
- {
-@@ -30,7 +31,7 @@ int __cdecl main(int argc, char *argv[])
- DoNumTest(convert("-1"), convert("%x"), -1);
- DoNumTest(convert("0x1234"), convert("%x"), 0x1234);
- DoNumTest(convert("012"), convert("%x"), 0x12);
-- DoShortNumTest(convert("-1"), convert("%hx"), 65535);
-+ DoShortNumTest(convert("-1"), convert("%hx"), n65535);
- DoShortNumTest(convert("10000"), convert("%hx"), 0);
- DoNumTest(convert("-1"), convert("%lx"), -1);
- DoNumTest(convert("10000"), convert("%lx"), 65536);
diff --git a/coreclr-git/patches/patch-src_pal_tests_palsuite_c__runtime_swscanf_test8_test8.c b/coreclr-git/patches/patch-src_pal_tests_palsuite_c__runtime_swscanf_test8_test8.c
deleted file mode 100644
index 0fbf274..0000000
--- a/coreclr-git/patches/patch-src_pal_tests_palsuite_c__runtime_swscanf_test8_test8.c
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD$
-
---- src/pal/tests/palsuite/c_runtime/swscanf/test8/test8.c.orig 2016-01-28 19:04:13.000000000 +0000
-+++ src/pal/tests/palsuite/c_runtime/swscanf/test8/test8.c
-@@ -19,6 +19,8 @@
-
- int __cdecl main(int argc, char *argv[])
- {
-+ int n65535 = 65535; /* Walkaround compiler strictness */
-+
- if (PAL_Initialize(argc, argv))
- {
- return FAIL;
-@@ -29,7 +31,7 @@ int __cdecl main(int argc, char *argv[])
- DoNumTest(convert("-1"), convert("%u"), -1);
- DoNumTest(convert("0x1234"), convert("%u"), 0);
- DoNumTest(convert("012"), convert("%u"), 12);
-- DoShortNumTest(convert("-1"), convert("%hu"), 65535);
-+ DoShortNumTest(convert("-1"), convert("%hu"), n65535);
- DoShortNumTest(convert("65536"), convert("%hu"), 0);
- DoNumTest(convert("-1"), convert("%lu"), -1);
- DoNumTest(convert("65536"), convert("%lu"), 65536);
Home |
Main Index |
Thread Index |
Old Index