Skip to content

Commit 683985e

Browse files
authored
Add missing armv7 variants into the lists of allowed CPU types for the 'freestanding' stdlib builds (#65633)
1 parent 74cbe26 commit 683985e

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

cmake/modules/SwiftSetIfArchBitness.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ function(set_if_arch_bitness var_name)
1414
"${SIA_ARCH}" STREQUAL "armv7" OR
1515
"${SIA_ARCH}" STREQUAL "armv7k" OR
1616
"${SIA_ARCH}" STREQUAL "arm64_32" OR
17+
"${SIA_ARCH}" STREQUAL "armv7m" OR
18+
"${SIA_ARCH}" STREQUAL "armv7em" OR
1719
"${SIA_ARCH}" STREQUAL "armv7s" OR
1820
"${SIA_ARCH}" STREQUAL "wasm32" OR
1921
"${SIA_ARCH}" STREQUAL "powerpc")

utils/swift_build_support/swift_build_support/targets.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -260,9 +260,10 @@ class StdlibDeploymentTarget(object):
260260

261261
# A platform that's not tied to any particular OS, and it meant to be used
262262
# to build the stdlib as standalone and/or statically linked.
263-
Freestanding = Platform("freestanding",
264-
archs=["i386", "x86_64", "armv7", "armv7s", "armv7k",
265-
"arm64", "arm64e"])
263+
Freestanding = Platform("freestanding", archs=[
264+
"i386", "x86_64",
265+
"armv7", "armv7s", "armv7k", "armv7m", "armv7em",
266+
"arm64", "arm64e"])
266267

267268
Linux = Platform("linux", archs=[
268269
"x86_64",

0 commit comments

Comments
 (0)