averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into rebranch

Browse Source
This commit is contained in:
swift-ci
2021-09-02 11:56:28 -07:00
parent 8708f8dde5 ec05b02693
commit cd7ed018bf
6 changed files with 65 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/swift/Basic/Platform.h
View File

@@ -55,9 +55,10 @@ namespace swift {
bool triplesAreValidForZippering(const llvm::Triple &target,
const llvm::Triple &targetVariant);
/// Returns true if the given triple represents an OS that ships with
/// ABI-stable swift libraries (eg. in /usr/lib/swift).
bool tripleRequiresRPathForSwiftInOS(const llvm::Triple &triple);
/// Returns true if the given triple represents an OS that has all the
/// "built-in" ABI-stable libraries (stdlib and _Concurrency)
/// (eg. in /usr/lib/swift).
bool tripleRequiresRPathForSwiftLibrariesInOS(const llvm::Triple &triple);
/// Returns the platform name for a given target triple.
///

18
lib/Basic/Platform.cpp
View File

@@ -79,19 +79,25 @@ bool swift::triplesAreValidForZippering(const llvm::Triple &target,
return false;
}
bool swift::tripleRequiresRPathForSwiftInOS(const llvm::Triple &triple) {
bool swift::tripleRequiresRPathForSwiftLibrariesInOS(
const llvm::Triple &triple) {
if (triple.isMacOSX()) {
// macOS 10.14.4 contains a copy of Swift, but the linker will still use an
// rpath-based install name until 10.15.
return triple.isMacOSXVersionLT(10, 15);
// macOS versions before 10.14.4 don't have Swift in the OS
// (the linker still uses an rpath-based install name until 10.15).
// macOS versions before 12.0 don't have _Concurrency in the OS.
return triple.isMacOSXVersionLT(12, 0);
}
if (triple.isiOS()) {
return triple.isOSVersionLT(12, 2);
// iOS versions before 12.2 don't have Swift in the OS.
// iOS versions before 15.0 don't have _Concurrency in the OS.
return triple.isOSVersionLT(15, 0);
}
if (triple.isWatchOS()) {
return triple.isOSVersionLT(5, 2);
// watchOS versions before 5.2 don't have Swift in the OS.
// watchOS versions before 8.0 don't have _Concurrency in the OS.
return triple.isOSVersionLT(8, 0);
}
// Other platforms don't have Swift installed as part of the OS by default.

10
lib/Driver/DarwinToolChains.cpp
View File

@@ -471,7 +471,7 @@ toolchains::Darwin::addArgsToLinkStdlib(ArgStringList &Arguments,
Arguments.push_back("-rpath");
Arguments.push_back(context.Args.MakeArgString(path));
}
} else if (!tripleRequiresRPathForSwiftInOS(getTriple()) ||
} else if (!tripleRequiresRPathForSwiftLibrariesInOS(getTriple()) ||
context.Args.hasArg(options::OPT_no_stdlib_rpath)) {
// If targeting an OS with Swift in /usr/lib/swift, the LC_ID_DYLIB
// install_name the stdlib will be an absolute path like
@@ -499,9 +499,11 @@ toolchains::Darwin::addArgsToLinkStdlib(ArgStringList &Arguments,
// package isn't installed.
Arguments.push_back("-rpath");
Arguments.push_back(context.Args.MakeArgString("/usr/lib/swift"));
// We don't need an rpath for /System/iOSSupport/usr/lib/swift because...
assert(!tripleIsMacCatalystEnvironment(getTriple())
&& "macCatalyst not supported without Swift-in-the-OS");
// We don’t need an rpath for /System/iOSSupport/usr/lib/swift because:
// 1. The standard library and overlays were part of the OS before
// Catalyst was introduced, so they are always available for Catalyst.
// 2. The _Concurrency back-deployment library is zippered, whereas only
// unzippered frameworks need an unzippered twin in /System/iOSSupport.
}
}

2
lib/FrontendTool/FrontendTool.cpp
View File

@@ -1841,7 +1841,7 @@ static void printTripleInfo(const llvm::Triple &triple,
}
out << " \"librariesRequireRPath\": "
<< (tripleRequiresRPathForSwiftInOS(triple) ? "true" : "false")
<< (tripleRequiresRPathForSwiftLibrariesInOS(triple) ? "true" : "false")
<< "\n";
out << " }";

28
test/Driver/linker-rpath.swift
View File

@@ -6,22 +6,34 @@
// RUN: %swiftc_driver_plain -driver-print-jobs -target x86_64-apple-macosx10.14 %S/../Inputs/empty.swift | %FileCheck -check-prefix RPATH %s
// RUN: %swiftc_driver_plain -driver-print-jobs -target x86_64-apple-macosx10.14.3 %S/../Inputs/empty.swift | %FileCheck -check-prefix RPATH %s
// RUN: %swiftc_driver_plain -driver-print-jobs -target x86_64-apple-macosx10.14.4 %S/../Inputs/empty.swift | %FileCheck -check-prefix RPATH %s
// RUN: %swiftc_driver_plain -driver-print-jobs -target x86_64-apple-macosx10.15 %S/../Inputs/empty.swift | %FileCheck -check-prefix NO-RPATH %s
// RUN: %swiftc_driver_plain -driver-print-jobs -target x86_64-apple-macosx10.15 %S/../Inputs/empty.swift | %FileCheck -check-prefix RPATH %s
// RUN: %swiftc_driver_plain -driver-print-jobs -target x86_64-apple-macosx11.0 %S/../Inputs/empty.swift | %FileCheck -check-prefix RPATH %s
// RUN: %swiftc_driver_plain -driver-print-jobs -target x86_64-apple-macosx12.0 %S/../Inputs/empty.swift | %FileCheck -check-prefix NO-RPATH %s
// RUN: %swiftc_driver_plain -driver-print-jobs -target arm64-apple-ios12 %S/../Inputs/empty.swift | %FileCheck -check-prefix RPATH %s
// RUN: %swiftc_driver_plain -driver-print-jobs -target arm64-apple-ios12.1 %S/../Inputs/empty.swift | %FileCheck -check-prefix RPATH %s
// RUN: %swiftc_driver_plain -driver-print-jobs -target arm64-apple-ios12.2 %S/../Inputs/empty.swift | %FileCheck -check-prefix NO-RPATH %s
// RUN: %swiftc_driver_plain -driver-print-jobs -target arm64-apple-ios13 %S/../Inputs/empty.swift | %FileCheck -check-prefix NO-RPATH %s
// RUN: %swiftc_driver_plain -driver-print-jobs -target arm64-apple-ios12.2 %S/../Inputs/empty.swift | %FileCheck -check-prefix RPATH %s
// RUN: %swiftc_driver_plain -driver-print-jobs -target arm64-apple-ios13 %S/../Inputs/empty.swift | %FileCheck -check-prefix RPATH %s
// RUN: %swiftc_driver_plain -driver-print-jobs -target arm64-apple-ios14 %S/../Inputs/empty.swift | %FileCheck -check-prefix RPATH %s
// RUN: %swiftc_driver_plain -driver-print-jobs -target arm64-apple-ios15 %S/../Inputs/empty.swift | %FileCheck -check-prefix NO-RPATH %s
// RUN: %swiftc_driver_plain -driver-print-jobs -target arm64-apple-ios13-macabi %S/../Inputs/empty.swift | %FileCheck -check-prefix RPATH %s
// RUN: %swiftc_driver_plain -driver-print-jobs -target arm64-apple-ios14-macabi %S/../Inputs/empty.swift | %FileCheck -check-prefix RPATH %s
// RUN: %swiftc_driver_plain -driver-print-jobs -target arm64-apple-ios15-macabi %S/../Inputs/empty.swift | %FileCheck -check-prefix NO-RPATH %s
// RUN: %swiftc_driver_plain -driver-print-jobs -target arm64-apple-tvos12 %S/../Inputs/empty.swift | %FileCheck -check-prefix RPATH %s
// RUN: %swiftc_driver_plain -driver-print-jobs -target arm64-apple-tvos12.1 %S/../Inputs/empty.swift | %FileCheck -check-prefix RPATH %s
// RUN: %swiftc_driver_plain -driver-print-jobs -target arm64-apple-tvos12.2 %S/../Inputs/empty.swift | %FileCheck -check-prefix NO-RPATH %s
// RUN: %swiftc_driver_plain -driver-print-jobs -target arm64-apple-tvos13 %S/../Inputs/empty.swift | %FileCheck -check-prefix NO-RPATH %s
// RUN: %swiftc_driver_plain -driver-print-jobs -target arm64-apple-tvos12.2 %S/../Inputs/empty.swift | %FileCheck -check-prefix RPATH %s
// RUN: %swiftc_driver_plain -driver-print-jobs -target arm64-apple-tvos13 %S/../Inputs/empty.swift | %FileCheck -check-prefix RPATH %s
// RUN: %swiftc_driver_plain -driver-print-jobs -target arm64-apple-tvos14 %S/../Inputs/empty.swift | %FileCheck -check-prefix RPATH %s
// RUN: %swiftc_driver_plain -driver-print-jobs -target arm64-apple-tvos15 %S/../Inputs/empty.swift | %FileCheck -check-prefix NO-RPATH %s
// RUN: %swiftc_driver_plain -driver-print-jobs -target armv7k-apple-watchos5 %S/../Inputs/empty.swift | %FileCheck -check-prefix RPATH %s
// RUN: %swiftc_driver_plain -driver-print-jobs -target armv7k-apple-watchos5.1 %S/../Inputs/empty.swift | %FileCheck -check-prefix RPATH %s
// RUN: %swiftc_driver_plain -driver-print-jobs -target armv7k-apple-watchos5.2 %S/../Inputs/empty.swift | %FileCheck -check-prefix NO-RPATH %s
// RUN: %swiftc_driver_plain -driver-print-jobs -target armv7k-apple-watchos6 %S/../Inputs/empty.swift | %FileCheck -check-prefix NO-RPATH %s
// RUN: %swiftc_driver_plain -driver-print-jobs -target armv7k-apple-watchos5.2 %S/../Inputs/empty.swift | %FileCheck -check-prefix RPATH %s
// RUN: %swiftc_driver_plain -driver-print-jobs -target armv7k-apple-watchos6 %S/../Inputs/empty.swift | %FileCheck -check-prefix RPATH %s
// RUN: %swiftc_driver_plain -driver-print-jobs -target armv7k-apple-watchos7 %S/../Inputs/empty.swift | %FileCheck -check-prefix RPATH %s
// RUN: %swiftc_driver_plain -driver-print-jobs -target armv7k-apple-watchos8 %S/../Inputs/empty.swift | %FileCheck -check-prefix NO-RPATH %s
// RPATH: bin/ld{{"? }}
// RPATH-SAME: -rpath {{"?/usr/lib/swift(-.+)?"? }}
@@ -39,7 +51,7 @@
// ### Test with -no-toolchain-stdlib-rpath
// RUN: %swiftc_driver_plain -driver-print-jobs -no-toolchain-stdlib-rpath -target x86_64-apple-macosx10.9 %S/../Inputs/empty.swift | %FileCheck -check-prefix RPATH %s
// RUN: %swiftc_driver_plain -driver-print-jobs -no-toolchain-stdlib-rpath -target x86_64-apple-macosx10.15 %S/../Inputs/empty.swift | %FileCheck -check-prefix NO-RPATH %s
// RUN: %swiftc_driver_plain -driver-print-jobs -no-toolchain-stdlib-rpath -target x86_64-apple-macosx12.0 %S/../Inputs/empty.swift | %FileCheck -check-prefix NO-RPATH %s
// TOOLCHAIN-RPATH: bin/ld{{"? }}
// TOOLCHAIN-RPATH-SAME: -rpath garbage/[[PLATFORM]]{{ }}

28
test/Driver/print_target_info.swift
View File

@@ -8,8 +8,11 @@
// RUN: %swift_driver -print-target-info -target x86_64-unknown-linux -static-stdlib | %FileCheck -check-prefix CHECK-LINUX-STATIC %s
// RUN: %swift_frontend_plain -print-target-info -target x86_64-unknown-linux -use-static-resource-dir | %FileCheck -check-prefix CHECK-LINUX-STATIC %s
// RUN: %swift_driver -print-target-info -target x86_64-apple-macosx10.15 -target-variant x86_64-apple-ios13-macabi | %FileCheck -check-prefix CHECK-ZIPPERED %s
// RUN: %target-swift-frontend -print-target-info -target x86_64-apple-macosx10.15 -target-variant x86_64-apple-ios13-macabi | %FileCheck -check-prefix CHECK-ZIPPERED %s
// RUN: %swift_driver -print-target-info -target x86_64-apple-macosx10.15 -target-variant x86_64-apple-ios13-macabi | %FileCheck -check-prefix CHECK-PRE-CONCURRENCY-ZIPPERED %s
// RUN: %target-swift-frontend -print-target-info -target x86_64-apple-macosx10.15 -target-variant x86_64-apple-ios13-macabi | %FileCheck -check-prefix CHECK-PRE-CONCURRENCY-ZIPPERED %s
// RUN: %swift_driver -print-target-info -target x86_64-apple-macosx12.0 -target-variant x86_64-apple-ios15-macabi | %FileCheck -check-prefix CHECK-ZIPPERED %s
// RUN: %target-swift-frontend -print-target-info -target x86_64-apple-macosx12.0 -target-variant x86_64-apple-ios15-macabi | %FileCheck -check-prefix CHECK-ZIPPERED %s
// RUN: %swift_driver -print-target-info -target x86_64-apple-ios12.0 | %FileCheck -check-prefix CHECK-IOS-SIM %s
@@ -67,20 +70,33 @@
// CHECK-LINUX-STATIC-NOT: "targetVariant":
// CHECK-PRE-CONCURRENCY-ZIPPERED: "target": {
// CHECK-PRE-CONCURRENCY-ZIPPERED: "triple": "x86_64-apple-macosx10.15"
// CHECK-PRE-CONCURRENCY-ZIPPERED: "unversionedTriple": "x86_64-apple-macosx"
// CHECK-PRE-CONCURRENCY-ZIPPERED: "moduleTriple": "x86_64-apple-macos"
// CHECK-PRE-CONCURRENCY-ZIPPERED: "swiftRuntimeCompatibilityVersion": "5.1"
// CHECK-PRE-CONCURRENCY-ZIPPERED: "librariesRequireRPath": true
// CHECK-PRE-CONCURRENCY-ZIPPERED: }
// CHECK-PRE-CONCURRENCY-ZIPPERED: "targetVariant": {
// CHECK-PRE-CONCURRENCY-ZIPPERED: "triple": "x86_64-apple-ios13-macabi"
// CHECK-PRE-CONCURRENCY-ZIPPERED: "unversionedTriple": "x86_64-apple-ios-macabi"
// CHECK-PRE-CONCURRENCY-ZIPPERED: "moduleTriple": "x86_64-apple-ios-macabi"
// CHECK-PRE-CONCURRENCY-ZIPPERED: "swiftRuntimeCompatibilityVersion": "5.1"
// CHECK-PRE-CONCURRENCY-ZIPPERED: "librariesRequireRPath": true
// CHECK-PRE-CONCURRENCY-ZIPPERED: }
// CHECK-ZIPPERED: "target": {
// CHECK-ZIPPERED: "triple": "x86_64-apple-macosx10.15"
// CHECK-ZIPPERED: "triple": "x86_64-apple-macosx12.0"
// CHECK-ZIPPERED: "unversionedTriple": "x86_64-apple-macosx"
// CHECK-ZIPPERED: "moduleTriple": "x86_64-apple-macos"
// CHECK-ZIPPERED: "swiftRuntimeCompatibilityVersion": "5.1"
// CHECK-ZIPPERED: "librariesRequireRPath": false
// CHECK-ZIPPERED: }
// CHECK-ZIPPERED: "targetVariant": {
// CHECK-ZIPPERED: "triple": "x86_64-apple-ios13-macabi"
// CHECK-ZIPPERED: "triple": "x86_64-apple-ios15-macabi"
// CHECK-ZIPPERED: "unversionedTriple": "x86_64-apple-ios-macabi"
// CHECK-ZIPPERED: "moduleTriple": "x86_64-apple-ios-macabi"
// CHECK-ZIPPERED: "swiftRuntimeCompatibilityVersion": "5.1"
// CHECK-ZIPPERED: "librariesRequireRPath": false
// CHECK-ZIPPERED: }