From cb92de78e709ff04c4ebf148d84539abe62e94c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
Date: Tue, 30 Jul 2024 14:54:07 +0300
Subject: [PATCH] Include arm64ec in the lists of all architectures

Since LLVM 21.x, the upstream support for ARM64EC in LLD and
compiler-rt is complete enough for us to be able to build it.
---
 Dockerfile                      | 2 +-
 Dockerfile.cross                | 2 +-
 Dockerfile.dev                  | 2 +-
 Dockerfile.system-clang         | 2 +-
 Dockerfile.toolchain            | 2 +-
 build-compiler-rt.sh            | 2 +-
 build-libcxx.sh                 | 2 +-
 build-mingw-w64-libraries.sh    | 2 +-
 build-mingw-w64-tools.sh        | 2 +-
 build-mingw-w64.sh              | 2 +-
 build-openmp.sh                 | 2 +-
 install-wrappers.sh             | 2 +-
 pgo-training.make               | 2 +-
 pgo-training.sh                 | 2 +-
 prepare-cross-toolchain-unix.sh | 2 +-
 prepare-cross-toolchain.sh      | 2 +-
 run-tests.sh                    | 2 +-
 test-libcxx-module.sh           | 2 +-
 18 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 82486c2..05237bc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,7 +16,7 @@ WORKDIR /build
 
 ENV TOOLCHAIN_PREFIX=/opt/llvm-mingw
 
-ARG TOOLCHAIN_ARCHS="i686 x86_64 armv7 aarch64"
+ARG TOOLCHAIN_ARCHS="i686 x86_64 armv7 aarch64 arm64ec"
 
 ARG DEFAULT_CRT=ucrt
 
diff --git a/Dockerfile.cross b/Dockerfile.cross
index 3329647..7ce3cc9 100644
--- a/Dockerfile.cross
+++ b/Dockerfile.cross
@@ -49,7 +49,7 @@ RUN ./build-lldb-mi.sh $CROSS_TOOLCHAIN_PREFIX --host=$HOST
 COPY strip-llvm.sh .
 RUN ./strip-llvm.sh $CROSS_TOOLCHAIN_PREFIX --host=$HOST
 
-ARG TOOLCHAIN_ARCHS="i686 x86_64 armv7 aarch64"
+ARG TOOLCHAIN_ARCHS="i686 x86_64 armv7 aarch64 arm64ec"
 
 COPY build-mingw-w64.sh build-mingw-w64-tools.sh ./
 RUN ./build-mingw-w64-tools.sh $CROSS_TOOLCHAIN_PREFIX --skip-include-triplet-prefix --host=$HOST
diff --git a/Dockerfile.dev b/Dockerfile.dev
index 8891b2c..989078e 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -34,7 +34,7 @@ RUN ./build-lldb-mi.sh $TOOLCHAIN_PREFIX
 COPY strip-llvm.sh ./
 RUN ./strip-llvm.sh $TOOLCHAIN_PREFIX
 
