Update to 4.1

author: Michael Hansen 2018-04-02 12:03:27 -0700
committer: Michael Hansen 2018-04-02 12:03:27 -0700
commit: ba8f4c0f16324d31226e77f9cbf3736a687e175d (patch)
tree: 7c8c529ea32c0d4ec69623e7a0c3495ba51d4e05
parent: 7757dd4b593fe2d9da66248b851e5d6745e3366d (diff)
download: aur-ba8f4c0f16324d31226e77f9cbf3736a687e175d.tar.gz
7 files changed, 43 insertions, 409 deletions
diff --git a/.SRCINFO b/.SRCINFO
index bf4e4ade988c..54bd20bff64a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Thu Feb 22 16:27:18 UTC 2018
+# Sat Mar 31 02:37:42 UTC 2018
 pkgbase = swift-language
 	pkgdesc = The Swift programming language and debugger
-	pkgver = 4.0.3
-	pkgrel = 2
+	pkgver = 4.1
+	pkgrel = 1
 	url = http://swift.org/
 	arch = i686
 	arch = x86_64
@@ -27,40 +27,30 @@ pkgbase = swift-language
 	depends = sqlite
 	depends = ncurses
 	depends = libblocksruntime
-	source = swift-4.0.3-RELEASE.tar.gz::https://github.com/apple/swift/archive/swift-4.0.3-RELEASE.tar.gz
-	source = swift-llvm-4.0.3-RELEASE.tar.gz::https://github.com/apple/swift-llvm/archive/swift-4.0.3-RELEASE.tar.gz
-	source = swift-clang-4.0.3-RELEASE.tar.gz::https://github.com/apple/swift-clang/archive/swift-4.0.3-RELEASE.tar.gz
-	source = swift-lldb-4.0.3-RELEASE.tar.gz::https://github.com/apple/swift-lldb/archive/swift-4.0.3-RELEASE.tar.gz
-	source = swift-cmark-4.0.3-RELEASE.tar.gz::https://github.com/apple/swift-cmark/archive/swift-4.0.3-RELEASE.tar.gz
-	source = swift-llbuild-4.0.3-RELEASE.tar.gz::https://github.com/apple/swift-llbuild/archive/swift-4.0.3-RELEASE.tar.gz
-	source = swift-package-manager-4.0.3-RELEASE.tar.gz::https://github.com/apple/swift-package-manager/archive/swift-4.0.3-RELEASE.tar.gz
-	source = swift-corelibs-xctest-4.0.3-RELEASE.tar.gz::https://github.com/apple/swift-corelibs-xctest/archive/swift-4.0.3-RELEASE.tar.gz
-	source = swift-corelibs-foundation-4.0.3-RELEASE.tar.gz::https://github.com/apple/swift-corelibs-foundation/archive/swift-4.0.3-RELEASE.tar.gz
-	source = swift-corelibs-libdispatch-4.0.3-RELEASE.tar.gz::https://github.com/apple/swift-corelibs-libdispatch/archive/swift-4.0.3-RELEASE.tar.gz
-	source = swift-compiler-rt-4.0.3-RELEASE.tar.gz::https://github.com/apple/swift-compiler-rt/archive/swift-4.0.3-RELEASE.tar.gz
-	source = swift-integration-tests-4.0.3-RELEASE.tar.gz::https://github.com/apple/swift-integration-tests/archive/swift-4.0.3-RELEASE.tar.gz
-	source = icu59.patch
-	source = lldb_missing_include.patch
-	source = glibc-2.26.patch
-	source = glibc-2.26-compiler-rt-compat.patch
-	source = sr6176.patch
-	sha256sums = 026d596dd4a24580a5e442409e8c58259197bd73ddbb77e5aade96da982ea39b
-	sha256sums = a611487a82636142bc1ea8ef5b21401a5c75e57fb0dbf041ef8f2e85a472db2e
-	sha256sums = c940bd48c88f71622fb00167d92a619dd1614093893e1a09982c08da42259404
-	sha256sums = 7f695a33ee5cb75be18ba962045e1b57405abf17bd354c3e2a15c29b4b296bcb
-	sha256sums = e95d0b54a0e897e768c9437dd67d56ec887909d0294cf6536ba240accd0d294f
-	sha256sums = 92001e449b54a47516086a4e7d5f575bffa2847ae1f658540b2ec6f6dee6c6e7
-	sha256sums = 4c26d333a01c239de8aa96b0536b7ff7218b7a322851a7d3b3b91b59fb4ce244
-	sha256sums = 868c4e23842218c895d333e7d6dbaa1c583b5a1ac2a32b26fff42f4a5c577357
-	sha256sums = c20877e7fc658ef872d6acc9d1cad0d93a683bfeaef28e2bf665166540e539e5
-	sha256sums = 0a6d503f7ec4ce367a4aa63f68478ce7c998ec36a60b0b01445e048ab69600a8
-	sha256sums = 1c2da685e8f424cb4460ed1daaf0c308f8deff63e7a3716c8a881cef60fbc7d8
-	sha256sums = 7c720b23d542d34296ee4cf5290e05c7c7c55b7e8187dfaa5b185ea021c4ab9d
-	sha256sums = 18b7895fba15702419e86ae593531669c3966d1c8aa9a83361c5c8ef9d54f893
-	sha256sums = be61c69ae7bb626f7f07f95cb5c0074013725c1b90a3ca68aa0c0f989d75e41e
-	sha256sums = 215473272ec550c58fd2852c3e1c4aa4482a7d2b4980308df14f4a18676775a9
-	sha256sums = 2311adf234f52831af3b326d0d589fceae0a5336aa8576fdfd62afe71c195124
-	sha256sums = 22a0320dc3474f8be133b2d50d72c7feb215d847feee181549bbbd27735e5ab6
+	source = swift-4.1-RELEASE.tar.gz::https://github.com/apple/swift/archive/swift-4.1-RELEASE.tar.gz
+	source = swift-llvm-4.1-RELEASE.tar.gz::https://github.com/apple/swift-llvm/archive/swift-4.1-RELEASE.tar.gz
+	source = swift-clang-4.1-RELEASE.tar.gz::https://github.com/apple/swift-clang/archive/swift-4.1-RELEASE.tar.gz
+	source = swift-lldb-4.1-RELEASE.tar.gz::https://github.com/apple/swift-lldb/archive/swift-4.1-RELEASE.tar.gz
+	source = swift-cmark-4.1-RELEASE.tar.gz::https://github.com/apple/swift-cmark/archive/swift-4.1-RELEASE.tar.gz
+	source = swift-llbuild-4.1-RELEASE.tar.gz::https://github.com/apple/swift-llbuild/archive/swift-4.1-RELEASE.tar.gz
+	source = swift-package-manager-4.1-RELEASE.tar.gz::https://github.com/apple/swift-package-manager/archive/swift-4.1-RELEASE.tar.gz
+	source = swift-corelibs-xctest-4.1-RELEASE.tar.gz::https://github.com/apple/swift-corelibs-xctest/archive/swift-4.1-RELEASE.tar.gz
+	source = swift-corelibs-foundation-4.1-RELEASE.tar.gz::https://github.com/apple/swift-corelibs-foundation/archive/swift-4.1-RELEASE.tar.gz
+	source = swift-corelibs-libdispatch-4.1-RELEASE.tar.gz::https://github.com/apple/swift-corelibs-libdispatch/archive/swift-4.1-RELEASE.tar.gz
+	source = swift-compiler-rt-4.1-RELEASE.tar.gz::https://github.com/apple/swift-compiler-rt/archive/swift-4.1-RELEASE.tar.gz
+	source = swift-integration-tests-4.1-RELEASE.tar.gz::https://github.com/apple/swift-integration-tests/archive/swift-4.1-RELEASE.tar.gz
+	sha256sums = f957f107b8e726b80c66a4902b769b0c3795e7bfde1af2e1c833948f6398acdb
+	sha256sums = c8632074d178e04abc9ab3becb40618373c1b6f810053e18ddd7ff91dbbc8a48
+	sha256sums = e03c4508f714837c54da39a1c45ce78110c47428d970bbdde3ebc12068c15da2
+	sha256sums = b246dda82e3e151b5e76944812a83323a61320378e5d34aa87eff67bbf0a224e
+	sha256sums = 21fc799d557838cc730e8e4e833cee18fea5e5733bdda6212f75c9331b9461ac
+	sha256sums = 88f2451e8c78a27ea18379b0062eb8e4fc961fca3089b5d485b6ceaeb7f67360
+	sha256sums = fcb4f55349143b9e8ad5ba0a5237beaa93a2bc42844ebb3d85c6df8a01e14142
+	sha256sums = cbcf4ebc75660f0bc7d3c32f6e4a7909b3616ecbf156ad7134beeb09a890a2dd
+	sha256sums = 5ec606f2776e2ea1a23a3c0e1ca6844c02ac4f17a9ec8cffa5d85c2970f1dab0
+	sha256sums = 73e2385be9a61f6168b7e98ab8c2370bc976c43bbe8577a44be371db45368137
+	sha256sums = 2110384f8cfa97334d4b9a2a17b1966b286189fb3a1526db8f2382c8872df189
+	sha256sums = 5718fdad339a6b8c0cd671fd4f840288103adb458651a902694a9f89a6c00ac7
 
 pkgname = swift
 	pkgdesc = The Swift programming language compiler and tools
