diff options
author | Ron Olson <tachoknight@gmail.com> | 2019-03-11 11:08:04 -0500 |
---|---|---|
committer | Ron Olson <tachoknight@gmail.com> | 2019-03-11 11:08:04 -0500 |
commit | 52ecfbd29d8a0272cec9cfa381a8c1bb07da4b56 (patch) | |
tree | 505830b478484b61714ebf4323f76bc09b3dc66e | |
parent | 8503ff96541df829445d758a560716e48b54ccf1 (diff) | |
download | swift-lang-52ecfbd29d8a0272cec9cfa381a8c1bb07da4b56.tar.gz swift-lang-52ecfbd29d8a0272cec9cfa381a8c1bb07da4b56.tar.xz swift-lang-52ecfbd29d8a0272cec9cfa381a8c1bb07da4b56.zip |
Updated some patches
-rw-r--r-- | gettid.patch | 20 | ||||
-rw-r--r-- | no-ninja-build.patch | 7 |
2 files changed, 24 insertions, 3 deletions
diff --git a/gettid.patch b/gettid.patch new file mode 100644 index 0000000..5be918b --- /dev/null +++ b/gettid.patch @@ -0,0 +1,20 @@ +--- swift-corelibs-libdispatch/src/queue.c.orig 2019-03-09 16:58:51.182875053 -0600 ++++ swift-corelibs-libdispatch/src/queue.c 2019-03-10 08:29:51.377391396 -0500 +@@ -926,7 +926,7 @@ + #ifdef SYS_gettid + DISPATCH_ALWAYS_INLINE + static inline pid_t +-gettid(void) ++__gettid(void) + { + return (pid_t)syscall(SYS_gettid); + } +@@ -1054,7 +1054,7 @@ + #else + pthread_setspecific(__dispatch_tsd_key, &__dispatch_tsd); + #endif /* defined(_WIN32) */ +- __dispatch_tsd.tid = gettid(); ++ __dispatch_tsd.tid = __gettid(); + } + #endif + diff --git a/no-ninja-build.patch b/no-ninja-build.patch index a6bfdb9..1aeb7a4 100644 --- a/no-ninja-build.patch +++ b/no-ninja-build.patch @@ -1,10 +1,11 @@ ---- swift/utils/build-presets.ini.orig 2018-11-16 10:19:42.143559064 -0600 -+++ swift/utils/build-presets.ini 2018-11-16 10:20:13.638776829 -0600 -@@ -716,11 +716,9 @@ +--- swift/utils/build-presets.ini.orig 2019-03-11 08:44:39.664264614 -0500 ++++ swift/utils/build-presets.ini 2019-03-11 08:52:18.038295456 -0500 +@@ -716,12 +716,9 @@ llbuild swiftpm xctest -libicu +-libcxx dash-dash |