---

yaml
---
r: 348013
b: refs/heads/master
c: 6a94950
h: refs/heads/master
i:
  348011: 6071ff2

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: dbf353eeb2ce2fc7a2060c3454fb9fb9e7f17c77
+refs/heads/master: 6a94950214f9a3e6cc05d1bae7efba77586f9456
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/cmake/modules/AddSwift.cmake

@@ -465,6 +465,10 @@ function(_add_variant_link_flags)
       set(android_libcxx_path "${SWIFT_ANDROID_NDK_PATH}/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a")
     elseif("${LFLAGS_ARCH}" MATCHES aarch64)
       set(android_libcxx_path "${SWIFT_ANDROID_NDK_PATH}/sources/cxx-stl/llvm-libc++/libs/arm64-v8a")
+    elseif("${LFLAGS_ARCH}" MATCHES i686)
+      set(android_libcxx_path "${SWIFT_ANDROID_NDK_PATH}/sources/cxx-stl/llvm-libc++/libs/x86")
+    elseif("${LFLAGS_ARCH}" MATCHES x86_64)
+      set(android_libcxx_path "${SWIFT_ANDROID_NDK_PATH}/sources/cxx-stl/llvm-libc++/libs/x86_64")
     else()
       message(SEND_ERROR "unknown architecture (${LFLAGS_ARCH}) for android")
     endif()

trunk/cmake/modules/SwiftAndroidSupport.cmake

@@ -23,6 +23,10 @@ function(swift_android_lib_for_arch arch var)
     list(APPEND paths "${_prebuilt}/${_host}/lib/armv7-a")
   elseif(arch STREQUAL aarch64)
     list(APPEND paths "${_prebuilt}/${_host}/lib64")
+  elseif(arch STREQUAL i686)
+    list(APPEND paths "${_prebuilt}/${_host}/lib")
+  elseif(arch STREQUAL x86_64)
+    list(APPEND paths "${_prebuilt}/${_host}/lib64")
   else()
     message(SEND_ERROR "unknown architecture (${arch}) for android")
   endif()

trunk/cmake/modules/SwiftConfigureSDK.cmake

@@ -186,6 +186,16 @@ macro(configure_sdk_unix name architectures)
         set(SWIFT_SDK_ANDROID_ARCH_${arch}_ALT_SPELLING "aarch64")
         set(SWIFT_SDK_ANDROID_ARCH_${arch}_PATH "${SWIFT_ANDROID_NDK_PATH}/platforms/android-${SWIFT_ANDROID_API_LEVEL}/arch-arm64")
         set(SWIFT_SDK_ANDROID_ARCH_${arch}_TRIPLE "aarch64-unknown-linux-android")
+      elseif("${arch}" STREQUAL "i686")
+        set(SWIFT_SDK_ANDROID_ARCH_${arch}_NDK_TRIPLE "i686-linux-android")
+        set(SWIFT_SDK_ANDROID_ARCH_${arch}_ALT_SPELLING "i686")
+        set(SWIFT_SDK_ANDROID_ARCH_${arch}_PATH "${SWIFT_ANDROID_NDK_PATH}/platforms/android-${SWIFT_ANDROID_API_LEVEL}/arch-x86")
+        set(SWIFT_SDK_ANDROID_ARCH_${arch}_TRIPLE "i686-unknown-linux-android")
+      elseif("${arch}" STREQUAL "x86_64")
+        set(SWIFT_SDK_ANDROID_ARCH_${arch}_NDK_TRIPLE "x86_64-linux-android")
+        set(SWIFT_SDK_ANDROID_ARCH_${arch}_ALT_SPELLING "x86_64")
+        set(SWIFT_SDK_ANDROID_ARCH_${arch}_PATH "${SWIFT_ANDROID_NDK_PATH}/platforms/android-${SWIFT_ANDROID_API_LEVEL}/arch-x86_64")
+        set(SWIFT_SDK_ANDROID_ARCH_${arch}_TRIPLE "x86_64-unknown-linux-android")
       else()
         message(FATAL_ERROR "unknown arch for android SDK: ${arch}")
       endif()
@@ -196,8 +206,16 @@ macro(configure_sdk_unix name architectures)
       elseif("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Linux")
         set(_swift_android_prebuilt_build "linux-x86_64")
       endif()
-      set(SWIFT_SDK_ANDROID_ARCH_${arch}_NDK_PREBUILT_PATH
+      if("${arch}" STREQUAL "i686")
+        set(SWIFT_SDK_ANDROID_ARCH_${arch}_NDK_PREBUILT_PATH
+          "${SWIFT_ANDROID_NDK_PATH}/toolchains/x86-${SWIFT_ANDROID_NDK_GCC_VERSION}/prebuilt/${_swift_android_prebuilt_build}")
+      elseif("${arch}" STREQUAL "x86_64")
+        set(SWIFT_SDK_ANDROID_ARCH_${arch}_NDK_PREBUILT_PATH
+          "${SWIFT_ANDROID_NDK_PATH}/toolchains/x86_64-${SWIFT_ANDROID_NDK_GCC_VERSION}/prebuilt/${_swift_android_prebuilt_build}")
+      else()
+        set(SWIFT_SDK_ANDROID_ARCH_${arch}_NDK_PREBUILT_PATH
           "${SWIFT_ANDROID_NDK_PATH}/toolchains/${SWIFT_SDK_ANDROID_ARCH_${arch}_NDK_TRIPLE}-${SWIFT_ANDROID_NDK_GCC_VERSION}/prebuilt/${_swift_android_prebuilt_build}")
+      endif()
     else()
       if(NOT SWIFT_SDK_${prefix}_ARCH_${arch}_PATH)
         set(SWIFT_SDK_${prefix}_ARCH_${arch}_PATH "/")

trunk/test/lit.cfg

@@ -1338,12 +1338,13 @@ rth_flags = ''
 if swift_execution_tests_extra_flags:
     rth_flags = swift_execution_tests_extra_flags + ' -wmo'
 
+# FIXME: why can we not use %rth and have that be expanded out?
 config.target_resilience_test = (
-     '%s --target-build-swift "%s" --target-run "%s" --t %%t --S %%S --s %%s '
-     '--lib-prefix "%s" --lib-suffix "%s" --target-codesign "%s" '
+     '%r %s --target-build-swift "%s" --target-run "%s" --t %%t --S %%S '
+     '--s %%s --lib-prefix "%s" --lib-suffix "%s" --target-codesign "%s" '
      '--additional-compile-flags "%s" --triple "%s"'
-     % (config.rth, config.target_build_swift, config.target_run,
-        config.target_shared_library_prefix,
+     % (sys.executable, config.rth, config.target_build_swift,
+        config.target_run, config.target_shared_library_prefix,
         config.target_shared_library_suffix, config.target_codesign,
         rth_flags, config.variant_triple))
 
@@ -1490,8 +1491,9 @@ config.substitutions.append(('%round-trip-syntax-test',
                                         config.round_trip_syntax_test)))
 config.substitutions.append(('%rth', '%r %s' % (sys.executable, config.rth)))
 config.substitutions.append(('%scale-test',
-                             '{} --swiftc-binary={} --tmpdir=%t'.format(
-                                 config.scale_test, config.swiftc)))
+                             '{} {} --swiftc-binary={} --tmpdir=%t'.format(
+                                 sys.executable, config.scale_test,
+                                 config.swiftc)))
 config.substitutions.append(('%empty-directory\(([^)]+)\)',
                              SubstituteCaptures(r'rm -rf "\1" && mkdir -p "\1"')))