diff --git a/PKGBUILD b/PKGBUILD
index e5a978f574e3..bf17791fdd60 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,9 +2,9 @@
 
 pkgbase=swift-language
 pkgname=(swift swift-lldb)
-_swiftver=4.0.3-RELEASE
+_swiftver=4.1-RELEASE
 pkgver=${_swiftver//-RELEASE/}
-pkgrel=2
+pkgrel=1
 pkgdesc="The Swift programming language and debugger"
 arch=('i686' 'x86_64')
 url="http://swift.org/"
@@ -27,29 +27,19 @@ source=(
     "swift-corelibs-libdispatch-${_swiftver}.tar.gz::https://github.com/apple/swift-corelibs-libdispatch/archive/swift-${_swiftver}.tar.gz"
     "swift-compiler-rt-${_swiftver}.tar.gz::https://github.com/apple/swift-compiler-rt/archive/swift-${_swiftver}.tar.gz"
     "swift-integration-tests-${_swiftver}.tar.gz::https://github.com/apple/swift-integration-tests/archive/swift-${_swiftver}.tar.gz"
-    "icu59.patch"
-    "lldb_missing_include.patch"
-    "glibc-2.26.patch"
-    "glibc-2.26-compiler-rt-compat.patch"
-    "sr6176.patch"
 )
-sha256sums=('026d596dd4a24580a5e442409e8c58259197bd73ddbb77e5aade96da982ea39b'
-            'a611487a82636142bc1ea8ef5b21401a5c75e57fb0dbf041ef8f2e85a472db2e'
-            'c940bd48c88f71622fb00167d92a619dd1614093893e1a09982c08da42259404'
-            '7f695a33ee5cb75be18ba962045e1b57405abf17bd354c3e2a15c29b4b296bcb'
-            'e95d0b54a0e897e768c9437dd67d56ec887909d0294cf6536ba240accd0d294f'
-            '92001e449b54a47516086a4e7d5f575bffa2847ae1f658540b2ec6f6dee6c6e7'
-            '4c26d333a01c239de8aa96b0536b7ff7218b7a322851a7d3b3b91b59fb4ce244'
-            '868c4e23842218c895d333e7d6dbaa1c583b5a1ac2a32b26fff42f4a5c577357'
-            'c20877e7fc658ef872d6acc9d1cad0d93a683bfeaef28e2bf665166540e539e5'
-            '0a6d503f7ec4ce367a4aa63f68478ce7c998ec36a60b0b01445e048ab69600a8'
-            '1c2da685e8f424cb4460ed1daaf0c308f8deff63e7a3716c8a881cef60fbc7d8'
-            '7c720b23d542d34296ee4cf5290e05c7c7c55b7e8187dfaa5b185ea021c4ab9d'
-            '18b7895fba15702419e86ae593531669c3966d1c8aa9a83361c5c8ef9d54f893'
-            'be61c69ae7bb626f7f07f95cb5c0074013725c1b90a3ca68aa0c0f989d75e41e'
-            '215473272ec550c58fd2852c3e1c4aa4482a7d2b4980308df14f4a18676775a9'
-            '2311adf234f52831af3b326d0d589fceae0a5336aa8576fdfd62afe71c195124'
-            '22a0320dc3474f8be133b2d50d72c7feb215d847feee181549bbbd27735e5ab6')
+sha256sums=('f957f107b8e726b80c66a4902b769b0c3795e7bfde1af2e1c833948f6398acdb'
+            'c8632074d178e04abc9ab3becb40618373c1b6f810053e18ddd7ff91dbbc8a48'
+            'e03c4508f714837c54da39a1c45ce78110c47428d970bbdde3ebc12068c15da2'
+            'b246dda82e3e151b5e76944812a83323a61320378e5d34aa87eff67bbf0a224e'
+            '21fc799d557838cc730e8e4e833cee18fea5e5733bdda6212f75c9331b9461ac'
+            '88f2451e8c78a27ea18379b0062eb8e4fc961fca3089b5d485b6ceaeb7f67360'
+            'fcb4f55349143b9e8ad5ba0a5237beaa93a2bc42844ebb3d85c6df8a01e14142'
+            'cbcf4ebc75660f0bc7d3c32f6e4a7909b3616ecbf156ad7134beeb09a890a2dd'
+            '5ec606f2776e2ea1a23a3c0e1ca6844c02ac4f17a9ec8cffa5d85c2970f1dab0'
+            '73e2385be9a61f6168b7e98ab8c2370bc976c43bbe8577a44be371db45368137'
+            '2110384f8cfa97334d4b9a2a17b1966b286189fb3a1526db8f2382c8872df189'
+            '5718fdad339a6b8c0cd671fd4f840288103adb458651a902694a9f89a6c00ac7')
 
 prepare() {
     # Use python2 where appropriate
@@ -76,19 +66,6 @@ prepare() {
     done
     ln -sf swift-swift-${_swiftver} swift
     ln -sf swift-package-manager-swift-${_swiftver} swiftpm
-
-    # ICU 59 changed the type of UChar to char16_t
-    ( cd "${srcdir}/swift" && patch -p1 -i "${srcdir}/icu59.patch" )
-
-    # LLDB is missing an include for std::bind with libstdc++/gcc7
-    ( cd "${srcdir}/lldb" && patch -p1 -i "${srcdir}/lldb_missing_include.patch" )
-
-    # glibc 2.26 compatibility fixes
-    ( cd "${srcdir}" && patch -p1 -i "${srcdir}/glibc-2.26.patch" )
-    ( cd "${srcdir}/compiler-rt" && patch -p1 -i "${srcdir}/glibc-2.26-compiler-rt-compat.patch" )
-
-    # Backported fix for SR-6176
-    ( cd "${srcdir}/swift" && patch -p1 -i "${srcdir}/sr6176.patch" )
 }
 
 _common_build_params=(
@@ -114,8 +91,7 @@ build() {
     cd "$srcdir/swift"
 
     export PATH="$PATH:/usr/bin/core_perl"
-    # sourcekitd-test and sourcekitd-repl currently don't link
-    # correctly on Linux.  Disable for now :(
+    # sourcekit (STILL) doesn't link correctly on Linux.  Disable for now :(
     _build_script_wrapper -R "${_common_build_params[@]}" \
         --extra-cmake-options="-DSWIFT_BUILD_SOURCEKIT=FALSE" \
         --skip-test-sourcekit
@@ -144,7 +120,7 @@ package_swift() {
     _build_script_wrapper -R "${_common_build_params[@]}" \
         --install-destdir="$pkgdir" \
         --install-llbuild --install-swiftpm --install-xctest \
-        --install-foundation
+        --install-foundation --install-libdispatch
 
     cd "$srcdir/build/Ninja-ReleaseAssert"
 
@@ -163,10 +139,6 @@ package_swift() {
         umask 0022
         cp -rL lib/swift/{clang,linux,shims} "$pkgdir/usr/lib/swift/"
     )
-    (
-        cd libdispatch-linux-$CARCH
-        make install DESTDIR="$pkgdir"
-    )
 
     # Some install targets provide an empty /usr/local/include
     rmdir "$pkgdir/usr/local/include"
diff --git a/glibc-2.26-compiler-rt-compat.patch b/glibc-2.26-compiler-rt-compat.patch
deleted file mode 100644
index 6d7071b35aeb..000000000000
--- a/glibc-2.26-compiler-rt-compat.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-From 8a5e425a68de4d2c80ff00a97bbcb3722a4716da Mon Sep 17 00:00:00 2001
-From: Kostya Serebryany <kcc@google.com>
-Date: Thu, 13 Jul 2017 21:59:01 +0000
-Subject: [PATCH] Fix sanitizer build against latest glibc
-
-Summary:
-libsanitizer doesn't build against latest glibc anymore, see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81066 for details.
-One of the changes is that stack_t changed from typedef struct sigaltstack { ... } stack_t; to typedef struct { ... } stack_t; for conformance reasons.
-And the other change is that the glibc internal __need_res_state macro is now ignored, so when doing
-```
-#define __need_res_state
-#include <resolv.h>
-```
-the effect is now the same as just
-```
-#include <resolv.h>
-```
-and thus one doesn't get just the
-```
-struct __res_state { ... };
-```
-definition, but newly also the
-```
-extern struct __res_state *__res_state(void) __attribute__ ((__const__));
-```
-prototype.  So __res_state is no longer a type, but a function.
-
-Reviewers: kcc, ygribov
-
-Reviewed By: kcc
-
-Subscribers: kubamracek
-
-Differential Revision: https://reviews.llvm.org/D35246
-
-git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@307969 91177308-0d34-0410-b5e6-96231b3b80d8
----
- lib/sanitizer_common/sanitizer_linux.cc                      | 3 +--
- lib/sanitizer_common/sanitizer_linux.h                       | 4 +---
- lib/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc | 2 +-
- lib/tsan/rtl/tsan_platform_linux.cc                          | 2 +-
- 4 files changed, 4 insertions(+), 7 deletions(-)
-
-diff --git a/lib/sanitizer_common/sanitizer_linux.cc b/lib/sanitizer_common/sanitizer_linux.cc
-index a79a2a155..8c3c1e5d6 100644
---- a/lib/sanitizer_common/sanitizer_linux.cc
-+++ b/lib/sanitizer_common/sanitizer_linux.cc
-@@ -629,8 +629,7 @@ uptr internal_prctl(int option, uptr arg2, uptr arg3, uptr arg4, uptr arg5) {
- }
- #endif
- 
--uptr internal_sigaltstack(const struct sigaltstack *ss,
--                         struct sigaltstack *oss) {
-+uptr internal_sigaltstack(const void *ss, void *oss) {
-   return internal_syscall(SYSCALL(sigaltstack), (uptr)ss, (uptr)oss);
- }
- 
-diff --git a/lib/sanitizer_common/sanitizer_linux.h b/lib/sanitizer_common/sanitizer_linux.h
-index ee336f7dd..11cad6b80 100644
---- a/lib/sanitizer_common/sanitizer_linux.h
-+++ b/lib/sanitizer_common/sanitizer_linux.h
-@@ -21,7 +21,6 @@
- #include "sanitizer_platform_limits_posix.h"
- 
- struct link_map;  // Opaque type returned by dlopen().
--struct sigaltstack;
- 
- namespace __sanitizer {
- // Dirent structure for getdents(). Note that this structure is different from
-@@ -30,8 +29,7 @@ struct linux_dirent;
- 
- // Syscall wrappers.
- uptr internal_getdents(fd_t fd, struct linux_dirent *dirp, unsigned int count);
--uptr internal_sigaltstack(const struct sigaltstack* ss,
--                          struct sigaltstack* oss);
-+uptr internal_sigaltstack(const void* ss, void* oss);
- uptr internal_sigprocmask(int how, __sanitizer_sigset_t *set,
-     __sanitizer_sigset_t *oldset);
- 
-diff --git a/lib/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc b/lib/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc
-index 03f73ae88..d7fa5f645 100644
---- a/lib/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc
-+++ b/lib/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc
-@@ -287,7 +287,7 @@ static int TracerThread(void* argument) {
- 
-   // Alternate stack for signal handling.
-   InternalScopedBuffer<char> handler_stack_memory(kHandlerStackSize);
--  struct sigaltstack handler_stack;
-+  stack_t handler_stack;
-   internal_memset(&handler_stack, 0, sizeof(handler_stack));
-   handler_stack.ss_sp = handler_stack_memory.data();
-   handler_stack.ss_size = kHandlerStackSize;
-diff --git a/lib/tsan/rtl/tsan_platform_linux.cc b/lib/tsan/rtl/tsan_platform_linux.cc
-index 0ba01babe..ead1e5704 100644
---- a/lib/tsan/rtl/tsan_platform_linux.cc
-+++ b/lib/tsan/rtl/tsan_platform_linux.cc
-@@ -286,7 +286,7 @@ void InitializePlatform() {
- int ExtractResolvFDs(void *state, int *fds, int nfd) {
- #if SANITIZER_LINUX && !SANITIZER_ANDROID
-   int cnt = 0;
--  __res_state *statp = (__res_state*)state;
-+  struct __res_state *statp = (struct __res_state*)state;
-   for (int i = 0; i < MAXNS && cnt < nfd; i++) {
-     if (statp->_u._ext.nsaddrs[i] && statp->_u._ext.nssocks[i] != -1)
-       fds[cnt++] = statp->_u._ext.nssocks[i];
-diff --git a/lib/esan/esan_sideline_linux.cpp b/lib/esan/esan_sideline_linux.cpp
-index d04f5909d6a2..bc272dfe49f8 100644
---- a/lib/esan/esan_sideline_linux.cpp
-+++ b/lib/esan/esan_sideline_linux.cpp
-@@ -70,7 +70,7 @@ int SidelineThread::runSideline(void *Arg) {
- 
-   // Set up a signal handler on an alternate stack for safety.
-   InternalScopedBuffer<char> StackMap(SigAltStackSize);
--  struct sigaltstack SigAltStack;
-+  stack_t SigAltStack;
-   SigAltStack.ss_sp = StackMap.data();
-   SigAltStack.ss_size = SigAltStackSize;
-   SigAltStack.ss_flags = 0;
diff --git a/glibc-2.26.patch b/glibc-2.26.patch
deleted file mode 100644
index dfbc94e11f09..000000000000
--- a/glibc-2.26.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -rupN a/llbuild/lib/BuildSystem/LaneBasedExecutionQueue.cpp b/llbuild/lib/BuildSystem/LaneBasedExecutionQueue.cpp
---- a/llbuild/lib/BuildSystem/LaneBasedExecutionQueue.cpp	2017-09-12 08:26:14.320282043 -0700
-+++ b/llbuild/lib/BuildSystem/LaneBasedExecutionQueue.cpp	2017-09-12 08:25:50.040024445 -0700
-@@ -260,7 +260,7 @@ public:
- #if defined(__linux__)
-     sigset_t mostSignals;
-     sigemptyset(&mostSignals);
--    for (int i = 1; i < SIGUNUSED; ++i) {
-+    for (int i = 1; i < SIGSYS; ++i) {
-       if (i == SIGKILL || i == SIGSTOP) continue;
-       sigaddset(&mostSignals, i);
-     }
-diff -rupN a/llbuild/lib/Commands/NinjaBuildCommand.cpp b/llbuild/lib/Commands/NinjaBuildCommand.cpp
---- a/llbuild/lib/Commands/NinjaBuildCommand.cpp	2017-09-12 08:26:14.320282043 -0700
-+++ b/llbuild/lib/Commands/NinjaBuildCommand.cpp	2017-09-12 08:25:50.040024445 -0700
-@@ -1181,7 +1181,7 @@ buildCommand(BuildContext& context, ninj
- #if defined(__linux__)
-       sigset_t mostSignals;
-       sigemptyset(&mostSignals);
--      for (int i = 1; i < SIGUNUSED; ++i) {
-+      for (int i = 1; i < SIGSYS; ++i) {
-         if (i == SIGKILL || i == SIGSTOP) continue;
-         sigaddset(&mostSignals, i);
-       }
-diff -rupN a/swift/stdlib/public/stubs/Stubs.cpp b/swift/stdlib/public/stubs/Stubs.cpp
---- a/swift/stdlib/public/stubs/Stubs.cpp	2017-09-12 08:26:27.680423806 -0700
-+++ b/swift/stdlib/public/stubs/Stubs.cpp	2017-09-12 08:25:49.870022642 -0700
-@@ -61,7 +61,7 @@ static long double swift_strtold_l(const
- #define strtof_l swift_strtof_l
- #define strtold_l swift_strtold_l
- #else
--#include <xlocale.h>
-+#include <locale.h>
- #endif
- #include <limits>
- #include <thread>
-diff -rupN a/swift-corelibs-foundation/CoreFoundation/Base.subproj/CFInternal.h b/swift-corelibs-foundation/CoreFoundation/Base.subproj/CFInternal.h
---- a/swift-corelibs-foundation/CoreFoundation/Base.subproj/CFInternal.h	2017-09-12 08:25:03.549531343 -0700
-+++ b/swift-corelibs-foundation/CoreFoundation/Base.subproj/CFInternal.h	2017-09-12 08:27:17.330950766 -0700
-@@ -95,7 +95,7 @@ CF_EXTERN_C_BEGIN
- #if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_FREEBSD
- #if TARGET_OS_CYGWIN
- #else
--#include <xlocale.h>
-+#include <locale.h>
- #endif
- #include <unistd.h>
- #include <sys/time.h>
-diff -rupN a/swiftpm/Sources/Basic/Process.swift b/swiftpm/Sources/Basic/Process.swift
---- a/swiftpm/Sources/Basic/Process.swift	2017-09-12 09:03:10.154395376 -0700
-+++ b/swiftpm/Sources/Basic/Process.swift	2017-09-12 09:03:36.114680619 -0700
-@@ -258,7 +258,7 @@ public final class Process: ObjectIdenti
-         // modify, so we have to take care about the set we use.
-         var mostSignals = sigset_t()
-         sigemptyset(&mostSignals)
--        for i in 1 ..< SIGUNUSED {
-+        for i in 1 ..< SIGSYS {
-             if i == SIGKILL || i == SIGSTOP {
-                 continue
-             }
diff --git a/icu59.patch b/icu59.patch
deleted file mode 100644
index a63a577b7d15..000000000000
--- a/icu59.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-diff -rupN a/stdlib/public/stubs/UnicodeNormalization.cpp b/stdlib/public/stubs/UnicodeNormalization.cpp
---- a/stdlib/public/stubs/UnicodeNormalization.cpp	2017-09-19 12:16:36.000000000 -0700
-+++ b/stdlib/public/stubs/UnicodeNormalization.cpp	2017-09-20 10:41:10.102292614 -0700
-@@ -87,11 +87,7 @@ private:
-     for (unsigned char c = 0; c < 128; ++c) {
-       UErrorCode ErrorCode = U_ZERO_ERROR;
-       intptr_t NumCollationElts = 0;
--#if defined(__CYGWIN__) || defined(_MSC_VER)
-       UChar Buffer[1];
--#else
--      uint16_t Buffer[1];
--#endif
-       Buffer[0] = c;
- 
-       UCollationElements *CollationIterator =
-@@ -128,18 +124,12 @@ swift::_swift_stdlib_unicode_compare_utf
-                                                  int32_t LeftLength,
-                                                  const uint16_t *RightString,
-                                                  int32_t RightLength) {
--#if defined(__CYGWIN__) || defined(_MSC_VER)
--  // ICU UChar type is platform dependent. In Cygwin, it is defined
--  // as wchar_t which size is 2. It seems that the underlying binary
-+  // ICU UChar is always char16_t as of ICU 59.
-+  // It seems that the underlying binary
-   // representation is same with swift utf16 representation.
-   return ucol_strcoll(GetRootCollator(),
-     reinterpret_cast<const UChar *>(LeftString), LeftLength,
-     reinterpret_cast<const UChar *>(RightString), RightLength);
--#else
--  return ucol_strcoll(GetRootCollator(),
--    LeftString, LeftLength,
--    RightString, RightLength);
--#endif
- }
- 
- /// Compares the strings via the Unicode Collation Algorithm on the root locale.
-@@ -157,12 +147,8 @@ swift::_swift_stdlib_unicode_compare_utf
-   UErrorCode ErrorCode = U_ZERO_ERROR;
- 
-   uiter_setUTF8(&LeftIterator, reinterpret_cast<const char *>(LeftString), LeftLength);
--#if defined(__CYGWIN__) || defined(_MSC_VER)
-   uiter_setString(&RightIterator, reinterpret_cast<const UChar *>(RightString),
-                   RightLength);
--#else
--  uiter_setString(&RightIterator, RightString, RightLength);
--#endif
- 
-   uint32_t Diff = ucol_strcollIter(GetRootCollator(),
-     &LeftIterator, &RightIterator, &ErrorCode);
-@@ -200,14 +186,9 @@ swift::_swift_stdlib_unicode_compare_utf
- void *swift::_swift_stdlib_unicodeCollationIterator_create(
-     const __swift_uint16_t *Str, __swift_uint32_t Length) {
-   UErrorCode ErrorCode = U_ZERO_ERROR;
--#if defined(__CYGWIN__) || defined(_MSC_VER)
-   UCollationElements *CollationIterator = ucol_openElements(
-     GetRootCollator(), reinterpret_cast<const UChar *>(Str), Length,
-     &ErrorCode);
--#else
--  UCollationElements *CollationIterator = ucol_openElements(
--    GetRootCollator(), Str, Length, &ErrorCode);
--#endif
-   if (U_FAILURE(ErrorCode)) {
-     swift::crash("_swift_stdlib_unicodeCollationIterator_create: ucol_openElements() failed.");
-   }
-@@ -245,17 +226,11 @@ swift::_swift_stdlib_unicode_strToUpper(
-                                         const uint16_t *Source,
-                                         int32_t SourceLength) {
-   UErrorCode ErrorCode = U_ZERO_ERROR;
--#if defined(__CYGWIN__) || defined(_MSC_VER)
-   uint32_t OutputLength = u_strToUpper(reinterpret_cast<UChar *>(Destination),
-                                        DestinationCapacity,
-                                        reinterpret_cast<const UChar *>(Source),
-                                        SourceLength,
-                                        "", &ErrorCode);
--#else
--  uint32_t OutputLength = u_strToUpper(Destination, DestinationCapacity,
--                                       Source, SourceLength,
--                                       "", &ErrorCode);
--#endif
-   if (U_FAILURE(ErrorCode) && ErrorCode != U_BUFFER_OVERFLOW_ERROR) {
-     swift::crash("u_strToUpper: Unexpected error uppercasing unicode string.");
-   }
-@@ -272,17 +247,11 @@ swift::_swift_stdlib_unicode_strToLower(
-                                         const uint16_t *Source,
-                                         int32_t SourceLength) {
-   UErrorCode ErrorCode = U_ZERO_ERROR;
--#if defined(__CYGWIN__) || defined(_MSC_VER)
-   uint32_t OutputLength = u_strToLower(reinterpret_cast<UChar *>(Destination),
-                                        DestinationCapacity,
-                                        reinterpret_cast<const UChar *>(Source),
-                                        SourceLength,
-                                        "", &ErrorCode);
--#else
--  uint32_t OutputLength = u_strToLower(Destination, DestinationCapacity,
--                                       Source, SourceLength,
--                                       "", &ErrorCode);
--#endif
-   if (U_FAILURE(ErrorCode) && ErrorCode != U_BUFFER_OVERFLOW_ERROR) {
-     swift::crash("u_strToLower: Unexpected error lowercasing unicode string.");
-   }
-@@ -330,9 +299,10 @@ void swift::__swift_stdlib_ubrk_close(
- 
- swift::__swift_stdlib_UBreakIterator *swift::__swift_stdlib_ubrk_open(
-     swift::__swift_stdlib_UBreakIteratorType type, const char *locale,
--    const UChar *text, int32_t textLength, __swift_stdlib_UErrorCode *status) {
-+    const __swift_stdlib_UChar *text, int32_t textLength, __swift_stdlib_UErrorCode *status) {
-   return ptr_cast<swift::__swift_stdlib_UBreakIterator>(
--      ubrk_open(static_cast<UBreakIteratorType>(type), locale, text, textLength,
-+      ubrk_open(static_cast<UBreakIteratorType>(type), locale,
-+                reinterpret_cast<const UChar *>(text), textLength,
-                 ptr_cast<UErrorCode>(status)));
- }
- 
diff --git a/lldb_missing_include.patch b/lldb_missing_include.patch
deleted file mode 100644
index ac192110668d..000000000000
--- a/lldb_missing_include.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/include/lldb/Utility/TaskPool.h b/include/lldb/Utility/TaskPool.h
-index db15b2081..3e6d5df8f 100644
---- a/include/lldb/Utility/TaskPool.h
-+++ b/include/lldb/Utility/TaskPool.h
-@@ -33,6 +33,7 @@
- #include <queue>
- #include <thread>
- #include <vector>
-+#include <functional>
- 
- // Global TaskPool class for running tasks in parallel on a set of worker thread
- // created the first
diff --git a/sr6176.patch b/sr6176.patch
deleted file mode 100644
index dfd6c9c26003..000000000000
--- a/sr6176.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From e13d20d30c95f99fecbda69a81ffa3e1ac21c4b5 Mon Sep 17 00:00:00 2001
-From: Adrian-Constantin Popescu <epsilon.gamma@gmail.com>
-Date: Sun, 11 Jun 2017 14:05:32 +0300
-Subject: [PATCH] Fixed failing test/Constraints/tuple_arguments.swift -
- returning temporary memory on stack.
-
----
- lib/Parse/ParseExpr.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/Parse/ParseExpr.cpp b/lib/Parse/ParseExpr.cpp
-index 6d1c22566761..0d00ccbed792 100644
---- a/lib/Parse/ParseExpr.cpp
-+++ b/lib/Parse/ParseExpr.cpp
-@@ -2420,8 +2420,8 @@ parseClosureSignatureIfPresent(SmallVectorImpl<CaptureListEntry> &captureList,
-   // Extract names of the tuple elements and preserve the structure
-   // of the tuple (with any nested tuples inside) to be able to use
-   // it in the fix-it without any type information provided by user.
--  std::function<StringRef(const TypeRepr *)> getTupleNames =
--      [&](const TypeRepr *typeRepr) -> StringRef {
-+  std::function<std::string (const TypeRepr *)> getTupleNames =
-+      [&](const TypeRepr *typeRepr) -> std::string  {
-     if (!typeRepr)
-       return "";
-
author	Michael Hansen	2018-04-02 12:03:27 -0700
committer	Michael Hansen	2018-04-02 12:03:27 -0700
commit	ba8f4c0f16324d31226e77f9cbf3736a687e175d (patch)
tree	7c8c529ea32c0d4ec69623e7a0c3495ba51d4e05
parent	7757dd4b593fe2d9da66248b851e5d6745e3366d (diff)
download	aur-ba8f4c0f16324d31226e77f9cbf3736a687e175d.tar.gz