Update to 4.1.3 and backport fix for removed header

4 files changed, 108 insertions, 52 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 54bd20bff64a..6407e45d0f3c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sat Mar 31 02:37:42 UTC 2018
+# Tue Aug 14 00:01:04 UTC 2018
 pkgbase = swift-language
 	pkgdesc = The Swift programming language and debugger
-	pkgver = 4.1
+	pkgver = 4.1.3
 	pkgrel = 1
 	url = http://swift.org/
 	arch = i686
@@ -27,30 +27,32 @@ pkgbase = swift-language
 	depends = sqlite
 	depends = ncurses
 	depends = libblocksruntime
-	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
+	source = swift-4.1.3-RELEASE.tar.gz::https://github.com/apple/swift/archive/swift-4.1.3-RELEASE.tar.gz
+	source = swift-llvm-4.1.3-RELEASE.tar.gz::https://github.com/apple/swift-llvm/archive/swift-4.1.3-RELEASE.tar.gz
+	source = swift-clang-4.1.3-RELEASE.tar.gz::https://github.com/apple/swift-clang/archive/swift-4.1.3-RELEASE.tar.gz
+	source = swift-lldb-4.1.3-RELEASE.tar.gz::https://github.com/apple/swift-lldb/archive/swift-4.1.3-RELEASE.tar.gz
+	source = swift-cmark-4.1.3-RELEASE.tar.gz::https://github.com/apple/swift-cmark/archive/swift-4.1.3-RELEASE.tar.gz
+	source = swift-llbuild-4.1.3-RELEASE.tar.gz::https://github.com/apple/swift-llbuild/archive/swift-4.1.3-RELEASE.tar.gz
+	source = swift-package-manager-4.1.3-RELEASE.tar.gz::https://github.com/apple/swift-package-manager/archive/swift-4.1.3-RELEASE.tar.gz
+	source = swift-corelibs-xctest-4.1.3-RELEASE.tar.gz::https://github.com/apple/swift-corelibs-xctest/archive/swift-4.1.3-RELEASE.tar.gz
+	source = swift-corelibs-foundation-4.1.3-RELEASE.tar.gz::https://github.com/apple/swift-corelibs-foundation/archive/swift-4.1.3-RELEASE.tar.gz
+	source = swift-corelibs-libdispatch-4.1.3-RELEASE.tar.gz::https://github.com/apple/swift-corelibs-libdispatch/archive/swift-4.1.3-RELEASE.tar.gz
+	source = swift-compiler-rt-4.1.3-RELEASE.tar.gz::https://github.com/apple/swift-compiler-rt/archive/swift-4.1.3-RELEASE.tar.gz
+	source = swift-integration-tests-4.1.3-RELEASE.tar.gz::https://github.com/apple/swift-integration-tests/archive/swift-4.1.3-RELEASE.tar.gz
+	source = 0001-sanitizer-Use-pre-computed-size-of-struct-ustat.patch
+	sha256sums = 3b1b6666744c5d74c8581820d33a4653f241929e8c42e25a7f4354c4a7ae3b00
+	sha256sums = 3d51d1b66c5706deb78e394f2751ea0bb1caa1eaf4fda61bacaaae7eafbb79be
+	sha256sums = 73001677afb29fcac692aa94b1b91ae9c99310df37b84bb00c832da4872617a4
+	sha256sums = a2690836e4e9a767fac9fc172693b2ce58f770c4e0b0dc13ae269618e1f057ef
+	sha256sums = 49a8c9407a0dea12dc5377a79e76f740466b1d69eb31ff6b4979ecf5f515a583
+	sha256sums = 15c5a8efa87343134cef485f07a9999c8d38cfbdf3cc6bc4fec9f479db5cbb1c
+	sha256sums = 7b655c994c092bf88245775e77d4c4d39f6d880cab59b67d2290df02505ed355
+	sha256sums = 9fa49cc67e8d3daef5061a347cbd0ab8ffe30cb05d525341988c517f43b90999
+	sha256sums = ca4b76ebfcd9e9c72e08da6c75e0a6b2350ae0961bd89a85e48839dc35ce51ca
+	sha256sums = d0afe2441574743687c74a0b5b30090f57af0ab436d5e2e6d19c2dd83363a779
+	sha256sums = d0ea7a395137cb488979570deeb63cd767c5da6af63c132f3f8ba623ffc571d3
+	sha256sums = 74fabb7cd667b4cd64d589fb570fc03aa0a3b0c6835afc0692b29d275fbdbccc
+	sha256sums = 5cd08c3a83c71e552fa2fd9ec8b076fbd25ba5450b9ecd59a0c877a9c9407b34
 
 pkgname = swift
 	pkgdesc = The Swift programming language compiler and tools
