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

Roll back to watchOS 6.0 to keep armv7k support

Browse Source 
While the swift compiler in Xcode links against tbd files in the sdk
that contain an armv7k slice, the open source swift toolchain links
against the stdlib dylb that is in the toolchain itself. This means that
we cannot drop support for armv7k support in the stdlib dylib without
losing support for building armv7k when back deploying to older watch
targets. For now, roll back the recent deployment target bump from 9.0
to 6.0 so that we keep armv7k and i386 simulator.

rdar://135560598
This commit is contained in:
Ben Langmuir
2024-09-13 08:49:09 -07:00
parent d177df981b
commit 46a83bea0c
5 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -572,7 +572,7 @@ set(SWIFT_DARWIN_DEPLOYMENT_VERSION_IOS "16.0" CACHE STRING
set(SWIFT_DARWIN_DEPLOYMENT_VERSION_TVOS "16.0" CACHE STRING
"Minimum deployment target version for tvOS")
set(SWIFT_DARWIN_DEPLOYMENT_VERSION_WATCHOS "9.0" CACHE STRING
set(SWIFT_DARWIN_DEPLOYMENT_VERSION_WATCHOS "6.0" CACHE STRING
"Minimum deployment target version for watchOS")
set(SWIFT_DARWIN_DEPLOYMENT_VERSION_XROS "1.0" CACHE STRING

2
benchmark/cmake/modules/AddSwiftBenchmarkSuite.cmake
View File

@@ -113,7 +113,7 @@ macro(configure_sdks_darwin)
set(macosx_ver "13.0")
set(iphoneos_ver "16.0")
set(appletvos_ver "16.0")
set(watchos_ver "9.0")
set(watchos_ver "6.0")
set(macosx_vendor "apple")
set(iphoneos_vendor "apple")

2
utils/build-script-impl
View File

@@ -104,7 +104,7 @@ KNOWN_SETTINGS=(
darwin-deployment-version-ios "16.0" "minimum deployment target version for iOS"
darwin-deployment-version-osx "13.0" "minimum deployment target version for OS X"
darwin-deployment-version-tvos "16.0" "minimum deployment target version for tvOS"
darwin-deployment-version-watchos "9.0" "minimum deployment target version for watchOS"
darwin-deployment-version-watchos "6.0" "minimum deployment target version for watchOS"
darwin-deployment-version-xros "1.0" "minimum deployment target version for xrOS"
darwin-install-extract-symbols "" "whether to extract symbols with dsymutil during installations"
darwin-install-extract-symbols-use-just-built-dsymutil "1" "whether we should extract symbols using the just built dsymutil"

4
utils/build_swift/build_swift/defaults.py
View File

@@ -55,7 +55,9 @@ DARWIN_XCRUN_TOOLCHAIN = 'default'
DARWIN_DEPLOYMENT_VERSION_OSX = '13.0'
DARWIN_DEPLOYMENT_VERSION_IOS = '16.0'
DARWIN_DEPLOYMENT_VERSION_TVOS = '16.0'
DARWIN_DEPLOYMENT_VERSION_WATCHOS = '9.0'
# FIXME: 9.0 would be the aligned watchOS version, but is held back to keep
# support for armv7k (dropped in 9) and i386 simulator (dropped in 7)
DARWIN_DEPLOYMENT_VERSION_WATCHOS = '6.0'
DARWIN_DEPLOYMENT_VERSION_XROS = '1.0'
UNIX_INSTALL_PREFIX = '/usr'

6
utils/gyb_foundation_support.py
View File

@@ -12,7 +12,7 @@ extension {Type}: _ObjectiveCBridgeable {{
_getObjCTypeEncoding({Type}.self)) == 0,
"NSValue does not contain the right type to bridge to {Type}")
result = {Type}()
if #available(OSX 13.0, iOS 16.0, tvOS 16.0, watchOS 9.0, *) {{
if #available(OSX 13.0, iOS 16.0, tvOS 16.0, watchOS 6.0, *) {{
source.getValue(&result!, size: MemoryLayout<{Type}>.size)
}} else {{
source.getValue(&result!)
@@ -27,7 +27,7 @@ extension {Type}: _ObjectiveCBridgeable {{
return false
}}
result = {Type}()
if #available(OSX 13.0, iOS 16.0, tvOS 16.0, watchOS 9.0, *) {{
if #available(OSX 13.0, iOS 16.0, tvOS 16.0, watchOS 6.0, *) {{
source.getValue(&result!, size: MemoryLayout<{Type}>.size)
}} else {{
source.getValue(&result!)
@@ -42,7 +42,7 @@ extension {Type}: _ObjectiveCBridgeable {{
_getObjCTypeEncoding({Type}.self)) == 0,
"NSValue does not contain the right type to bridge to {Type}")
var result = {Type}()
if #available(OSX 13.0, iOS 16.0, tvOS 16.0, watchOS 9.0, *) {{
if #available(OSX 13.0, iOS 16.0, tvOS 16.0, watchOS 6.0, *) {{
unwrappedSource.getValue(&result, size: MemoryLayout<{Type}>.size)
}} else {{
unwrappedSource.getValue(&result)