Snapshot 2016-05-31-a

3 files changed, 36 insertions, 96 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fa5877ce47df..a575a96ec41c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Fri May 27 18:01:18 UTC 2016
+# Wed Jun  1 17:32:02 UTC 2016
 pkgbase = swift-development
 	pkgdesc = The Swift programming language and debugger - latest development snapshot
-	pkgver = DEVELOPMENT.SNAPSHOT.2016.05.09.a
-	pkgrel = 3
+	pkgver = DEVELOPMENT.SNAPSHOT.2016.05.31.a
+	pkgrel = 1
 	url = http://swift.org/
 	arch = i686
 	arch = x86_64
@@ -23,30 +23,28 @@ pkgbase = swift-development
 	depends = libxml2
 	depends = sqlite
 	depends = ncurses
-	source = swift-DEVELOPMENT-SNAPSHOT-2016-05-09-a.tar.gz::https://github.com/apple/swift/archive/swift-DEVELOPMENT-SNAPSHOT-2016-05-09-a.tar.gz
-	source = swift-llvm-DEVELOPMENT-SNAPSHOT-2016-05-09-a.tar.gz::https://github.com/apple/swift-llvm/archive/swift-DEVELOPMENT-SNAPSHOT-2016-05-09-a.tar.gz
-	source = swift-clang-DEVELOPMENT-SNAPSHOT-2016-05-09-a.tar.gz::https://github.com/apple/swift-clang/archive/swift-DEVELOPMENT-SNAPSHOT-2016-05-09-a.tar.gz
-	source = swift-lldb-DEVELOPMENT-SNAPSHOT-2016-05-09-a.tar.gz::https://github.com/apple/swift-lldb/archive/swift-DEVELOPMENT-SNAPSHOT-2016-05-09-a.tar.gz
-	source = swift-cmark-DEVELOPMENT-SNAPSHOT-2016-05-09-a.tar.gz::https://github.com/apple/swift-cmark/archive/swift-DEVELOPMENT-SNAPSHOT-2016-05-09-a.tar.gz
-	source = swift-llbuild-DEVELOPMENT-SNAPSHOT-2016-05-09-a.tar.gz::https://github.com/apple/swift-llbuild/archive/swift-DEVELOPMENT-SNAPSHOT-2016-05-09-a.tar.gz
-	source = swift-package-manager-DEVELOPMENT-SNAPSHOT-2016-05-09-a.tar.gz::https://github.com/apple/swift-package-manager/archive/swift-DEVELOPMENT-SNAPSHOT-2016-05-09-a.tar.gz
-	source = swift-corelibs-xctest-DEVELOPMENT-SNAPSHOT-2016-05-09-a.tar.gz::https://github.com/apple/swift-corelibs-xctest/archive/swift-DEVELOPMENT-SNAPSHOT-2016-05-09-a.tar.gz
-	source = swift-corelibs-foundation-DEVELOPMENT-SNAPSHOT-2016-05-09-a.tar.gz::https://github.com/apple/swift-corelibs-foundation/archive/swift-DEVELOPMENT-SNAPSHOT-2016-05-09-a.tar.gz
-	source = swift-integration-tests-DEVELOPMENT-SNAPSHOT-2016-05-09-a.tar.gz::https://github.com/apple/swift-integration-tests/archive/swift-DEVELOPMENT-SNAPSHOT-2016-05-09-a.tar.gz
+	source = swift-DEVELOPMENT-SNAPSHOT-2016-05-31-a.tar.gz::https://github.com/apple/swift/archive/swift-DEVELOPMENT-SNAPSHOT-2016-05-31-a.tar.gz
+	source = swift-llvm-DEVELOPMENT-SNAPSHOT-2016-05-31-a.tar.gz::https://github.com/apple/swift-llvm/archive/swift-DEVELOPMENT-SNAPSHOT-2016-05-31-a.tar.gz
+	source = swift-clang-DEVELOPMENT-SNAPSHOT-2016-05-31-a.tar.gz::https://github.com/apple/swift-clang/archive/swift-DEVELOPMENT-SNAPSHOT-2016-05-31-a.tar.gz
+	source = swift-lldb-DEVELOPMENT-SNAPSHOT-2016-05-31-a.tar.gz::https://github.com/apple/swift-lldb/archive/swift-DEVELOPMENT-SNAPSHOT-2016-05-31-a.tar.gz
+	source = swift-cmark-DEVELOPMENT-SNAPSHOT-2016-05-31-a.tar.gz::https://github.com/apple/swift-cmark/archive/swift-DEVELOPMENT-SNAPSHOT-2016-05-31-a.tar.gz
+	source = swift-llbuild-DEVELOPMENT-SNAPSHOT-2016-05-31-a.tar.gz::https://github.com/apple/swift-llbuild/archive/swift-DEVELOPMENT-SNAPSHOT-2016-05-31-a.tar.gz
+	source = swift-package-manager-DEVELOPMENT-SNAPSHOT-2016-05-31-a.tar.gz::https://github.com/apple/swift-package-manager/archive/swift-DEVELOPMENT-SNAPSHOT-2016-05-31-a.tar.gz
+	source = swift-corelibs-xctest-DEVELOPMENT-SNAPSHOT-2016-05-31-a.tar.gz::https://github.com/apple/swift-corelibs-xctest/archive/swift-DEVELOPMENT-SNAPSHOT-2016-05-31-a.tar.gz
+	source = swift-corelibs-foundation-DEVELOPMENT-SNAPSHOT-2016-05-31-a.tar.gz::https://github.com/apple/swift-corelibs-foundation/archive/swift-DEVELOPMENT-SNAPSHOT-2016-05-31-a.tar.gz
+	source = swift-integration-tests-DEVELOPMENT-SNAPSHOT-2016-05-31-a.tar.gz::https://github.com/apple/swift-integration-tests/archive/swift-DEVELOPMENT-SNAPSHOT-2016-05-31-a.tar.gz
 	source = swift-no-docs.patch
