Skip to content

Commit 8738e72

Browse files
michael-yujimichael-yuji
authored
Merge branch 'main' into mchiu/freebsd
2 parents 9a948a9 + 7ac5516 commit 8738e72

File tree

467 files changed

+9890
-6750
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

467 files changed

+9890
-6750
lines changed

‎CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1686,7 +1686,8 @@ if(SWIFT_ENABLE_NEW_RUNTIME_BUILD)
16861686
-DCMAKE_C_COMPILER_TARGET:STRING=${stdlib_target_triple}
16871687
-DCMAKE_CXX_COMPILER_TARGET:STRING=${stdlib_target_triple}
16881688
-DCMAKE_COLOR_DIAGNOSTICS:BOOLEAN=${CMAKE_COLOR_DIAGNOSTICS}
1689-
-DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM})
1689+
-DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
1690+
-DCMAKE_FIND_PACKAGE_PREFER_CONFIG=TRUE)
16901691
endforeach()
16911692
endforeach()
16921693
endif()

‎README.md

Lines changed: 14 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -5,37 +5,20 @@
55

66
# Swift Programming Language
77

8-
9-
| | **Architecture** | **Build** |
10-
|---|:---:|:---:|
11-
| **macOS** | Universal |[![Build Status](https://ci.swift.org/job/oss-swift-package-macos/lastCompletedBuild/badge/icon)](https://ci.swift.org/job/oss-swift-package-macos)|
12-
| **Ubuntu 20.04** | x86_64 |[![Build Status](https://ci.swift.org/job/oss-swift-package-ubuntu-20_04/lastCompletedBuild/badge/icon)](https://ci.swift.org/job/oss-swift-package-ubuntu-20_04)|
13-
| **Ubuntu 20.04** | AArch64 |[![Build Status](https://ci.swift.org/job/oss-swift-package-ubuntu-20_04-aarch64/lastCompletedBuild/badge/icon)](https://ci.swift.org/job/oss-swift-package-ubuntu-20_04-aarch64)|
14-
| **Ubuntu 22.04** | x86_64 |[![Build Status](https://ci.swift.org/job/oss-swift-package-ubuntu-22_04/lastCompletedBuild/badge/icon)](https://ci.swift.org/job/oss-swift-package-ubuntu-22_04)|
15-
| **Ubuntu 22.04** | AArch64 |[![Build Status](https://ci.swift.org/job/oss-swift-package-ubuntu-22_04-aarch64/lastCompletedBuild/badge/icon)](https://ci.swift.org/job/oss-swift-package-ubuntu-22_04-aarch64)|
16-
| **Ubuntu 24.04** | x86_64 |[![Build Status](https://ci.swift.org/job/oss-swift-package-ubuntu-24_04/lastCompletedBuild/badge/icon)](https://ci.swift.org/job/oss-swift-package-ubuntu-24_04)|
17-
| **Ubuntu 24.04** | AArch64 |[![Build Status](https://ci.swift.org/job/oss-swift-package-ubuntu-24_04-aarch64/lastCompletedBuild/badge/icon)](https://ci.swift.org/job/oss-swift-package-ubuntu-24_04-aarch64)|
18-
| **Amazon Linux 2** | x86_64 |[![Build Status](https://ci.swift.org/job/oss-swift-package-amazon-linux-2/lastCompletedBuild/badge/icon)](https://ci.swift.org/job/oss-swift-package-amazon-linux-2)|
19-
| **Amazon Linux 2** | AArch64 |[![Build Status](https://ci.swift.org/job/oss-swift-package-amazon-linux-2-aarch64/lastCompletedBuild/badge/icon)](https://ci.swift.org/job/oss-swift-package-amazon-linux-2-aarch64)|
20-
| **Universal Base Image 9** | x86_64 |[![Build Status](https://ci.swift.org/job/oss-swift-package-ubi-9/lastCompletedBuild/badge/icon)](https://ci.swift.org/job/oss-swift-package-ubi-9)|
21-
| **Debian 12** | x86_64 |[![Build Status](https://ci.swift.org/job/oss-swift-package-debian-12/lastCompletedBuild/badge/icon)](https://ci.swift.org/job/oss-swift-package-debian-12)|
22-
| **Debian 12** | AArch64 |[![Build Status](https://ci.swift.org/job/oss-swift-package-debian-12-aarch64/lastCompletedBuild/badge/icon)](https://ci.swift.org/job/oss-swift-package-debian-12-aarch64)|
23-
| **Windows 10** | x86_64 |[![Build Status](https://ci-external.swift.org/job/swift-main-windows-toolchain/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/swift-main-windows-toolchain)|
24-
| **Windows 10** | ARM64 |[![Build Status](https://ci-external.swift.org/job/swift-main-windows-toolchain-arm64/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/swift-main-windows-toolchain-arm64)|
25-
26-
**Cross-Compilation Targets**
27-
28-
| **Target** | **Build** |
29-
|:---:|:---:|
30-
| **wasm32-unknown-wasi** |[![Build Status](https://ci.swift.org/job/oss-swift-pr-test-crosscompile-wasm-ubuntu-20_04/lastCompletedBuild/badge/icon)](https://ci.swift.org/job/oss-swift-pr-test-crosscompile-wasm-ubuntu-20_04)|
31-
32-
**Swift Community-Hosted CI Platforms**
33-
34-
| **OS** | **Architecture** | **Build** |
35-
|---|:---:|:---:|
36-
|**[Android](https://github.com/swiftlang/swift-community-hosted-continuous-integration/blob/main/nodes/x86_64_ubuntu_24_04_android.json)** | X86_64 |[![Build Status](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-24.04-android-build/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-24.04-android-build)|
37-
|**[Android](https://github.com/swiftlang/swift-community-hosted-continuous-integration/blob/main/nodes/aarch64_ubuntu_24_04_android.json)** | AArch64 |[![Build Status](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-24.04-android-arm64/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-24.04-android-arm64)|
38-
|**[Windows 2019 (VS 2019)](https://github.com/apple/swift-community-hosted-continuous-integration/blob/main/nodes/x86_64_windows_2019_VS2019.json)** | x86_64 | [![Build Status](https://ci-external.swift.org/job/oss-swift-windows-x86_64-vs2019/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-windows-x86_64-vs2019)|
8+
| **OS** | **Status** |
9+
|---:|:---:|
10+
| macOS | [![macOS Universal Build Status](https://ci.swift.org/job/oss-swift-package-macos/lastCompletedBuild/badge/icon?subject=universal)](https://ci.swift.org/job/oss-swift-package-macos)|
11+
| Ubuntu 20.04 | [![Ubuntu 20.04 x86_64 Build Status](https://ci.swift.org/job/oss-swift-package-ubuntu-20_04/lastCompletedBuild/badge/icon?subject=x86_64)](https://ci.swift.org/job/oss-swift-package-ubuntu-20_04) [![Ubuntu 20.04 aarch64 Build Status](https://ci.swift.org/job/oss-swift-package-ubuntu-20_04-aarch64/lastCompletedBuild/badge/icon?subject=aarch64)](https://ci.swift.org/job/oss-swift-package-ubuntu-20_04-aarch64)|
12+
| Ubuntu 22.04 | [![Ubuntu 22.04 x86_64 Build Status](https://ci.swift.org/job/oss-swift-package-ubuntu-22_04/lastCompletedBuild/badge/icon?subject=x86_64)](https://ci.swift.org/job/oss-swift-package-ubuntu-22_04) [![Ubuntu 22.04 aarch64 Build Status](https://ci.swift.org/job/oss-swift-package-ubuntu-22_04-aarch64/lastCompletedBuild/badge/icon?subject=aarch64)](https://ci.swift.org/job/oss-swift-package-ubuntu-22_04-aarch64)|
13+
| Ubuntu 24.04 | [![Ubuntu 24.04 x86_64 Build Status](https://ci.swift.org/job/oss-swift-package-ubuntu-24_04/lastCompletedBuild/badge/icon?subject=x86_64)](https://ci.swift.org/job/oss-swift-package-ubuntu-24_04) [![Ubuntu 24.04 aarch64 Build Status](https://ci.swift.org/job/oss-swift-package-ubuntu-24_04-aarch64/lastCompletedBuild/badge/icon?subject=aarch64)](https://ci.swift.org/job/oss-swift-package-ubuntu-24_04-aarch64)|
14+
| Amazon Linux 2 | [![Amazon Linux 2 x86_64 Build Status](https://ci.swift.org/job/oss-swift-package-amazon-linux-2/lastCompletedBuild/badge/icon?subject=x86_64)](https://ci.swift.org/job/oss-swift-package-amazon-linux-2) [![Amazon Linux 2 aarch64 Build Status](https://ci.swift.org/job/oss-swift-package-amazon-linux-2-aarch64/lastCompletedBuild/badge/icon?subject=aarch64)](https://ci.swift.org/job/oss-swift-package-amazon-linux-2-aarch64)|
15+
| Debian 12 | [![Debian 12 x86_64 Build Status](https://ci.swift.org/job/oss-swift-package-debian-12/lastCompletedBuild/badge/icon?subject=x86_64)](https://ci.swift.org/job/oss-swift-package-debian-12) [![Debian 12 aarch64 Build Status](https://ci.swift.org/job/oss-swift-package-debian-12-aarch64/lastCompletedBuild/badge/icon?subject=aarch64)](https://ci.swift.org/job/oss-swift-package-debian-12-aarch64)|
16+
| Windows 10 | [![Windows 10 x86_64 Build Status](https://ci-external.swift.org/job/swift-main-windows-toolchain/lastCompletedBuild/badge/icon?subject=x86_64)](https://ci-external.swift.org/job/swift-main-windows-toolchain) [![Windows 10 arm64 Build Status](https://ci-external.swift.org/job/swift-main-windows-toolchain-arm64/lastCompletedBuild/badge/icon?subject=arm64)](https://ci-external.swift.org/job/swift-main-windows-toolchain-arm64)|
17+
| Universal Base Image 9 | [![Universal Base Image 9 x86_64 Build Status](https://ci.swift.org/job/oss-swift-package-ubi-9/lastCompletedBuild/badge/icon?subject=x86_64)](https://ci.swift.org/job/oss-swift-package-ubi-9)|
18+
|**Cross-Compilation Targets**||
19+
| wasm32-unknown-wasi |[![wasm32-unknown-wasi Build Status](https://ci.swift.org/job/oss-swift-pr-test-crosscompile-wasm-ubuntu-20_04/lastCompletedBuild/badge/icon)](https://ci.swift.org/job/oss-swift-pr-test-crosscompile-wasm-ubuntu-20_04)|
20+
|**Community-Hosted CI Platforms**||
21+
|[Android](https://github.com/swiftlang/swift-community-hosted-continuous-integration/blob/main/nodes/x86_64_ubuntu_24_04_android.json) | [![Android x86_64 Build Status](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-24.04-android-build/lastCompletedBuild/badge/icon?subject=x86_64)](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-24.04-android-build) [![Android aarch64 Build Status](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-24.04-android-arm64/lastCompletedBuild/badge/icon?subject=aarch64)](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-24.04-android-arm64)|
3922

4023
## Welcome to Swift
4124

‎Runtimes/Core/Concurrency/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
add_subdirectory(InternalShims)
22

3+
gyb_expand(Task+init.swift.gyb Task+init.swift)
34
gyb_expand(TaskGroup+addTask.swift.gyb TaskGroup+addTask.swift)
45
gyb_expand(Task+immediate.swift.gyb Task+immediate.swift)
56

@@ -92,10 +93,10 @@ add_library(swift_Concurrency
9293
Task+TaskExecutor.swift
9394
TaskCancellation.swift
9495
TaskGroup.swift
95-
TaskGroup+Embedded.swift
9696
TaskLocal.swift
9797
TaskSleep.swift
9898
TaskSleepDuration.swift
99+
"${CMAKE_CURRENT_BINARY_DIR}/Task+init.swift"
99100
"${CMAKE_CURRENT_BINARY_DIR}/TaskGroup+addTask.swift"
100101
"${CMAKE_CURRENT_BINARY_DIR}/Task+immediate.swift")
101102

‎Runtimes/Core/core/CMakeLists.txt

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -264,16 +264,24 @@ if(SwiftCore_ENABLE_COMMANDLINE_SUPPORT)
264264
endif()
265265

266266
if(SwiftCore_ENABLE_VECTOR_TYPES)
267-
gyb_expand(SIMDConcreteOperations.swift.gyb
268-
SIMDConcreteOperations.swift
267+
gyb_expand(SIMDFloatConcreteOperations.swift.gyb
268+
SIMDFloatConcreteOperations.swift
269+
FLAGS "-DCMAKE_SIZEOF_VOID_P=${SwiftCore_SIZEOF_POINTER}")
270+
gyb_expand(SIMDIntegerConcreteOperations.swift.gyb
271+
SIMDIntegerConcreteOperations.swift
272+
FLAGS "-DCMAKE_SIZEOF_VOID_P=${SwiftCore_SIZEOF_POINTER}")
273+
gyb_expand(SIMDMaskConcreteOperations.swift.gyb
274+
SIMDMaskConcreteOperations.swift
269275
FLAGS "-DCMAKE_SIZEOF_VOID_P=${SwiftCore_SIZEOF_POINTER}")
270276
gyb_expand(SIMDVectorTypes.swift.gyb
271277
SIMDVectorTypes.swift
272278
FLAGS "-DCMAKE_SIZEOF_VOID_P=${SwiftCore_SIZEOF_POINTER}")
273279

274280
target_sources(swiftCore PRIVATE
275281
SIMDVector.swift
276-
"${CMAKE_CURRENT_BINARY_DIR}/SIMDConcreteOperations.swift"
282+
"${CMAKE_CURRENT_BINARY_DIR}/SIMDFloatConcreteOperations.swift"
283+
"${CMAKE_CURRENT_BINARY_DIR}/SIMDIntegerConcreteOperations.swift"
284+
"${CMAKE_CURRENT_BINARY_DIR}/SIMDMaskConcreteOperations.swift"
277285
"${CMAKE_CURRENT_BINARY_DIR}/SIMDVectorTypes.swift")
278286
endif()
279287

‎Runtimes/Supplemental/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ set(COMMON_OPTIONS
3535
-DCMAKE_C_COMPILER_TARGET=${CMAKE_C_COMPILER_TARGET}
3636
-DCMAKE_CXX_COMPILER_TARGET=${CMAKE_CXX_COMPILER_TARGET}
3737
-DCMAKE_Swift_COMPILER_TARGET=${CMAKE_Swift_COMPILER_TARGET}
38+
-DCMAKE_FIND_PACKAGE_PREFER_CONFIG=${CMAKE_FIND_PACKAGE_PREFER_CONFIG}
3839
${SwiftCore_DIR_FLAG}
3940
${MAKE_PROGRAM_FLAG})
4041

‎Runtimes/Supplemental/Synchronization/cmake/caches/Vendors/Apple/apple-common.cmake

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "")
2+
set(BUILD_SHARED_LIBS YES CACHE BOOL "")
3+
set(SwiftSynchronization_INSTALL_NESTED_SUBDIR OFF CACHE BOOL "")
4+
5+
set(CMAKE_CXX_FLAGS_MINSIZEREL "-Os -g -DNDEBUG" CACHE STRING "")
6+
set(CMAKE_C_FLAGS_MINSIZEREL "-Os -g -DNDEBUG" CACHE STRING "")
7+
set(CMAKE_Swift_FLAGS_MINSIZEREL "-Osize -g" CACHE STRING "")

‎Runtimes/Supplemental/Synchronization/cmake/caches/Vendors/Apple/arm64-AppleTVOS-simulator.cmake

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
if(NOT DEFINED CMAKE_OSX_DEPLOYMENT_TARGET)
2+
message(SEND_ERROR "CMAKE_OSX_DEPLOYMENT_TARGET not defined")
3+
endif()
4+
5+
set(CMAKE_C_COMPILER_TARGET "arm64-apple-tvos${CMAKE_OSX_DEPLOYMENT_TARGET}-simulator" CACHE STRING "")
6+
set(CMAKE_CXX_COMPILER_TARGET "arm64-apple-tvos${CMAKE_OSX_DEPLOYMENT_TARGET}-simulator" CACHE STRING "")
7+
set(CMAKE_Swift_COMPILER_TARGET "arm64-apple-tvos${CMAKE_OSX_DEPLOYMENT_TARGET}-simulator" CACHE STRING "")
8+
9+
set(SwiftSynchronization_ARCH_SUBDIR arm64 CACHE STRING "")
10+
set(SwiftSynchronization_PLATFORM_SUBDIR appletvsimulator CACHE STRING "")
11+
12+
include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake")

‎Runtimes/Supplemental/Synchronization/cmake/caches/Vendors/Apple/arm64-AppleTVOS.cmake

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
if(NOT DEFINED CMAKE_OSX_DEPLOYMENT_TARGET)
2+
message(SEND_ERROR "CMAKE_OSX_DEPLOYMENT_TARGET not defined")
3+
endif()
4+
5+
set(CMAKE_C_COMPILER_TARGET "arm64-apple-tvos${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "")
6+
set(CMAKE_CXX_COMPILER_TARGET "arm64-apple-tvos${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "")
7+
set(CMAKE_Swift_COMPILER_TARGET "arm64-apple-tvos${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "")
8+
9+
set(SwiftSynchronization_ARCH_SUBDIR arm64 CACHE STRING "")
10+
set(SwiftSynchronization_PLATFORM_SUBDIR appletvos CACHE STRING "")
11+
12+
include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake")

‎Runtimes/Supplemental/Synchronization/cmake/caches/Vendors/Apple/arm64-BridgeOS.cmake

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
if(NOT DEFINED CMAKE_OSX_DEPLOYMENT_TARGET)
2+
message(SEND_ERROR "CMAKE_OSX_DEPLOYMENT_TARGET not defined")
3+
endif()
4+
5+
set(CMAKE_C_COMPILER_TARGET "arm64-apple-bridgeos${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "")
6+
set(CMAKE_CXX_COMPILER_TARGET "arm64-apple-bridgeos${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "")
7+
set(CMAKE_Swift_COMPILER_TARGET "arm64-apple-bridgeos${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "")
8+
9+
set(SwiftSynchronization_ARCH_SUBDIR arm64 CACHE STRING "")
10+
set(SwiftSynchronization_PLATFORM_SUBDIR freestanding CACHE STRING "")
11+
set(CMAKE_BUILD_TYPE MinSizeRel CACHE STRING "")
12+
13+
include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake")

‎Runtimes/Supplemental/Synchronization/cmake/caches/Vendors/Apple/arm64-MacOSX.cmake

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
if(NOT DEFINED CMAKE_OSX_DEPLOYMENT_TARGET)
2+
message(SEND_ERROR "CMAKE_OSX_DEPLOYMENT_TARGET not defined")
3+
endif()
4+
5+
if(NOT DEFINED SwiftSynchronization_TARGET_VARIANT_DEPLOYMENT_TARGET)
6+
message(SEND_ERROR "SwiftSynchronization_TARGET_VARIANT_DEPLOYMENT_TARGET not defined")
7+
endif()
8+
9+
set(CMAKE_C_COMPILER_TARGET "arm64-apple-macosx${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "")
10+
set(CMAKE_CXX_COMPILER_TARGET "arm64-apple-macosx${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "")
11+
set(CMAKE_Swift_COMPILER_TARGET "arm64-apple-macosx${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "")
12+
13+
set(SwiftSynchronization_ARCH_SUBDIR arm64 CACHE STRING "")
14+
set(SwiftSynchronization_PLATFORM_SUBDIR macosx CACHE STRING "")
15+
16+
set(SwiftSynchronization_COMPILER_VARIANT_TARGET "arm64-apple-ios${SwiftSynchronization_TARGET_VARIANT_DEPLOYMENT_TARGET}-macabi" CACHE STRING "")
17+
18+
include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake")

0 commit comments

Comments
 (0)