|
| 1 | +diff --git a/swift/test/ClangImporter/pcm-emit-direct-cc1-mode.swift b/swift/test/ClangImporter/pcm-emit-direct-cc1-mode.swift |
| 2 | +index f5048b9e3d5..6bc26ca3177 100644 |
| 3 | +--- a/swift/test/ClangImporter/pcm-emit-direct-cc1-mode.swift |
| 4 | ++++ b/swift/test/ClangImporter/pcm-emit-direct-cc1-mode.swift |
| 5 | +@@ -15,5 +15,7 @@ |
| 6 | + // CHECK-CLANG-SAME: '-fmodules' |
| 7 | + // CHECK-CLANG-NOT: clang importer driver args |
| 8 | + |
| 9 | ++// XFAIL: OS=linux-androideabi |
| 10 | ++ |
| 11 | + import script |
| 12 | + var _ : ScriptTy |
| 13 | +diff --git a/swift/test/IRGen/abitypes_arm.swift b/swift/test/IRGen/abitypes_arm.swift |
| 14 | +index 9428294483d..52bd8b10145 100644 |
| 15 | +--- a/swift/test/IRGen/abitypes_arm.swift |
| 16 | ++++ b/swift/test/IRGen/abitypes_arm.swift |
| 17 | +@@ -11,6 +11,6 @@ class Foo { |
| 18 | + } |
| 19 | + } |
| 20 | + |
| 21 | +-// armv7: define internal void @makeOne(ptr noalias sret({{.*}}) align 4 %agg.result, float{{( noundef)?}} %f, float{{( noundef)?}} %s) |
| 22 | ++// armv7: define internal void @makeOne(ptr{{( dead_on_unwind)?}} noalias{{( writable)?}} sret({{.*}}) align 4 %agg.result, float{{( noundef)?}} %f, float{{( noundef)?}} %s) |
| 23 | + // armv7s: define internal void @makeOne(ptr noalias sret({{.*}}) align 4 %agg.result, float %f, float %s) |
| 24 | + // armv7k: define internal %struct.One @makeOne(float {{.*}}%f, float {{.*}}%s) |
| 25 | +diff --git a/swift/test/Interop/Cxx/class/constructors-copy-module-interface.swift b/swift/test/Interop/Cxx/class/constructors-copy-module-interface.swift |
| 26 | +index 042c10e7d1d..254f6543b58 100644 |
| 27 | +--- a/swift/test/Interop/Cxx/class/constructors-copy-module-interface.swift |
| 28 | ++++ b/swift/test/Interop/Cxx/class/constructors-copy-module-interface.swift |
| 29 | +@@ -1,4 +1,5 @@ |
| 30 | + // RUN: %target-swift-ide-test -print-module -module-to-print=Constructors -I %S/Inputs -source-filename=x -enable-experimental-cxx-interop | %FileCheck %s |
| 31 | ++// XFAIL: OS=linux-androideabi |
| 32 | + |
| 33 | + // CHECK: struct TemplatedCopyConstructor |
| 34 | + // CHECK: struct TemplatedCopyConstructorWithExtraArg |
| 35 | +diff --git a/swift/test/Interop/Cxx/class/constructors-diagnostics.swift b/swift/test/Interop/Cxx/class/constructors-diagnostics.swift |
| 36 | +index aac01480660..8fa99fae7fb 100644 |
| 37 | +--- a/swift/test/Interop/Cxx/class/constructors-diagnostics.swift |
| 38 | ++++ b/swift/test/Interop/Cxx/class/constructors-diagnostics.swift |
| 39 | +@@ -2,6 +2,7 @@ |
| 40 | + |
| 41 | + // This test uses -verify-additional-file, which do not work well on Windows. |
| 42 | + // UNSUPPORTED: OS=windows-msvc |
| 43 | ++// XFAIL: OS=linux-androideabi |
| 44 | + |
| 45 | + import Constructors |
| 46 | + |
| 47 | +diff --git a/swift/test/Interop/Cxx/class/constructors-module-interface.swift b/swift/test/Interop/Cxx/class/constructors-module-interface.swift |
| 48 | +index bf189b6e302..d2c3d65f03e 100644 |
| 49 | +--- a/swift/test/Interop/Cxx/class/constructors-module-interface.swift |
| 50 | ++++ b/swift/test/Interop/Cxx/class/constructors-module-interface.swift |
| 51 | +@@ -1,4 +1,5 @@ |
| 52 | + // RUN: %target-swift-ide-test -print-module -module-to-print=Constructors -I %S/Inputs/ -source-filename=x -enable-experimental-cxx-interop | %FileCheck %s |
| 53 | ++// XFAIL: OS=linux-androideabi |
| 54 | + |
| 55 | + // CHECK: struct ExplicitDefaultConstructor { |
| 56 | + // CHECK-NEXT: init() |
| 57 | +diff --git a/swift/test/Interop/Cxx/class/constructors-silgen.swift b/swift/test/Interop/Cxx/class/constructors-silgen.swift |
| 58 | +index b1624ccccfe..79cbdf170de 100644 |
| 59 | +--- a/swift/test/Interop/Cxx/class/constructors-silgen.swift |
| 60 | ++++ b/swift/test/Interop/Cxx/class/constructors-silgen.swift |
| 61 | +@@ -1,4 +1,5 @@ |
| 62 | + // RUN: %target-swiftxx-frontend -I %S/Inputs -Xllvm -sil-print-types -emit-silgen %s | %FileCheck %s |
| 63 | ++// XFAIL: OS=linux-androideabi |
| 64 | + |
| 65 | + import Constructors |
| 66 | + |
| 67 | +diff --git a/swift/test/Interop/Cxx/class/constructors-typechecker.swift b/swift/test/Interop/Cxx/class/constructors-typechecker.swift |
| 68 | +index 8ce10b1ca75..52ff4104b83 100644 |
| 69 | +--- a/swift/test/Interop/Cxx/class/constructors-typechecker.swift |
| 70 | ++++ b/swift/test/Interop/Cxx/class/constructors-typechecker.swift |
| 71 | +@@ -1,4 +1,5 @@ |
| 72 | + // RUN: %target-typecheck-verify-swift -verify-ignore-unknown -I %S/Inputs -enable-experimental-cxx-interop |
| 73 | ++// XFAIL: OS=linux-androideabi |
| 74 | + |
| 75 | + import Constructors |
| 76 | + |
| 77 | +diff --git a/swift/test/Interop/Cxx/class/custom-new-operator-irgen.swift b/swift/test/Interop/Cxx/class/custom-new-operator-irgen.swift |
| 78 | +index 74e692c9db2..0423493afac 100644 |
| 79 | +--- a/swift/test/Interop/Cxx/class/custom-new-operator-irgen.swift |
| 80 | ++++ b/swift/test/Interop/Cxx/class/custom-new-operator-irgen.swift |
| 81 | +@@ -5,4 +5,4 @@ import CustomNewOperator |
| 82 | + var x = callsCustomNew() |
| 83 | + |
| 84 | + // Make sure the definition of `operator new` is emitted. |
| 85 | +-// CHECK: define {{.*}} @{{_ZnwmPv15container_new_t|"\?\?2@YAPEAX_KPEAXUcontainer_new_t@@@Z"}} |
| 86 | ++// CHECK: define {{.*}} @{{_Znw(j|m)Pv15container_new_t|"\?\?2@YAPEAX_KPEAXUcontainer_new_t@@@Z"}} |
| 87 | +diff --git a/swift/test/Reflection/conformance_descriptors.swift b/swift/test/Reflection/conformance_descriptors.swift |
| 88 | +index b114f764552..e1bd98c08f4 100644 |
| 89 | +--- a/swift/test/Reflection/conformance_descriptors.swift |
| 90 | ++++ b/swift/test/Reflection/conformance_descriptors.swift |
| 91 | +@@ -5,6 +5,7 @@ |
| 92 | + // |
| 93 | + // Temporarily disable on AArch64 Linux (rdar://88451721) |
| 94 | + // UNSUPPORTED: OS=linux-gnu && CPU=aarch64 |
| 95 | ++// XFAIL: OS=linux-android |
| 96 | + |
| 97 | + // rdar://100558042 |
| 98 | + // UNSUPPORTED: CPU=arm64e |
| 99 | +diff --git a/swift/test/Reflection/typeref_decoding.swift b/swift/test/Reflection/typeref_decoding.swift |
| 100 | +index e0a3b4465a3..c01af893eda 100644 |
| 101 | +--- a/swift/test/Reflection/typeref_decoding.swift |
| 102 | ++++ b/swift/test/Reflection/typeref_decoding.swift |
| 103 | +@@ -10,6 +10,7 @@ |
| 104 | + |
| 105 | + // FIXME: rdar://127796117 |
| 106 | + // UNSUPPORTED: OS=linux-gnu && CPU=aarch64 |
| 107 | ++// XFAIL: OS=linux-android |
| 108 | + |
| 109 | + // RUN: %target-build-swift -target %target-swift-5.2-abi-triple -Xfrontend -enable-anonymous-context-mangled-names %S/Inputs/ConcreteTypes.swift %S/Inputs/GenericTypes.swift %S/Inputs/Protocols.swift %S/Inputs/Extensions.swift %S/Inputs/Closures.swift -parse-as-library -emit-module -emit-library %no-fixup-chains -module-name TypesToReflect -o %t/%target-library-name(TypesToReflect) |
| 110 | + // RUN: %target-build-swift -target %target-swift-5.2-abi-triple -Xfrontend -enable-anonymous-context-mangled-names %S/Inputs/ConcreteTypes.swift %S/Inputs/GenericTypes.swift %S/Inputs/Protocols.swift %S/Inputs/Extensions.swift %S/Inputs/Closures.swift %S/Inputs/main.swift -emit-module -emit-executable %no-fixup-chains -module-name TypesToReflect -o %t/TypesToReflect |
| 111 | +diff --git a/swift/test/SILOptimizer/package-cmo-serialize-tables.swift b/swift/test/SILOptimizer/package-cmo-serialize-tables.swift |
| 112 | +index 382ff2e8080..f061374b2a1 100644 |
| 113 | +--- a/swift/test/SILOptimizer/package-cmo-serialize-tables.swift |
| 114 | ++++ b/swift/test/SILOptimizer/package-cmo-serialize-tables.swift |
| 115 | +@@ -19,7 +19,7 @@ |
| 116 | + |
| 117 | + // Temporarily disabling on watchOS (both arm64_32 & armv7k): |
| 118 | + // rdar://140330692 (🟠 OSS Swift CI: oss-swift_tools-RA_stdlib-DA_test-device-non_executable failed... |
| 119 | +-// UNSUPPORTED: OS=watchos |
| 120 | ++// UNSUPPORTED: OS=watchos, OS=linux-androideabi |
| 121 | + |
| 122 | + //--- main.swift |
| 123 | + |
| 124 | +diff --git a/swift/test/SILOptimizer/throws_prediction.swift b/swift/test/SILOptimizer/throws_prediction.swift |
| 125 | +index f7f2664b2de..01d36e127c6 100644 |
| 126 | +--- a/swift/test/SILOptimizer/throws_prediction.swift |
| 127 | ++++ b/swift/test/SILOptimizer/throws_prediction.swift |
| 128 | +@@ -16,7 +16,7 @@ |
| 129 | + // RUN: -sil-verify-all -module-name=test -emit-sil \ |
| 130 | + // RUN: | %FileCheck --check-prefix CHECK-DISABLED %s |
| 131 | + |
| 132 | +-// UNSUPPORTED: CPU=armv7k || CPU=arm64_32 |
| 133 | ++// UNSUPPORTED: CPU=armv7k, CPU=arm64_32, CPU=armv7 |
| 134 | + |
| 135 | + // CHECK-DISABLED-NOT: normal_count |
| 136 | + |
| 137 | +diff --git a/swift/utils/swift_build_support/swift_build_support/products/product.py b/swift/utils/swift_build_support/swift_build_support/products/product.py |
| 138 | +index 274b6037305..bf0f7fcf671 100644 |
| 139 | +--- a/swift/utils/swift_build_support/swift_build_support/products/product.py |
| 140 | ++++ b/swift/utils/swift_build_support/swift_build_support/products/product.py |
| 141 | +@@ -212,7 +212,7 @@ class Product(object): |
| 142 | + if self.args.cross_compile_hosts: |
| 143 | + if self.is_darwin_host(host_target): |
| 144 | + install_destdir = self.host_install_destdir(host_target) |
| 145 | +- else: |
| 146 | ++ elif self.args.cross_compile_append_host_target_to_destdir: |
| 147 | + install_destdir = os.path.join(install_destdir, self.args.host_target) |
| 148 | + return targets.toolchain_path(install_destdir, |
| 149 | + self.args.install_prefix) |
0 commit comments