-	source = require-gold-on-linux.patch
-	sha256sums = 76584f8b0ba85cfbd5264228d975f565b584e424bed11fc9ab3115130125ffec
-	sha256sums = 9230cb83a975dc0d904d517fb9640f902f5a25dfa9779438b3bd123cfd77e572
-	sha256sums = 3cdb6e1cfc3bf774c1b7e42d775d175964db41706c391e05d9a7cfd6d0d30bf3
-	sha256sums = d5197ab94d04937ed1f11ec5961581cfbea5e0edfb3daf016f8b9be49c598964
-	sha256sums = 36abce14a1961c63cf9939a7351f5cf99945a27cbfbdd4a4e7ebaa2f7dd3a0a9
-	sha256sums = d429138ee4fa50e9675e9dde5c9fce5b150da07c80d5e10f8da1023593b74430
-	sha256sums = 9b938f6ba8515a856b9e29fe734b82e18f8d530fe3c1ee787f856ac88b933387
-	sha256sums = 028bdcae6dd7adf0b4889518fd6adc8a1457da6f3f0bbdaa679407dabaa64dd6
-	sha256sums = f42133f61c2920e1a5dfa7839562d86b632948d38cca548729f85b67bf833ddc
-	sha256sums = f8a60c6d16bea5881705947bb4350d2306c090d7c08c55b63bddc4baf6d2995d
+	sha256sums = 80729b4288ebb36610024ecd52df1b00427b358309a0607432decfea2f1905f0
+	sha256sums = 22a9640ec711c75586017aaaa6d95f99c9a37105f4ac79a786fcfd634d71ef4b
+	sha256sums = 7dcb9dd52c4748535912a964de37f43d624197ce52f193e3c5e622fc33f1b223
+	sha256sums = 6fc979d88cedbc0017a149bf038abb4c7de50d153892ada67a565a69d8794eeb
+	sha256sums = ca8f9a8d5780417e31b26eb12eaceb0b23107839129ed3804cc25c73f32ecbad
+	sha256sums = 3536c0d62d6c941fdbdad5aa747d316a3756f2f39876924d6d8a06d771b27f60
+	sha256sums = 6d23140504fa944480f06274a8094918bf8e49758b4585562b023e1fcd4d618b
+	sha256sums = af64e2dbe1228bb9bdbe7d0c1fa37e0d4eee50008a759fd87f18aad292f8e5fa
+	sha256sums = bcd8c1ee304b5142d1c0c0f249ad92be4d6bb5ac38aca8bbc01a1dfe26bcafde
+	sha256sums = 3b211bd3708af55e9909b210d7f426c9c9307798020809beab72e657cd36a00d
 	sha256sums = 1a8663c48a1a203d1825ae62a7e4191e4980a2dad461d4d88152221ad9e2171d
