Skip to content

Commit a7dadeb

Browse files
shahmishalshahmishal
authored
Merge pull request #60363 from apple/drop-armv7-ios
Xcode 14 beta 4 no longer supports iOS armv7, armv7s and i386 arch
2 parents f8581f2 + b41c313 commit a7dadeb

File tree

10 files changed

+5
-82
lines changed

10 files changed

+5
-82
lines changed

‎benchmark/cmake/modules/AddSwiftBenchmarkSuite.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ endmacro()
106106

107107
macro(configure_sdks_darwin)
108108
set(macosx_arch "x86_64" "arm64")
109-
set(iphoneos_arch "arm64" "arm64e" "armv7")
109+
set(iphoneos_arch "arm64" "arm64e")
110110
set(appletvos_arch "arm64")
111111
set(watchos_arch "armv7k" "arm64_32")
112112

‎cmake/modules/DarwinSDKs.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ option(SWIFT_ENABLE_IOS32
33
TRUE)
44

55
if(SWIFT_ENABLE_IOS32)
6-
set(SUPPORTED_IOS_ARCHS "armv7;armv7s;arm64;arm64e")
7-
set(SUPPORTED_IOS_SIMULATOR_ARCHS "i386;x86_64;arm64")
6+
set(SUPPORTED_IOS_ARCHS "arm64;arm64e")
7+
set(SUPPORTED_IOS_SIMULATOR_ARCHS "x86_64;arm64")
88
else()
99
set(SUPPORTED_IOS_ARCHS "arm64;arm64e")
1010
set(SUPPORTED_IOS_SIMULATOR_ARCHS "x86_64;arm64")

‎cmake/modules/SwiftConfigureSDK.cmake‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,6 @@ function(remove_sdk_unsupported_archs name os sdk_path architectures_var)
8686
foreach(arch ${${architectures_var}})
8787
if(sdk_supported_archs MATCHES "${arch}\n")
8888
list(APPEND architectures ${arch})
89-
elseif(arch MATCHES "^armv7(s)?$" AND os STREQUAL "iphoneos")
90-
# 32-bit iOS is not listed explicitly in SDK settings.
91-
message(STATUS "Assuming ${name} SDK at ${sdk_path} supports architecture ${arch}")
92-
list(APPEND architectures ${arch})
9389
elseif(arch STREQUAL "i386" AND os STREQUAL "iphonesimulator")
9490
# 32-bit iOS simulator is not listed explicitly in SDK settings.
9591
message(STATUS "Assuming ${name} SDK at ${sdk_path} supports architecture ${arch}")

‎utils/build-script-impl‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -465,11 +465,8 @@ function verify_host_is_supported() {
465465
| macosx-x86_64 \
466466
| macosx-arm64 \
467467
| macosx-arm64e \
468-
| iphonesimulator-i386 \
469468
| iphonesimulator-x86_64 \
470469
| iphonesimulator-arm64 \
471-
| iphoneos-armv7 \
472-
| iphoneos-armv7s \
473470
| iphoneos-arm64 \
474471
| iphoneos-arm64e \
475472
| appletvsimulator-x86_64 \
@@ -597,13 +594,6 @@ function set_build_options_for_host() {
597594
SWIFT_HOST_VARIANT_ARCH="arm64e"
598595
cmake_osx_deployment_target="${DARWIN_DEPLOYMENT_VERSION_OSX}"
599596
;;
600-
iphonesimulator-i386)
601-
SWIFT_HOST_TRIPLE="i386-apple-ios${DARWIN_DEPLOYMENT_VERSION_IOS}-simulator"
602-
llvm_target_arch="X86"
603-
604-
SWIFT_HOST_VARIANT_SDK="IOS_SIMULATOR"
605-
cmake_osx_deployment_target=""
606-
;;
607597
iphonesimulator-x86_64)
608598
SWIFT_HOST_TRIPLE="x86_64-apple-ios${DARWIN_DEPLOYMENT_VERSION_IOS}-simulator"
609599
llvm_target_arch="X86"
@@ -626,20 +616,6 @@ function set_build_options_for_host() {
626616
-DCMAKE_OSX_SYSROOT:PATH="$(xcrun --sdk ${xcrun_sdk_name} --show-sdk-path)"
627617
)
628618
;;
629-
iphoneos-armv7)
630-
SWIFT_HOST_TRIPLE="armv7-apple-ios${DARWIN_DEPLOYMENT_VERSION_IOS}"
631-
llvm_target_arch="ARM"
632-
633-
SWIFT_HOST_VARIANT_SDK="IOS"
634-
cmake_osx_deployment_target=""
635-
;;
636-
iphoneos-armv7s)
637-
SWIFT_HOST_TRIPLE="armv7s-apple-ios${DARWIN_DEPLOYMENT_VERSION_IOS}"
638-
llvm_target_arch="ARM"
639-
640-
SWIFT_HOST_VARIANT_SDK="IOS"
641-
cmake_osx_deployment_target=""
642-
;;
643619
iphoneos-arm64)
644620
SWIFT_HOST_TRIPLE="arm64-apple-ios${DARWIN_DEPLOYMENT_VERSION_IOS}"
645621
llvm_target_arch="AArch64"

