Skip to content

Commit 1d609ff

Browse files
authored
Merge pull request swiftlang#39466 from DougGregor/cherry-pick-arm64-disables-5.5
2 parents b4a97de + 36411b5 commit 1d609ff

File tree

4 files changed

+4
-12
lines changed

4 files changed

+4
-12
lines changed

test/Concurrency/Backdeploy/linking.swift

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@
88
// RUN: otool -L %t/linking_rpath_old | %FileCheck -check-prefix CHECK-RPATH %s
99

1010
// REQUIRES: OS=macosx
11-
12-
// rdar://83576231 - link failures on arm64
13-
// UNSUPPORTED: CPU=arm64
11+
// REQUIRES: CPU=x86_64
1412

1513
// CHECK-DIRECT: /usr/lib/swift/libswift_Concurrency.dylib
1614
// CHECK-RPATH: @rpath/libswift_Concurrency.dylib

test/Concurrency/Backdeploy/mangling.swift

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,10 @@
1212
// RUN: %target-build-swift -target x86_64-apple-macosx10.15 %s -o %t/test_mangling -Xfrontend -disable-availability-checking
1313
// RUN: %target-run %t/test_mangling
1414

15+
// REQUIRES: CPU=x86_64
1516
// REQUIRES: OS=macosx
1617
// REQUIRES: executable_test
1718

18-
// rdar://83576231 - link failures on arm64
19-
// UNSUPPORTED: CPU=arm64
20-
2119
protocol MyProtocol {
2220
associatedtype AssocSendable
2321
associatedtype AssocAsync

test/IRGen/autolink-runtime-compatibility-arm64-macos.swift

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1+
// REQUIRES: rdar81115750
12
// REQUIRES: CPU=arm64,OS=macosx
23

3-
// rdar://83576231 - link failures on arm64
4-
// REQUIRES: rdar83576231
5-
64
// Doesn't autolink compatibility library because target OS doesn't need it
75
// RUN: %target-swift-frontend -target arm64-apple-macosx10.14 -emit-ir -parse-stdlib %s | %FileCheck -check-prefix=NO-FORCE-LOAD %s
86

test/Reflection/typeref_decoding_concurrency.swift

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,13 @@
33
// REQUIRES: concurrency
44
// REQUIRES: libdispatch
55

6+
// REQUIRES: CPU=x86_64
67
// REQUIRES: OS=macosx
78

89
// rdar://76038845
910
// UNSUPPORTED: use_os_stdlib
1011
// UNSUPPORTED: back_deployment_runtime
1112

12-
// rdar://83576231 - link failures on arm64
13-
// UNSUPPORTED: CPU=arm64
14-
1513
// RUN: %empty-directory(%t)
1614

1715
// RUN: %target-build-swift -Xfrontend -enable-anonymous-context-mangled-names %S/Inputs/ConcurrencyTypes.swift -parse-as-library -emit-module -emit-library -module-name TypesToReflect -o %t/%target-library-name(TypesToReflect) -target x86_64-apple-macosx12.0

0 commit comments

Comments
 (0)