mirror of
https://github.com/mstorsjo/llvm-mingw
synced 2026-06-21 14:01:00 +00:00
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.
This commit is contained in:
+1
-1
@@ -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
|
||||
|
||||
|
||||
+1
-1
@@ -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
|
||||
|
||||
+1
-1
@@ -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/
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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)"
|
||||
|
||||
|
||||
+1
-1
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
+1
-1
@@ -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"
|
||||
|
||||
+1
-1
@@ -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
|
||||
|
||||
+1
-1
@@ -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
|
||||
|
||||
+1
-1
@@ -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
|
||||
|
||||
|
||||
+1
-1
@@ -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
|
||||
|
||||
@@ -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")
|
||||
|
||||
@@ -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")
|
||||
|
||||
+1
-1
@@ -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
|
||||
|
||||
@@ -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*)
|
||||
|
||||
Reference in New Issue
Block a user