‎utils/build_swift/build_swift/driver_arguments.py‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1103,10 +1103,6 @@ def create_argument_parser():
11031103
option('--skip-test-ios-simulator',
11041104
toggle_false('test_ios_simulator'),
11051105
help='skip testing iOS simulator targets')
1106-
option('--skip-test-ios-32bit-simulator',
1107-
toggle_false('test_ios_32bit_simulator'),
1108-
default=False,
1109-
help='skip testing iOS 32 bit simulator targets')
11101106
option('--skip-test-watchos-32bit-simulator',
11111107
toggle_false('test_watchos_32bit_simulator'),
11121108
default=False,

‎utils/build_swift/tests/expected_options.py‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,6 @@
244244
'test_cygwin': False,
245245
'test_freebsd': False,
246246
'test_ios': False,
247-
'test_ios_32bit_simulator': False,
248247
'test_watchos_32bit_simulator': False,
249248
'test_ios_host': False,
250249
'test_ios_simulator': False,
@@ -641,8 +640,6 @@ class BuildScriptImplOption(_BaseOption):
641640
DisableOption('--skip-test-cygwin', dest='test_cygwin'),
642641
DisableOption('--skip-test-freebsd', dest='test_freebsd'),
643642
DisableOption('--skip-test-ios', dest='test_ios'),
644-
DisableOption('--skip-test-ios-32bit-simulator',
645-
dest='test_ios_32bit_simulator'),
646643
DisableOption('--skip-test-watchos-32bit-simulator',
647644
dest='test_watchos_32bit_simulator'),
648645
DisableOption('--skip-test-ios-host', dest='test_ios_host'),

‎utils/sil-opt-verify-all-modules.py‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,7 @@ def get_verify_resource_dir_modules_commands(
5959
known_platforms = [
6060
('appletvos', 'arm64', 'arm64-apple-tvos9.0'),
6161
('appletvsimulator', 'x86_64', 'x86_64-apple-tvos9.0'),
62-
('iphoneos', 'armv7', 'armv7-apple-ios7.0'),
63-
('iphoneos', 'armv7s', 'armv7s-apple-ios7.0'),
6462
('iphoneos', 'arm64', 'arm64-apple-ios7.0'),
65-
('iphonesimulator', 'i386', 'i386-apple-ios7.0'),
6663
('iphonesimulator', 'x86_64', 'x86_64-apple-ios7.0'),
6764
('macosx', 'x86_64', 'x86_64-apple-macosx10.9'),
6865
('watchos', 'armv7k', 'armv7k-apple-watchos2.0'),

‎utils/swift_build_support/swift_build_support/host_specific_configuration.py‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -300,9 +300,6 @@ def __platforms_to_skip_test(self, args, stage_dependent_args):
300300

301301
def __platforms_archs_to_skip_test(self, args, stage_dependent_args, host_target):
302302
platforms_archs_to_skip_test = set()
303-
if not stage_dependent_args.test_ios_32bit_simulator:
304-
platforms_archs_to_skip_test.add(
305-
StdlibDeploymentTarget.iOSSimulator.i386)
306303
if not stage_dependent_args.test_watchos_32bit_simulator:
307304
platforms_archs_to_skip_test.add(
308305
StdlibDeploymentTarget.AppleWatchSimulator.i386)
@@ -314,8 +311,6 @@ def __platforms_archs_to_skip_test(self, args, stage_dependent_args, host_target
314311
platforms_archs_to_skip_test.add(
315312
StdlibDeploymentTarget.AppleWatchSimulator.arm64)
316313
if host_target == StdlibDeploymentTarget.OSX.arm64.name:
317-
platforms_archs_to_skip_test.add(
318-
StdlibDeploymentTarget.iOSSimulator.i386)
319314
platforms_archs_to_skip_test.add(
320315
StdlibDeploymentTarget.iOSSimulator.x86_64)
321316
platforms_archs_to_skip_test.add(

‎utils/swift_build_support/swift_build_support/targets.py‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -121,15 +121,6 @@ def sdk_supports_architecture(self, arch, toolchain):
121121
# The names match up with the xcrun SDK names.
122122
xcrun_sdk_name = self.name
123123

124-
# 32-bit iOS and iOS simulator are supported, but are not covered
125-
# by the SDK settings. Handle this special case here.
126-
if (xcrun_sdk_name == 'iphoneos' and
127-
(arch == 'armv7' or arch == 'armv7s')):
128-
return True
129-
130-
if (xcrun_sdk_name == 'iphonesimulator' and arch == 'i386'):
131-
return True
132-
133124
sdk_path = xcrun.sdk_path(sdk=xcrun_sdk_name, toolchain=toolchain)
134125
if not sdk_path:
135126
raise RuntimeError('Cannot find SDK path for %s' % xcrun_sdk_name)
@@ -234,15 +225,12 @@ class StdlibDeploymentTarget(object):
234225
OSX = DarwinPlatform("macosx", archs=["x86_64", "arm64"],
235226
sdk_name="OSX")
236227

237-
iOS = DarwinPlatform("iphoneos", archs=["armv7", "armv7s", "arm64", "arm64e"],
228+
iOS = DarwinPlatform("iphoneos", archs=["arm64", "arm64e"],
238229
sdk_name="IOS")
239-
iOSSimulator = DarwinPlatform("iphonesimulator", archs=["i386", "x86_64", "arm64"],
230+
iOSSimulator = DarwinPlatform("iphonesimulator", archs=["x86_64", "arm64"],
240231
sdk_name="IOS_SIMULATOR",
241232
is_simulator=True)
242233

243-
# Never build/test benchmarks on iOS armv7s.
244-
iOS.armv7s.supports_benchmark = False
245-
246234
AppleTV = DarwinPlatform("appletvos", archs=["arm64"],
247235
sdk_name="TVOS")
248236
AppleTVSimulator = DarwinPlatform("appletvsimulator", archs=["x86_64", "arm64"],

‎utils/swift_build_support/tests/test_host_specific_configuration.py‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -294,23 +294,6 @@ def test(self):
294294
'build_watchos_simulator',
295295
'test_watchos_simulator')
296296

297-
def test_should_skip_testing_32bit_ios(self):
298-
host_target = 'iphonesimulator-i386'
299-
args = self.default_args()
300-
args.build_ios_simulator = True
301-
args.test_ios_simulator = True
302-
args.host_target = host_target
303-
args.stdlib_deployment_targets = [host_target]
304-
args.build_stdlib_deployment_targets = 'all'
305-
306-
before = HostSpecificConfiguration(host_target, args)
307-
self.assertEqual(len(before.swift_test_run_targets), 0)
308-
309-
args.test_ios_32bit_simulator = True
310-
after = HostSpecificConfiguration(host_target, args)
311-
self.assertIn('check-swift-iphonesimulator-i386',
312-
after.swift_test_run_targets)
313-
314297
def test_should_skip_testing_32bit_watchos(self):
315298
host_target = 'watchsimulator-i386'
316299
args = self.default_args()
@@ -449,10 +432,6 @@ def test(self):
449432
generate_should_build_benchmarks(
450433
'macosx-x86_64',
451434
'build_osx')
452-
test_should_build_and_run_benchmarks_ios_armv7 =\
453-
generate_should_build_benchmarks(
454-
'iphoneos-armv7',
455-
'build_ios_device')
456435
test_should_build_and_run_benchmarks_ios_arm64 =\
457436
generate_should_build_benchmarks(
458437
'iphoneos-arm64',
@@ -702,7 +681,6 @@ def default_args(self):
702681
test_freebsd=False,
703682
test_ios_host=False,
704683
test_ios_simulator=False,
705-
test_ios_32bit_simulator=False,
706684
test_watchos_32bit_simulator=True,
707685
test_linux=False,
708686
test_optimize_for_size=False,

0 commit comments

Comments
 (0)