Skip to content

Remap aarch64_32 to arm64_32 When Searching for Modules #37118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 29, 2021
Merged

Remap aarch64_32 to arm64_32 When Searching for Modules #37118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/Basic/Platform.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,7 @@ getArchForAppleTargetSpecificModuleTriple(const llvm::Triple &triple) {

return llvm::StringSwitch<StringRef>(tripleArchName)
.Cases("arm64", "aarch64", "arm64")
.Cases("arm64_32", "aarch64_32", "arm64_32")
.Cases("x86_64", "amd64", "x86_64")
.Cases("i386", "i486", "i586", "i686", "i786", "i886", "i986",
"i386")
Expand All @@ -262,7 +263,6 @@ getArchForAppleTargetSpecificModuleTriple(const llvm::Triple &triple) {
// .Case ("armv7s", "armv7s")
// .Case ("armv7k", "armv7k")
// .Case ("armv7", "armv7")
// .Case ("arm64_32", "arm64_32")
// .Case ("arm64e", "arm64e")
.Default(tripleArchName);
}
Expand Down
3 changes: 0 additions & 3 deletions test/ClangImporter/nested_protocol_name.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@
// HEADER: func flower()
// HEADER: }

// rdar://77281393
// UNSUPPORTED: CPU=arm64_32

func grow(_ branch: Trunk.Branch, from trunk: Trunk) {
branch.flower()
trunk.addLimb(branch)
Expand Down
2 changes: 0 additions & 2 deletions test/IDE/print_clang_header.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// FIXME: rdar://problem/19648117 Needs splitting objc parts out
// REQUIRES: objc_interop

// UNSUPPORTED: CPU=arm64_32

// RUN: echo '#include "header-to-print.h"' > %t.m
// 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
// RUN: diff -u %S/Inputs/print_clang_header/header-to-print.h.printed.txt %t.txt
Expand Down
2 changes: 0 additions & 2 deletions test/IDE/print_clang_header_swift_name.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
// RUN: %S/Inputs/print_clang_header_swift_name.h -skip-unavailable --cc-args %target-cc-options \
// RUN: -isysroot %clang-importer-sdk-path -fsyntax-only %t.m -I %S/Inputs | %FileCheck %s

// UNSUPPORTED: CPU=arm64_32

// REQUIRES: objc_interop

// CHECK: enum Normal : Int {
Expand Down