-	sha256sums = 1eccfbef3cc62567219857c23de87d67da1ff059ebd835caab7cabaf5c80487b
 
 pkgname = swift-development
 	pkgdesc = The Swift programming language compiler and tools - development snapshot
diff --git a/PKGBUILD b/PKGBUILD
index 979e25dd1327..52ddb153a14f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 pkgbase=swift-development
 pkgname=(swift-development swift-lldb-development)
-_swiftver=DEVELOPMENT-SNAPSHOT-2016-05-09-a
+_swiftver=DEVELOPMENT-SNAPSHOT-2016-05-31-a
 pkgver=${_swiftver//-/.}
-pkgrel=3
+pkgrel=1
 pkgdesc="The Swift programming language and debugger - latest development snapshot"
 arch=('i686' 'x86_64')
 url="http://swift.org/"
@@ -22,20 +22,18 @@ source=(
     "swift-corelibs-foundation-${_swiftver}.tar.gz::https://github.com/apple/swift-corelibs-foundation/archive/swift-${_swiftver}.tar.gz"
     "swift-integration-tests-${_swiftver}.tar.gz::https://github.com/apple/swift-integration-tests/archive/swift-${_swiftver}.tar.gz"
     "swift-no-docs.patch"
-    "require-gold-on-linux.patch"
 )
-sha256sums=('76584f8b0ba85cfbd5264228d975f565b584e424bed11fc9ab3115130125ffec'
-            '9230cb83a975dc0d904d517fb9640f902f5a25dfa9779438b3bd123cfd77e572'
-            '3cdb6e1cfc3bf774c1b7e42d775d175964db41706c391e05d9a7cfd6d0d30bf3'
-            'd5197ab94d04937ed1f11ec5961581cfbea5e0edfb3daf016f8b9be49c598964'
-            '36abce14a1961c63cf9939a7351f5cf99945a27cbfbdd4a4e7ebaa2f7dd3a0a9'
-            'd429138ee4fa50e9675e9dde5c9fce5b150da07c80d5e10f8da1023593b74430'
-            '9b938f6ba8515a856b9e29fe734b82e18f8d530fe3c1ee787f856ac88b933387'
-            '028bdcae6dd7adf0b4889518fd6adc8a1457da6f3f0bbdaa679407dabaa64dd6'
-            'f42133f61c2920e1a5dfa7839562d86b632948d38cca548729f85b67bf833ddc'
-            'f8a60c6d16bea5881705947bb4350d2306c090d7c08c55b63bddc4baf6d2995d'
-            '1a8663c48a1a203d1825ae62a7e4191e4980a2dad461d4d88152221ad9e2171d'
-            '1eccfbef3cc62567219857c23de87d67da1ff059ebd835caab7cabaf5c80487b')
+sha256sums=('80729b4288ebb36610024ecd52df1b00427b358309a0607432decfea2f1905f0'
+            '22a9640ec711c75586017aaaa6d95f99c9a37105f4ac79a786fcfd634d71ef4b'
+            '7dcb9dd52c4748535912a964de37f43d624197ce52f193e3c5e622fc33f1b223'
+            '6fc979d88cedbc0017a149bf038abb4c7de50d153892ada67a565a69d8794eeb'
+            'ca8f9a8d5780417e31b26eb12eaceb0b23107839129ed3804cc25c73f32ecbad'
+            '3536c0d62d6c941fdbdad5aa747d316a3756f2f39876924d6d8a06d771b27f60'
+            '6d23140504fa944480f06274a8094918bf8e49758b4585562b023e1fcd4d618b'
+            'af64e2dbe1228bb9bdbe7d0c1fa37e0d4eee50008a759fd87f18aad292f8e5fa'
+            'bcd8c1ee304b5142d1c0c0f249ad92be4d6bb5ac38aca8bbc01a1dfe26bcafde'
+            '3b211bd3708af55e9909b210d7f426c9c9307798020809beab72e657cd36a00d'
+            '1a8663c48a1a203d1825ae62a7e4191e4980a2dad461d4d88152221ad9e2171d')
 
 prepare() {
     # Use python2 where appropriate
@@ -67,10 +65,6 @@ prepare() {
     # Sphinx 1.3.5 raises a warning (promoted to error) when using an unknown
     # syntax highlighting language (like "swift").
     ( cd "${srcdir}/swift" && patch -p1 -i "${srcdir}/swift-no-docs.patch" )
-
-    # Backport: Use gold linker to avoid binutils issues
-    # (See https://bugs.swift.org/projects/SR/issues/SR-1023)
-    ( cd "${srcdir}/swift" && patch -p1 -i "${srcdir}/require-gold-on-linux.patch" )
 }
 
 build() {
diff --git a/require-gold-on-linux.patch b/require-gold-on-linux.patch
deleted file mode 100644
index 6c77b2720a13..000000000000
--- a/require-gold-on-linux.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 3b7b0d80919997ead4c9bb6d681c5739e22d34cc Mon Sep 17 00:00:00 2001
-From: Saleem Abdulrasool <compnerd@compnerd.org>
-Date: Thu, 19 May 2016 17:59:03 -0700
-Subject: [PATCH] utils: require gold on Linux targets
-
-Given the discussion on swift-dev, and no opposition, swift the linux targets to
-using gold by default.
----
- lib/Driver/ToolChains.cpp | 5 +++++
- utils/build-script-impl   | 3 +++
- 2 files changed, 8 insertions(+)
-
-diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp
-index 42e1e2c..c9147ec 100644
---- a/lib/Driver/ToolChains.cpp
-+++ b/lib/Driver/ToolChains.cpp
-@@ -1218,6 +1218,11 @@ std::string toolchains::GenericUnix::getDefaultLinker() const {
-     // final executables, as such, unless specified, we default to gold
-     // linker.
-     return "gold";
-+  case llvm::Triple::x86_64:
-+  case llvm::Triple::ppc64:
-+  case llvm::Triple::ppc64le:
-+    // BFD linker has issues wrt relocations against protected symbols.
-+    return "gold";
-   default:
-     // Otherwise, use the default BFD linker.
-     return "";
-diff --git a/utils/build-script-impl b/utils/build-script-impl
-index 87c68a5..0c3a38b 100755
---- a/utils/build-script-impl
-+++ b/utils/build-script-impl
-@@ -325,6 +325,7 @@ function set_deployment_target_based_options() {
- 
-     case ${deployment_target} in
-         linux-x86_64)
-+            USE_GOLD_LINKER=1
-             SWIFT_HOST_VARIANT_ARCH="x86_64"
-             ;;
-         linux-armv6)
-@@ -346,9 +347,11 @@ function set_deployment_target_based_options() {
-             SWIFT_HOST_VARIANT_ARCH="x86_64"
-             ;;
-         linux-powerpc64)
-+            USE_GOLD_LINKER=1
-             SWIFT_HOST_VARIANT_ARCH="powerpc64"
-             ;;
-         linux-powerpc64le)
-+            USE_GOLD_LINKER=1
-             SWIFT_HOST_VARIANT_ARCH="powerpc64le"
-             ;;
-         cygwin-x86_64)