Build libclang_rt.builtin for wasip1-threads target separately

`compiler-rt/lib/builtins/atomic.c` has to be built with atomics feature
enabled for wasip1-threads target. We had been sharing the same
libclang_rt.builtins.a for both wasi and wasip1-threads targets, but
enabling atomics feature breaks non-threaded wasi target due to
unnecessary feature dependencies.
swiftlang/swift#73077 will build libclang_rt.builtins.a
separately and install wasi-sysroot under different directories for each
target.

Author: kateinoigakukun

schemes/main/build/build-target-toolchain.sh

@@ -40,7 +40,7 @@ build_target_toolchain() {
 
   rm -rf "$TRIPLE_DESTDIR/usr/lib/swift_static/clang/lib/$COMPILER_RT_OS_DIR"
   # XXX: Is this the right way to install compiler-rt?
-  cp -R "$TARGET_BUILD_ROOT/wasi-sysroot/lib/$COMPILER_RT_OS_DIR" "$TRIPLE_DESTDIR/usr/lib/swift_static/clang/lib/$COMPILER_RT_OS_DIR"
+  cp -R "$TARGET_BUILD_ROOT/wasi-sysroot/$TRIPLE/lib/$COMPILER_RT_OS_DIR" "$TRIPLE_DESTDIR/usr/lib/swift_static/clang/lib/$COMPILER_RT_OS_DIR"
 
   # FIXME: Clang resource directory installation is not the best way currently.
   # We currently have two copies of compiler headers copied from the base toolchain in
@@ -68,7 +68,7 @@ build_target_corelibs() {
     "$LLVM_BIN_DIR"
     "$CLANG_BIN_DIR"
     "$SWIFT_BIN_DIR"
-    "$WASI_SYSROOT_PATH"
+    "$WASI_SYSROOT_PATH/$TRIPLE"
   )
   "$SCHEMES_BUILD_PATH/build-foundation.sh" "${CORELIBS_ARGS[@]}" "$TRIPLE"
   "$SCHEMES_BUILD_PATH/build-xctest.sh" "${CORELIBS_ARGS[@]}" "$TRIPLE"
@@ -160,13 +160,13 @@ main() {
     "$OPTIONS_SWIFT_BIN"
   )
 
-  build_target_toolchain "${BUILD_TOOLS_ARGS[@]}" "wasm32-unknown-wasi" "wasmstdlib" "wasi"
-  build_target_toolchain "${BUILD_TOOLS_ARGS[@]}" "wasm32-unknown-wasip1-threads" "wasmthreadsstdlib" "wasip1"
+  build_target_toolchain "${BUILD_TOOLS_ARGS[@]}" "wasm32-wasi" "wasmstdlib" "wasi"
+  build_target_toolchain "${BUILD_TOOLS_ARGS[@]}" "wasm32-wasip1-threads" "wasmthreadsstdlib" "wasip1"
 
   rsync -av "$WASI_SYSROOT_PATH/" "$PACKAGING_DIR/wasi-sysroot/"
 
-  build_target_corelibs "${BUILD_TOOLS_ARGS[@]}" "wasm32-unknown-wasi"
-  build_target_corelibs "${BUILD_TOOLS_ARGS[@]}" "wasm32-unknown-wasip1-threads"
+  build_target_corelibs "${BUILD_TOOLS_ARGS[@]}" "wasm32-wasi"
+  build_target_corelibs "${BUILD_TOOLS_ARGS[@]}" "wasm32-wasip1-threads"
 }
 
 main "$@"

tools/build/package-toolchain

@@ -440,7 +440,7 @@ def main():
 
         toolchain_channel = derive_toolchain_channel(options.scheme)
         for target_triple in [
-            "wasm32-unknown-wasi", "wasm32-unknown-wasip1-threads"
+            "wasm32-wasi", "wasm32-wasip1-threads"
         ]:
             snapshot_info = SnapshotInfo(
                 now.year, now.month, now.day,