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

@@ -27,8 +27,9 @@ build_target_toolchain() {
   local CLANG_BIN_DIR="$2"
   local SWIFT_BIN_DIR="$3"
   local TRIPLE="$4"
-  local STDLIB_PRODUCT="$5"
-  local COMPILER_RT_OS_DIR="$6"
+  local SHORT_TRIPLE="$5"
+  local STDLIB_PRODUCT="$6"
+  local COMPILER_RT_OS_DIR="$7"
 
   local HOST_SUFFIX
   HOST_SUFFIX=$(find "$TARGET_BUILD_ROOT" -name "wasmstdlib-*" -exec basename {} \; | sed 's/wasmstdlib-//')
@@ -40,7 +41,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/$SHORT_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
@@ -61,14 +62,15 @@ build_target_corelibs() {
   local CLANG_BIN_DIR="$2"
   local SWIFT_BIN_DIR="$3"
   local TRIPLE="$4"
+  local SHORT_TRIPLE="$5"
 
   local TRIPLE_DESTDIR="$TARGET_TOOLCHAIN_DESTDIR/$TRIPLE"
   local CORELIBS_ARGS=(
     "$TRIPLE_DESTDIR"
     "$LLVM_BIN_DIR"
     "$CLANG_BIN_DIR"
     "$SWIFT_BIN_DIR"
-    "$WASI_SYSROOT_PATH"
+    "$WASI_SYSROOT_PATH/$SHORT_TRIPLE"
   )
   "$SCHEMES_BUILD_PATH/build-foundation.sh" "${CORELIBS_ARGS[@]}" "$TRIPLE"
   "$SCHEMES_BUILD_PATH/build-xctest.sh" "${CORELIBS_ARGS[@]}" "$TRIPLE"
@@ -160,13 +162,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-unknown-wasi" "wasm32-wasi" "wasmstdlib" "wasi"
+  build_target_toolchain "${BUILD_TOOLS_ARGS[@]}" "wasm32-unknown-wasip1-threads" "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-unknown-wasi" "wasm32-wasi"
+  build_target_corelibs "${BUILD_TOOLS_ARGS[@]}" "wasm32-unknown-wasip1-threads" "wasm32-wasip1-threads"
 }
 
 main "$@"