diff --git a/0001-sanitizer-Use-pre-computed-size-of-struct-ustat.patch b/0001-sanitizer-Use-pre-computed-size-of-struct-ustat.patch
new file mode 100644
index 000000000000..3ed6b3bdb00d
--- /dev/null
+++ b/0001-sanitizer-Use-pre-computed-size-of-struct-ustat.patch
@@ -0,0 +1,60 @@
+From 521935db9de17ad08748fd050137ac83b7734835 Mon Sep 17 00:00:00 2001
+From: Craig Topper <craig.topper@intel.com>
+Date: Thu, 24 May 2018 17:59:47 +0000
+Subject: [PATCH] sanitizer: Use pre-computed size of struct ustat for Linux
+
+<sys/ustat.h> has been removed from glibc 2.28 by:
+
+commit cf2478d53ad7071e84c724a986b56fe17f4f4ca7
+Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
+Date: Sun Mar 18 11:28:59 2018 +0800
+
+Deprecate ustat syscall interface
+This patch uses pre-computed size of struct ustat for Linux to fix
+
+https://bugs.llvm.org/show_bug.cgi?id=37418
+
+Patch by H.J. Lu.
+
+Differential Revision: https://reviews.llvm.org/D47281
+
+git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@333213 91177308-0d34-0410-b5e6-96231b3b80d8
+---
+ lib/sanitizer_common/sanitizer_platform_limits_posix.cc | 15 +++++++++++++--
+ 1 file changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
+index 94b8f3f62..936d81867 100644
+--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
++++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
+@@ -159,7 +159,6 @@ typedef struct user_fpregs elf_fpregset_t;
+ # include <sys/procfs.h>
+ #endif
+ #include <sys/user.h>
+-#include <sys/ustat.h>
+ #include <linux/cyclades.h>
+ #include <linux/if_eql.h>
+ #include <linux/if_plip.h>
+@@ -253,7 +252,19 @@ namespace __sanitizer {
+ #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
+ 
+ #if SANITIZER_LINUX && !SANITIZER_ANDROID
+-  unsigned struct_ustat_sz = sizeof(struct ustat);
++  // Use pre-computed size of struct ustat to avoid <sys/ustat.h> which
++  // has been removed from glibc 2.28.
++#if defined(__aarch64__) || defined(__s390x__) || defined (__mips64) \
++  || defined(__powerpc64__) || defined(__arch64__) || defined(__sparcv9) \
++  || defined(__x86_64__)
++#define SIZEOF_STRUCT_USTAT 32
++#elif defined(__arm__) || defined(__i386__) || defined(__mips__) \
++  || defined(__powerpc__) || defined(__s390__)
++#define SIZEOF_STRUCT_USTAT 20
++#else
++#error Unknown size of struct ustat
++#endif
++  unsigned struct_ustat_sz = SIZEOF_STRUCT_USTAT;
+   unsigned struct_rlimit64_sz = sizeof(struct rlimit64);
+   unsigned struct_statvfs64_sz = sizeof(struct statvfs64);
+ #endif // SANITIZER_LINUX && !SANITIZER_ANDROID
+-- 
+2.16.2
diff --git a/PKGBUILD b/PKGBUILD
index bf17791fdd60..d53875b0fa0d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgbase=swift-language
 pkgname=(swift swift-lldb)
-_swiftver=4.1-RELEASE
+_swiftver=4.1.3-RELEASE
 pkgver=${_swiftver//-RELEASE/}
 pkgrel=1
 pkgdesc="The Swift programming language and debugger"
@@ -27,19 +27,21 @@ 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"
+    "0001-sanitizer-Use-pre-computed-size-of-struct-ustat.patch"
 )
-sha256sums=('f957f107b8e726b80c66a4902b769b0c3795e7bfde1af2e1c833948f6398acdb'
-            'c8632074d178e04abc9ab3becb40618373c1b6f810053e18ddd7ff91dbbc8a48'
-            'e03c4508f714837c54da39a1c45ce78110c47428d970bbdde3ebc12068c15da2'
-            'b246dda82e3e151b5e76944812a83323a61320378e5d34aa87eff67bbf0a224e'
-            '21fc799d557838cc730e8e4e833cee18fea5e5733bdda6212f75c9331b9461ac'
-            '88f2451e8c78a27ea18379b0062eb8e4fc961fca3089b5d485b6ceaeb7f67360'
-            'fcb4f55349143b9e8ad5ba0a5237beaa93a2bc42844ebb3d85c6df8a01e14142'
-            'cbcf4ebc75660f0bc7d3c32f6e4a7909b3616ecbf156ad7134beeb09a890a2dd'
-            '5ec606f2776e2ea1a23a3c0e1ca6844c02ac4f17a9ec8cffa5d85c2970f1dab0'
-            '73e2385be9a61f6168b7e98ab8c2370bc976c43bbe8577a44be371db45368137'
-            '2110384f8cfa97334d4b9a2a17b1966b286189fb3a1526db8f2382c8872df189'
-            '5718fdad339a6b8c0cd671fd4f840288103adb458651a902694a9f89a6c00ac7')
+sha256sums=('3b1b6666744c5d74c8581820d33a4653f241929e8c42e25a7f4354c4a7ae3b00'
+            '3d51d1b66c5706deb78e394f2751ea0bb1caa1eaf4fda61bacaaae7eafbb79be'
+            '73001677afb29fcac692aa94b1b91ae9c99310df37b84bb00c832da4872617a4'
+            'a2690836e4e9a767fac9fc172693b2ce58f770c4e0b0dc13ae269618e1f057ef'
+            '49a8c9407a0dea12dc5377a79e76f740466b1d69eb31ff6b4979ecf5f515a583'
+            '15c5a8efa87343134cef485f07a9999c8d38cfbdf3cc6bc4fec9f479db5cbb1c'
+            '7b655c994c092bf88245775e77d4c4d39f6d880cab59b67d2290df02505ed355'
+            '9fa49cc67e8d3daef5061a347cbd0ab8ffe30cb05d525341988c517f43b90999'
+            'ca4b76ebfcd9e9c72e08da6c75e0a6b2350ae0961bd89a85e48839dc35ce51ca'
+            'd0afe2441574743687c74a0b5b30090f57af0ab436d5e2e6d19c2dd83363a779'
+            'd0ea7a395137cb488979570deeb63cd767c5da6af63c132f3f8ba623ffc571d3'
+            '74fabb7cd667b4cd64d589fb570fc03aa0a3b0c6835afc0692b29d275fbdbccc'
+            '5cd08c3a83c71e552fa2fd9ec8b076fbd25ba5450b9ecd59a0c877a9c9407b34')
 
 prepare() {
     # Use python2 where appropriate
@@ -66,6 +68,9 @@ prepare() {
     done
     ln -sf swift-swift-${_swiftver} swift
     ln -sf swift-package-manager-swift-${_swiftver} swiftpm
+
+    # Backport compiler-rt SVN r333213
+    ( cd compiler-rt && patch -p1 -i "$srcdir/0001-sanitizer-Use-pre-computed-size-of-struct-ustat.patch" )
 }
 
 _common_build_params=(
@@ -79,7 +84,8 @@ _common_build_params=(
 )
 
 _build_script_wrapper() {
-    # Makepkg now adds -fno-plt to C(XX)FLAGS by default, which clang doesn't understand
+    # Makepkg now adds -fno-plt to C(XX)FLAGS by default, which clang-5.0
+    # (built within swift's sources) doesn't understand
     export CFLAGS=$(echo "$CFLAGS" | sed -e 's/\(\W\+\|^\)-fno-plt\b//')
     export CXXFLAGS=$(echo "$CXXFLAGS" | sed -e 's/\(\W\+\|^\)-fno-plt\b//')
 
diff --git a/sourcekit_link_order.patch b/sourcekit_link_order.patch
deleted file mode 100644
index b73df976286d..000000000000
--- a/sourcekit_link_order.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -rupN a/tools/SourceKit/tools/sourcekitd-test/CMakeLists.txt b/tools/SourceKit/tools/sourcekitd-test/CMakeLists.txt
---- a/tools/SourceKit/tools/sourcekitd-test/CMakeLists.txt	2017-04-05 13:13:52.288068101 -0700
-+++ b/tools/SourceKit/tools/sourcekitd-test/CMakeLists.txt	2017-04-06 11:05:37.613626721 -0700
-@@ -15,7 +15,7 @@ endif()
- add_sourcekit_executable(sourcekitd-test
-   sourcekitd-test.cpp
-   TestOptions.cpp
--  DEPENDS ${SOURCEKITD_TEST_DEPEND} SourceKitSupport
-+  DEPENDS SourceKitSupport ${SOURCEKITD_TEST_DEPEND}
-     clangRewrite clangLex clangBasic
-   LLVM_COMPONENT_DEPENDS core support option coverage lto
- )