Skip to content

Commit 910a741

Browse files
authored
Merge pull request swiftlang#37118 from CodaFi/triple-sec
2 parents 937e1a3 + 22f3e96 commit 910a741

File tree

4 files changed

+1
-8
lines changed

4 files changed

+1
-8
lines changed

lib/Basic/Platform.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,7 @@ getArchForAppleTargetSpecificModuleTriple(const llvm::Triple &triple) {
254254

255255
return llvm::StringSwitch<StringRef>(tripleArchName)
256256
.Cases("arm64", "aarch64", "arm64")
257+
.Cases("arm64_32", "aarch64_32", "arm64_32")
257258
.Cases("x86_64", "amd64", "x86_64")
258259
.Cases("i386", "i486", "i586", "i686", "i786", "i886", "i986",
259260
"i386")
@@ -262,7 +263,6 @@ getArchForAppleTargetSpecificModuleTriple(const llvm::Triple &triple) {
262263
// .Case ("armv7s", "armv7s")
263264
// .Case ("armv7k", "armv7k")
264265
// .Case ("armv7", "armv7")
265-
// .Case ("arm64_32", "arm64_32")
266266
// .Case ("arm64e", "arm64e")
267267
.Default(tripleArchName);
268268
}

test/ClangImporter/nested_protocol_name.swift

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@
1919
// HEADER: func flower()
2020
// HEADER: }
2121

22-
// rdar://77281393
23-
// UNSUPPORTED: CPU=arm64_32
24-
2522
func grow(_ branch: Trunk.Branch, from trunk: Trunk) {
2623
branch.flower()
2724
trunk.addLimb(branch)

test/IDE/print_clang_header.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
// FIXME: rdar://problem/19648117 Needs splitting objc parts out
22
// REQUIRES: objc_interop
33

4-
// UNSUPPORTED: CPU=arm64_32
5-
64
// RUN: echo '#include "header-to-print.h"' > %t.m
75
// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -source-filename %s -print-header -header-to-print %S/Inputs/print_clang_header/header-to-print.h -print-regular-comments -enable-objc-interop -disable-objc-attr-requires-foundation-module --cc-args %target-cc-options -isysroot %clang-importer-sdk-path -fsyntax-only %t.m -I %S/Inputs/print_clang_header > %t.txt
86
// RUN: diff -u %S/Inputs/print_clang_header/header-to-print.h.printed.txt %t.txt

test/IDE/print_clang_header_swift_name.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
// RUN: %S/Inputs/print_clang_header_swift_name.h -skip-unavailable --cc-args %target-cc-options \
44
// RUN: -isysroot %clang-importer-sdk-path -fsyntax-only %t.m -I %S/Inputs | %FileCheck %s
55

6-
// UNSUPPORTED: CPU=arm64_32
7-
86
// REQUIRES: objc_interop
97

108
// CHECK: enum Normal : Int {

0 commit comments

Comments
 (0)