Merge pull request #398 from swiftwasm/update-base-tag/main-swift-DEVELOPMENT-SNAPSHOT-2024-08-07-a

Update base tag for main to swift-DEVELOPMENT-SNAPSHOT-2024-08-07-a

Author: swiftwasm-bot

schemes/main/build/build-foundation.sh

@@ -14,9 +14,6 @@ LIBXML2_PATH="$BUILD_SDK_PATH/libxml2-$TRIPLE"
 
 FOUNDATION_BUILD="$SOURCE_PATH/build/WebAssembly/foundation-$TRIPLE"
 
-mkdir -p $FOUNDATION_BUILD
-cd $FOUNDATION_BUILD
-
 swift_extra_flags=""
 c_extra_flags=""
 if [[ "$TRIPLE" == "wasm32-unknown-wasip1-threads" ]]; then
@@ -25,27 +22,33 @@ if [[ "$TRIPLE" == "wasm32-unknown-wasip1-threads" ]]; then
 fi
 
 cmake -G Ninja \
-  -DCMAKE_BUILD_TYPE="Release" \
-  -DCMAKE_SYSROOT="$WASI_SYSROOT_PATH" \
-  -DCMAKE_Swift_COMPILER="$SWIFT_BIN_DIR/swiftc" \
-  -DCMAKE_STAGING_PREFIX="$DESTINATION_TOOLCHAIN/usr" \
-  -DCMAKE_TOOLCHAIN_FILE="$SCHEME_BUILD_PATH/toolchain-wasi.cmake" \
-  -DTRIPLE="$TRIPLE" \
-  -DLLVM_BIN="$LLVM_BIN_DIR" \
-  -DCLANG_BIN="$CLANG_BIN_DIR" \
-  -DICU_ROOT="$BUILD_SDK_PATH/icu-$TRIPLE" \
-  -DLIBXML2_INCLUDE_DIR="$LIBXML2_PATH/include/libxml2" \
-  -DLIBXML2_LIBRARY="$LIBXML2_PATH/lib" \
-  -DBUILD_SHARED_LIBS=OFF \
-  -DBUILD_NETWORKING=OFF \
-  -DBUILD_TOOLS=OFF \
-  -DFOUNDATION_ENABLE_FOUNDATION_NETWORKING=OFF \
-  -DFOUNDATION_BUILD_TOOLS=OFF \
-  -DHAS_LIBDISPATCH_API=OFF \
-  -DCMAKE_Swift_COMPILER_FORCED=ON \
-  -DCMAKE_Swift_FLAGS="-sdk $WASI_SYSROOT_PATH -resource-dir $DESTINATION_TOOLCHAIN/usr/lib/swift_static $swift_extra_flags" \
-  -DCMAKE_C_FLAGS="-resource-dir $DESTINATION_TOOLCHAIN/usr/lib/swift_static/clang -B $LLVM_BIN_DIR $c_extra_flags" \
+  -D CMAKE_BUILD_TYPE="Release" \
+  -D CMAKE_SYSROOT="$WASI_SYSROOT_PATH" \
+  -D CMAKE_Swift_COMPILER="$SWIFT_BIN_DIR/swiftc" \
+  -D CMAKE_STAGING_PREFIX="$DESTINATION_TOOLCHAIN/usr" \
+  -D CMAKE_SYSTEM_NAME=WASI \
+  -D CMAKE_SYSTEM_PROCESSOR=wasm32 \
+  -D CMAKE_C_COMPILER_TARGET="$TRIPLE" \
+  -D CMAKE_CXX_COMPILER_TARGET="$TRIPLE" \
+  -D CMAKE_Swift_COMPILER_TARGET="$TRIPLE" \
+  -D CMAKE_C_COMPILER="$CLANG_BIN_DIR/clang" \
+  -D CMAKE_CXX_COMPILER="$CLANG_BIN_DIR/clang++" \
+  -D CMAKE_AR="$LLVM_BIN_DIR/llvm-ar" \
+  -D CMAKE_RANLIB="$LLVM_BIN_DIR/llvm-ranlib" \
+  -D LIBXML2_INCLUDE_DIR="$LIBXML2_PATH/include/libxml2" \
+  -D LIBXML2_LIBRARY="$LIBXML2_PATH/lib" \
+  -D BUILD_SHARED_LIBS=OFF \
+  -D FOUNDATION_BUILD_TOOLS=OFF \
+  -D CMAKE_Swift_COMPILER_FORCED=ON \
+  -D CMAKE_C_COMPILER_FORCED=ON \
+  -D CMAKE_CXX_COMPILER_FORCED=ON \
+  -D CMAKE_Swift_FLAGS="-sdk $WASI_SYSROOT_PATH -resource-dir $DESTINATION_TOOLCHAIN/usr/lib/swift_static $swift_extra_flags" \
+  -D CMAKE_C_FLAGS="-resource-dir $DESTINATION_TOOLCHAIN/usr/lib/swift_static/clang -B $LLVM_BIN_DIR $c_extra_flags" \
+  -D _SwiftCollections_SourceDIR="$SOURCE_PATH/swift-collections" \
+  -D _SwiftFoundation_SourceDIR="$SOURCE_PATH/swift-foundation" \
+  -D _SwiftFoundationICU_SourceDIR="$SOURCE_PATH/swift-foundation-icu" \
+  -B "$FOUNDATION_BUILD" \
   "${SOURCE_PATH}/swift-corelibs-foundation"
 