-ARG TOOLCHAIN_ARCHS="i686 x86_64 armv7 aarch64"
+ARG TOOLCHAIN_ARCHS="i686 x86_64 armv7 aarch64 arm64ec"
 
 # Install the usual $TUPLE-clang binaries
 COPY wrappers/*.sh wrappers/*.c wrappers/*.h wrappers/*.cfg ./wrappers/
diff --git a/Dockerfile.system-clang b/Dockerfile.system-clang
index 98f3abb..c8091d0 100644
--- a/Dockerfile.system-clang
+++ b/Dockerfile.system-clang
@@ -22,7 +22,7 @@ WORKDIR /build
 
 ENV TOOLCHAIN_PREFIX=/opt/llvm-mingw
 
-ARG TOOLCHAIN_ARCHS="i686 x86_64 armv7 aarch64"
+ARG TOOLCHAIN_ARCHS="i686 x86_64 armv7 aarch64 arm64ec"
 
 ARG DEFAULT_CRT=ucrt
 
diff --git a/Dockerfile.toolchain b/Dockerfile.toolchain
index 5ad3a8d..ccb7097 100644
--- a/Dockerfile.toolchain
+++ b/Dockerfile.toolchain
@@ -16,7 +16,7 @@ WORKDIR /build
 
 ENV TOOLCHAIN_PREFIX=/opt/llvm-mingw
 
-ARG TOOLCHAIN_ARCHS="i686 x86_64 armv7 aarch64"
+ARG TOOLCHAIN_ARCHS="i686 x86_64 armv7 aarch64 arm64ec"
 
 # Copy prebuilt toolchains for the current architecture.
 # Test executing a binary, to make sure that it works (i.e. it is not built
diff --git a/build-compiler-rt.sh b/build-compiler-rt.sh
index 89c8d72..3e61eeb 100755
--- a/build-compiler-rt.sh
+++ b/build-compiler-rt.sh
@@ -60,7 +60,7 @@ mkdir -p "$PREFIX"
 PREFIX="$(cd "$PREFIX" && pwd)"
 export PATH="$PREFIX/bin:$PATH"
 
-: ${ARCHS:=${TOOLCHAIN_ARCHS-i686 x86_64 armv7 aarch64}}
+: ${ARCHS:=${TOOLCHAIN_ARCHS-i686 x86_64 armv7 aarch64 arm64ec}}
 
 CLANG_RESOURCE_DIR="$("$PREFIX/bin/clang" --print-resource-dir)"
 
diff --git a/build-libcxx.sh b/build-libcxx.sh
index 77c867d..205712a 100755
--- a/build-libcxx.sh
+++ b/build-libcxx.sh
@@ -48,7 +48,7 @@ PREFIX="$(cd "$PREFIX" && pwd)"
 
 export PATH="$PREFIX/bin:$PATH"
 
-: ${ARCHS:=${TOOLCHAIN_ARCHS-i686 x86_64 armv7 aarch64}}
+: ${ARCHS:=${TOOLCHAIN_ARCHS-i686 x86_64 armv7 aarch64 arm64ec}}
 
 if [ ! -d llvm-project/libunwind ] || [ -n "$SYNC" ]; then
     CHECKOUT_ONLY=1 ./build-llvm.sh
diff --git a/build-mingw-w64-libraries.sh b/build-mingw-w64-libraries.sh
index dd121ea..6923558 100755
--- a/build-mingw-w64-libraries.sh
+++ b/build-mingw-w64-libraries.sh
@@ -44,7 +44,7 @@ unset CC
 : ${CORES:=$(nproc 2>/dev/null)}
 : ${CORES:=$(sysctl -n hw.ncpu 2>/dev/null)}
 : ${CORES:=4}
-: ${ARCHS:=${TOOLCHAIN_ARCHS-i686 x86_64 armv7 aarch64}}
+: ${ARCHS:=${TOOLCHAIN_ARCHS-i686 x86_64 armv7 aarch64 arm64ec}}
 
 if [ ! -d mingw-w64 ] || [ -n "$SYNC" ]; then
     CHECKOUT_ONLY=1 ./build-mingw-w64.sh
diff --git a/build-mingw-w64-tools.sh b/build-mingw-w64-tools.sh
index c6ce7fe..d698fd0 100755
--- a/build-mingw-w64-tools.sh
+++ b/build-mingw-w64-tools.sh
@@ -56,7 +56,7 @@ fi
 : ${CORES:=$(nproc 2>/dev/null)}
 : ${CORES:=$(sysctl -n hw.ncpu 2>/dev/null)}
 : ${CORES:=4}
-: ${ARCHS:=${TOOLCHAIN_ARCHS-i686 x86_64 armv7 aarch64}}
+: ${ARCHS:=${TOOLCHAIN_ARCHS-i686 x86_64 armv7 aarch64 arm64ec}}
 : ${TARGET_OSES:=${TOOLCHAIN_TARGET_OSES-mingw32 mingw32uwp}}
 
 if [ -n "$HOST" ]; then
diff --git a/build-mingw-w64.sh b/build-mingw-w64.sh
index a435185..bb632fd 100755
--- a/build-mingw-w64.sh
+++ b/build-mingw-w64.sh
@@ -87,7 +87,7 @@ unset CC
 : ${CORES:=$(nproc 2>/dev/null)}
 : ${CORES:=$(sysctl -n hw.ncpu 2>/dev/null)}
 : ${CORES:=4}
-: ${ARCHS:=${TOOLCHAIN_ARCHS-i686 x86_64 armv7 aarch64}}
+: ${ARCHS:=${TOOLCHAIN_ARCHS-i686 x86_64 armv7 aarch64 arm64ec}}
 
 if [ -z "$SKIP_INCLUDE_TRIPLET_PREFIX" ]; then
     HEADER_ROOT="$PREFIX/generic-w64-mingw32"
diff --git a/build-openmp.sh b/build-openmp.sh
index c265d8b..9504927 100755
--- a/build-openmp.sh
+++ b/build-openmp.sh
@@ -42,7 +42,7 @@ PREFIX="$(cd "$PREFIX" && pwd)"
 
 export PATH="$PREFIX/bin:$PATH"
 
-: ${ARCHS:=${TOOLCHAIN_ARCHS-i686 x86_64 armv7 aarch64}}
+: ${ARCHS:=${TOOLCHAIN_ARCHS-i686 x86_64 armv7 aarch64 arm64ec}}
 
 if [ ! -d llvm-project/openmp ] || [ -n "$SYNC" ]; then
     CHECKOUT_ONLY=1 ./build-llvm.sh
diff --git a/install-wrappers.sh b/install-wrappers.sh
index 5f51734..0355f71 100755
--- a/install-wrappers.sh
+++ b/install-wrappers.sh
@@ -42,7 +42,7 @@ fi
 mkdir -p "$PREFIX"
 PREFIX="$(cd "$PREFIX" && pwd)"
 
-: ${ARCHS:=${TOOLCHAIN_ARCHS-i686 x86_64 armv7 aarch64}}
+: ${ARCHS:=${TOOLCHAIN_ARCHS-i686 x86_64 armv7 aarch64 arm64ec}}
 : ${TARGET_OSES:=${TOOLCHAIN_TARGET_OSES-mingw32 mingw32uwp}}
 
 if [ -n "$HOST" ] && [ -z "$CC" ]; then
diff --git a/pgo-training.make b/pgo-training.make
index b26bc02..5b6e040 100755
--- a/pgo-training.make
+++ b/pgo-training.make
@@ -38,7 +38,7 @@ libcxxtest-opt-%.exe: $(LIBCXXTEST)
 libcxxtest-%.exe: $(LIBCXXTEST)
 	$(CXX) -target $*-w64-mingw32 $(CFLAGS) $+ -o $@ -Illvm-project/libcxx/test/support
 
-ARCHS ?= i686 x86_64 armv7 aarch64
+ARCHS ?= i686 x86_64 armv7 aarch64 arm64ec
 
 TARGETS = hello-exception hello-exception-opt
 
diff --git a/pgo-training.sh b/pgo-training.sh
index 918e0e5..03b30ff 100755
--- a/pgo-training.sh
+++ b/pgo-training.sh
@@ -38,7 +38,7 @@ fi
 : ${CORES:=$(nproc 2>/dev/null)}
 : ${CORES:=$(sysctl -n hw.ncpu 2>/dev/null)}
 : ${CORES:=4}
-: ${ARCHS:=${TOOLCHAIN_ARCHS-i686 x86_64 armv7 aarch64}}
+: ${ARCHS:=${TOOLCHAIN_ARCHS-i686 x86_64 armv7 aarch64 arm64ec}}
 
 download() {
     if command -v curl >/dev/null; then
diff --git a/prepare-cross-toolchain-unix.sh b/prepare-cross-toolchain-unix.sh
index ce00361..194ca5f 100755
--- a/prepare-cross-toolchain-unix.sh
+++ b/prepare-cross-toolchain-unix.sh
@@ -23,7 +23,7 @@ fi
 SRC="$1"
 DEST="$2"
 
-: ${ARCHS:=${TOOLCHAIN_ARCHS-i686 x86_64 armv7 aarch64}}
+: ${ARCHS:=${TOOLCHAIN_ARCHS-i686 x86_64 armv7 aarch64 arm64ec}}
 
 CLANG_RESOURCE_DIR="$("$SRC/bin/clang" --print-resource-dir)"
 CLANG_VERSION=$(basename "$CLANG_RESOURCE_DIR")
diff --git a/prepare-cross-toolchain.sh b/prepare-cross-toolchain.sh
index de05476..cfbcf6f 100755
--- a/prepare-cross-toolchain.sh
+++ b/prepare-cross-toolchain.sh
@@ -24,7 +24,7 @@ SRC="$1"
 DEST="$2"
 CROSS_ARCH="$3"
 
-: ${ARCHS:=${TOOLCHAIN_ARCHS-i686 x86_64 armv7 aarch64}}
+: ${ARCHS:=${TOOLCHAIN_ARCHS-i686 x86_64 armv7 aarch64 arm64ec}}
 
 CLANG_RESOURCE_DIR="$("$SRC/bin/clang" --print-resource-dir)"
 CLANG_VERSION=$(basename "$CLANG_RESOURCE_DIR")
diff --git a/run-tests.sh b/run-tests.sh
index ca4bd17..a147930 100755
--- a/run-tests.sh
+++ b/run-tests.sh
@@ -27,7 +27,7 @@ export PATH=$PREFIX/bin:$PATH
 : ${CORES:=$(nproc 2>/dev/null)}
 : ${CORES:=$(sysctl -n hw.ncpu 2>/dev/null)}
 : ${CORES:=4}
-: ${ARCHS:=${TOOLCHAIN_ARCHS-i686 x86_64 armv7 aarch64}}
+: ${ARCHS:=${TOOLCHAIN_ARCHS-i686 x86_64 armv7 aarch64 arm64ec}}
 
 MAKE=make
 if command -v gmake >/dev/null; then
diff --git a/test-libcxx-module.sh b/test-libcxx-module.sh
index 4fe3856..e618395 100755
--- a/test-libcxx-module.sh
+++ b/test-libcxx-module.sh
@@ -24,7 +24,7 @@ PREFIX="$1"
 PREFIX="$(cd "$PREFIX" && pwd)"
 export PATH=$PREFIX/bin:$PATH
 
-: ${ARCHS:=${TOOLCHAIN_ARCHS-i686 x86_64 armv7 aarch64}}
+: ${ARCHS:=${TOOLCHAIN_ARCHS-i686 x86_64 armv7 aarch64 arm64ec}}
 
 case $(uname) in
 MINGW*|MSYS*|CYGWIN*)