Merge remote-tracking branch 'upstream/master' into a-couple-of-tangents

Author: hamishknight

CMakeLists.txt

@@ -223,6 +223,17 @@ option(SWIFT_STDLIB_ENABLE_SIB_TARGETS
        "Should we generate sib targets for the stdlib or not?"
        FALSE)
 
+
+set(SWIFT_DARWIN_SUPPORTED_ARCHS "" CACHE STRING
+  "Semicolon-separated list of architectures to configure on Darwin platforms. \
+If left empty all default architectures are configured.")
+
+set(SWIFT_DARWIN_MODULE_ARCHS "" CACHE STRING
+  "Semicolon-separated list of architectures to configure Swift module-only \
+targets on Darwin platforms. These targets are in addition to the full \
+library targets.")
+
+
 #
 # User-configurable Android specific options.
 #

README.md

@@ -76,7 +76,7 @@ Please make sure you use Python 2.x. Python 3.x is not supported currently.
 
 #### macOS
 
-To build for macOS, you need [Xcode 10.2 beta](https://developer.apple.com/xcode/downloads/).
+To build for macOS, you need [Xcode 11 beta](https://developer.apple.com/xcode/downloads/).
 The required version of Xcode changes frequently, and is often a beta release.
 Check this document or the host information on <https://ci.swift.org> for the
 current required version.
@@ -141,26 +141,26 @@ more environments.
 
 To build using Ninja, run:
 
-    utils/build-script --release-debuginfo
+    swift/utils/build-script --release-debuginfo
 
 When developing Swift, it helps to build what you're working on in a debug
 configuration while building the rest of the project with optimizations. Below
 are some examples of using debug variants:
 
-    utils/build-script --release-debuginfo --debug-swift # Swift frontend built in debug
-    utils/build-script --release-debuginfo --debug-swift-stdlib # Standard library built in debug
-    utils/build-script --release-debuginfo --debug-swift --force-optimized-typechecker # Swift frontend sans type checker built in debug
+    swift/utils/build-script --release-debuginfo --debug-swift # Swift frontend built in debug
+    swift/utils/build-script --release-debuginfo --debug-swift-stdlib # Standard library built in debug
+    swift/utils/build-script --release-debuginfo --debug-swift --force-optimized-typechecker # Swift frontend sans type checker built in debug
 
 Limiting the amount of debug code in the compiler has a very large impact on
 Swift compile times, and in turn the test execution time. If you want to build
 the entire project in debug, you can run:
 
-    utils/build-script --debug
+    swift/utils/build-script --debug
 
 For documentation of all available arguments, as well as additional usage
 information, see the inline help:
 
-    utils/build-script -h
+    swift/utils/build-script -h
 
 #### Xcode
 
@@ -223,7 +223,7 @@ script is used by swift.org's CI to produce snapshots and can allow for one to
 locally reproduce such builds for development or distribution purposes. E.x.:
 
 ```
-  $ ./utils/build-toolchain $BUNDLE_PREFIX
+  $ ./swift/utils/build-toolchain $BUNDLE_PREFIX
 ```
 
 where ``$BUNDLE_PREFIX`` is a string that will be prepended to the build 

apinotes/Accelerate.apinotes

@@ -1,7 +1,5 @@
 set(sources
-  Accelerate.apinotes
   Dispatch.apinotes
-  ScriptingBridge.apinotes
   os.apinotes
 )
 

apinotes/CMakeLists.txt

@@ -63,7 +63,7 @@ public func run_RandomIntegersLCG(_ N: Int) {
     for _ in 0 ..< 100_000 {
       x &+= Int64.random(in: 0...10_000, using: &generator)
     }
-    CheckResults(x == 498214315)
+    blackHole(x)
   }
 }