-ninja
-ninja install
+cmake --build "$FOUNDATION_BUILD"
+cmake --install "$FOUNDATION_BUILD"

schemes/main/manifest.json

@@ -1,5 +1,5 @@
 {
-  "base-tag": "swift-DEVELOPMENT-SNAPSHOT-2024-07-15-a",
+  "base-tag": "swift-DEVELOPMENT-SNAPSHOT-2024-08-07-a",
   "build-compiler": false,
   "icu4c": [
     "https://github.com/swiftwasm/icu4c-wasi/releases/download/0.10.0/icu4c-wasm32-unknown-wasi.tar.xz",

schemes/main/swift-collections/0001-CMake-Add-support-for-WebAssembly-target-architectur.patch

@@ -0,0 +1,29 @@
+From effb33569a926c12dc8e7bae979ac2075c219189 Mon Sep 17 00:00:00 2001
+From: Yuta Saito <[email protected]>
+Date: Fri, 26 Jul 2024 03:59:24 +0000
+Subject: [PATCH] [CMake] Add support for WebAssembly target architectures
+
+To repair the swift-corelibs-foundation build on WebAssembly, we need to
+add support for Wasm targets to swift-collections' CMake build system.
+---
+ cmake/modules/SwiftSupport.cmake | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/cmake/modules/SwiftSupport.cmake b/cmake/modules/SwiftSupport.cmake
+index 0ce99fb8..21b9d693 100644
+--- a/cmake/modules/SwiftSupport.cmake
++++ b/cmake/modules/SwiftSupport.cmake
+@@ -45,6 +45,10 @@ function(get_swift_host_arch result_var_name)
+     set("${result_var_name}" "i686" PARENT_SCOPE)
+   elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i686")
+     set("${result_var_name}" "i686" PARENT_SCOPE)
++  elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "wasm32")
++    set("${result_var_name}" "wasm32" PARENT_SCOPE)
++  elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "wasm64")
++    set("${result_var_name}" "wasm64" PARENT_SCOPE)
+   else()
+     message(FATAL_ERROR "Unrecognized architecture on host system: ${CMAKE_SYSTEM_PROCESSOR}")
+   endif()
+-- 
+2.43.2
+

schemes/main/swift-corelibs-foundation/0001-CMake-Use-LIBXML2_INCLUDE_DIR-instead-of-hardcoding-.patch

@@ -0,0 +1,30 @@
+From 3506f58a89de211823dcee98eb698dfcc1414fc5 Mon Sep 17 00:00:00 2001
+From: Yuta Saito <[email protected]>
+Date: Wed, 7 Aug 2024 05:10:42 +0000
+Subject: [PATCH] [CMake] Use LIBXML2_INCLUDE_DIR instead of hardcoding
+ /usr/include/libxml2
+
+`find_package(LibXml2 REQUIRED)` sets `LIBXML2_INCLUDE_DIR` to the correct
+include directory for the libxml2 headers. Use this variable instead of
+hardcoding `/usr/include/libxml2`. This allows the build to work with
+custom libxml2 builds on WASI.
+---
+ Sources/_CFXMLInterface/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Sources/_CFXMLInterface/CMakeLists.txt b/Sources/_CFXMLInterface/CMakeLists.txt
+index d6e63a3f..d550a520 100644
+--- a/Sources/_CFXMLInterface/CMakeLists.txt
++++ b/Sources/_CFXMLInterface/CMakeLists.txt
+@@ -20,7 +20,7 @@ target_include_directories(_CFXMLInterface
+         ../CoreFoundation/include
+     PRIVATE
+         ../CoreFoundation/internalInclude
+-        /usr/include/libxml2/)
++        ${LIBXML2_INCLUDE_DIR})
+ 
+ target_compile_options(_CFXMLInterface INTERFACE
+   "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xcc -fmodule-map-file=${CMAKE_CURRENT_SOURCE_DIR}/../CoreFoundation/include/module.modulemap>"
+-- 
+2.43.2
+

schemes/main/swift-corelibs-foundation/0002-CMake-Disable-libdispatch-threads-enable-some-emulat.patch

@@ -0,0 +1,84 @@
+From fef108320304306b2765df0f839dafabdbf714bd Mon Sep 17 00:00:00 2001
+From: Yuta Saito <[email protected]>
+Date: Wed, 7 Aug 2024 05:13:38 +0000
+Subject: [PATCH] [CMake] Disable libdispatch & threads, enable some emulations
+ on WASI
+
+This commit disables libdispatch and threads on WASI, and enables
+wasi-libc emulation features.
+---
+ CMakeLists.txt | 36 +++++++++++++++---------------------
+ 1 file changed, 15 insertions(+), 21 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index edb6cf06..2bce7426 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -94,7 +94,7 @@ endif()
+ 
+ # System dependencies
+ find_package(dispatch CONFIG)
+-if(NOT dispatch_FOUND)
++if(NOT dispatch_FOUND AND NOT CMAKE_SYSTEM_NAME STREQUAL WASI)
+     if(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "Android")
+         set(DEFAULT_DISPATCH_INCLUDE_PATH "/usr/lib/swift")
+     elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+@@ -113,7 +113,6 @@ find_package(CURL REQUIRED)
+ list(APPEND _Foundation_common_build_flags
+     "-DDEPLOYMENT_RUNTIME_SWIFT"
+     "-DCF_BUILDING_CF"
+-    "-DDEPLOYMENT_ENABLE_LIBDISPATCH"
+     "-DHAVE_STRUCT_TIMESPEC"
+     "-Wno-shorten-64-to-32"
+     "-Wno-deprecated-declarations"
+@@ -126,16 +125,10 @@ list(APPEND _Foundation_common_build_flags
+     "-Wno-switch"
+     "-fblocks")
+ 
+-if(CMAKE_SYSTEM_NAME STREQUAL "WASI")
+-  list(APPEND _Foundation_common_build_flags
+-    "-D_WASI_EMULATED_SIGNAL"
+-    "-DHAVE_STRLCPY"
+-    "-DHAVE_STRLCAT"
+-  )
+-else()
+-  list(APPEND _Foundation_common_build_flags
+-    "-DSWIFT_CORELIBS_FOUNDATION_HAS_THREADS"
+-  )
++if(NOT CMAKE_SYSTEM_NAME STREQUAL WASI)
++    list(APPEND _Foundation_common_build_flags
++        "-DDEPLOYMENT_ENABLE_LIBDISPATCH"
++        "-DSWIFT_CORELIBS_FOUNDATION_HAS_THREADS")
+ endif()
+ 
+ if(NOT "${CMAKE_C_SIMULATE_ID}" STREQUAL "MSVC")
+@@ -168,16 +161,17 @@ list(APPEND _Foundation_swift_build_flags
+     "-Xfrontend"
+     "-require-explicit-sendable")
+ 
+-if(CMAKE_SYSTEM_NAME STREQUAL "WASI")
+-  list(APPEND _Foundation_swift_build_flags
+-    "-D_WASI_EMULATED_SIGNAL"
+-    "-DHAVE_STRLCPY"
+-    "-DHAVE_STRLCAT"
+-  )
++if(CMAKE_SYSTEM_NAME STREQUAL WASI)
++    # Enable wasi-libc emulation features
++    set(WASI_EMULATION_DEFS _WASI_EMULATED_MMAN _WASI_EMULATED_SIGNAL _WASI_EMULATED_PROCESS_CLOCKS)
++    foreach(def ${WASI_EMULATION_DEFS})
++        list(APPEND _Foundation_swift_build_flags "SHELL:-Xcc -D${def}")
++        list(APPEND _Foundation_common_build_flags "-D${def}")
++    endforeach()
+ else()
+-  list(APPEND _Foundation_swift_build_flags
+-    "-DSWIFT_CORELIBS_FOUNDATION_HAS_THREADS"
+-  )
++    # Assume we have threads on other platforms
++    list(APPEND _Foundation_swift_build_flags
++        "-DSWIFT_CORELIBS_FOUNDATION_HAS_THREADS")
+ endif()
+ 
+ if(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "Android")
+-- 
+2.43.2
+

schemes/main/swift-corelibs-foundation/0003-CMake-Exclude-FoundationNetworking-and-_CFURLSession.patch

@@ -0,0 +1,36 @@
+From 27310f474957020b3083605083d86c93a812b42a Mon Sep 17 00:00:00 2001
+From: Yuta Saito <[email protected]>
+Date: Wed, 7 Aug 2024 05:15:39 +0000
+Subject: [PATCH] [CMake] Exclude FoundationNetworking and
+ _CFURLSessionInterface on WASI
+
+Because networking is not a part of WASI Preview 1. We can add it back
+when it is available.
+---
+ Sources/CMakeLists.txt | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/Sources/CMakeLists.txt b/Sources/CMakeLists.txt
+index 0ee266a4..29b92440 100644
+--- a/Sources/CMakeLists.txt
++++ b/Sources/CMakeLists.txt
+@@ -14,10 +14,14 @@
+ 
+ add_subdirectory(CoreFoundation)
+ add_subdirectory(_CFXMLInterface)
+-add_subdirectory(_CFURLSessionInterface)
++if(NOT CMAKE_SYSTEM_NAME STREQUAL "WASI")
++    add_subdirectory(_CFURLSessionInterface)
++endif()
+ add_subdirectory(Foundation)
+ add_subdirectory(FoundationXML)
+-add_subdirectory(FoundationNetworking)
++if(NOT CMAKE_SYSTEM_NAME STREQUAL "WASI")
++    add_subdirectory(FoundationNetworking)
++endif()
+ if(FOUNDATION_BUILD_TOOLS)
+ 	add_subdirectory(plutil)
+ endif()
+-- 
+2.43.2
+

schemes/main/swift-corelibs-foundation/0004-wasm-Include-CFPreferences.h-CFRunLoop.h-and-CFStrea.patch

@@ -0,0 +1,51 @@
+From 164af81d45dfff66d8d409f5f6bd946cb3987bc4 Mon Sep 17 00:00:00 2001
+From: Yuta Saito <[email protected]>
+Date: Wed, 7 Aug 2024 05:34:51 +0000
+Subject: [PATCH] [wasm] Include CFPreferences.h, CFRunLoop.h, and CFStream.h
+ in WASI builds
+
+Those headers has been imported by Swift side through
+`CoreFoundation/Base.subproj/SwiftRuntime/CoreFoundation.h` since
+44031b5a0e96ad91eada2261db2d3890818fe1d0 but we switched to
+use CoreFoundation.h directly after the recore, and the header was not
+updated in 44031b5a0e96ad91eada2261db2d3890818fe1d0
+---
+ Sources/CoreFoundation/include/CoreFoundation.h | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/Sources/CoreFoundation/include/CoreFoundation.h b/Sources/CoreFoundation/include/CoreFoundation.h
+index a66e7e61..64313f0b 100644
+--- a/Sources/CoreFoundation/include/CoreFoundation.h
++++ b/Sources/CoreFoundation/include/CoreFoundation.h
+@@ -58,9 +58,7 @@
+ #include "CFLocale.h"
+ #include "CFNumber.h"
+ #include "CFNumberFormatter.h"
+-#if !TARGET_OS_WASI
+ #include "CFPreferences.h"
+-#endif
+ #include "CFPropertyList.h"
+ #include "CFSet.h"
+ #include "CFString.h"
+@@ -76,13 +74,17 @@
+ 
+ #include "ForSwiftFoundationOnly.h"
+ 
+-#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_WIN32 || TARGET_OS_LINUX
++#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_WIN32 || TARGET_OS_LINUX || TARGET_OS_WASI
++#  if !TARGET_OS_WASI
+ #include "CFMessagePort.h"
+ #include "CFPlugIn.h"
++#  endif
+ #include "CFRunLoop.h"
+ #include "CFStream.h"
++#  if !TARGET_OS_WASI
+ #include "CFSocket.h"
+ #include "CFMachPort.h"
++#  endif
+ 
+ #include "CFAttributedString.h"
+ #include "CFNotificationCenter.h"
+-- 
+2.43.2
+

schemes/main/swift-corelibs-foundation/0005-wasm-Fix-the-new-CFString.c-compilation-error-on-WAS.patch

@@ -0,0 +1,26 @@
+From f91a759124ea50b491c3fe0fa8ecf34b39de6c20 Mon Sep 17 00:00:00 2001
+From: Yuta Saito <[email protected]>
+Date: Wed, 7 Aug 2024 05:39:34 +0000
+Subject: [PATCH] [wasm] Fix the new CFString.c compilation error on WASI
+
+Treat WASI as an usual Unix-like system
+---
+ Sources/CoreFoundation/CFString.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Sources/CoreFoundation/CFString.c b/Sources/CoreFoundation/CFString.c
+index 94a6c86d..f8899e15 100644
+--- a/Sources/CoreFoundation/CFString.c
++++ b/Sources/CoreFoundation/CFString.c
+@@ -35,7 +35,7 @@
+ #include <stdarg.h>
+ #include <stdio.h>
+ #include <string.h>
+-#if TARGET_OS_MAC || TARGET_OS_LINUX || TARGET_OS_BSD
++#if TARGET_OS_MAC || TARGET_OS_LINUX || TARGET_OS_BSD || TARGET_OS_WASI
+ #include <unistd.h>
+ #endif
+ #if TARGET_OS_WASI
+-- 
+2.43.2
+