Commit 5004e6bc authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard

configure: Add arm64ec PE target support.

parent dd009533
......@@ -213,7 +213,8 @@ AC_CACHE_CHECK([whether $CC supports $1], ac_var,
ac_wine_try_cflags_saved_exeext=$ac_exeext
CFLAGS="$CFLAGS -nostdlib -nodefaultlibs $1"
ac_exeext=".exe"
AC_LINK_IFELSE([AC_LANG_SOURCE([[int __cdecl mainCRTStartup(void) { return 0; }]])],
AC_LINK_IFELSE([AC_LANG_SOURCE([[void *__os_arm64x_dispatch_ret = 0;
int __cdecl mainCRTStartup(void) { return 0; }]])],
[AS_VAR_SET(ac_var,yes)], [AS_VAR_SET(ac_var,no)])
CFLAGS=$ac_wine_try_cflags_saved
ac_exeext=$ac_wine_try_cflags_saved_exeext])
......
......@@ -187,7 +187,7 @@ enable_win64=${enable_win64:-no}
enable_wow64=${enable_wow64:-aarch64,x86_64}
enable_wow64win=${enable_wow64win:-aarch64,x86_64}
enable_wow64cpu=${enable_wow64cpu:-x86_64}
enable_vcruntime140_1=${enable_vcruntime140_1:-x86_64}
enable_vcruntime140_1=${enable_vcruntime140_1:-x86_64,arm64ec}
dnl Disable winetest too if tests are disabled
enable_winetest=${enable_winetest:-$enable_tests}
......@@ -211,7 +211,7 @@ case "$host_cpu" in
i[[3456789]]86*) HOST_ARCH=i386 ;;
x86_64) HOST_ARCH=x86_64 ;;
esac
m4_set_add_all([_AC_SUBST_VARS],[HOST_ARCH]m4_foreach([cpu],[aarch64,arm,i386,x86_64],
m4_set_add_all([_AC_SUBST_VARS],[HOST_ARCH]m4_foreach([cpu],[aarch64,arm,arm64ec,i386,x86_64],
[m4_foreach([var],[CC,CFLAGS,EXTRACFLAGS,LDFLAGS,DEBUG,TARGET,DELAYLOADFLAG,DISABLED_SUBDIRS],[,cpu[_]var])]))
AC_CACHE_CHECK([for the directory containing the Wine tools], wine_cv_toolsdir,
......@@ -818,7 +818,7 @@ AS_VAR_SET_IF([enable_archs],
for arch
do
case $arch in
i386|x86_64|arm|aarch64) cross_archs="$cross_archs $arch" ;;
i386|x86_64|arm|aarch64|arm64ec) cross_archs="$cross_archs $arch" ;;
*) AC_MSG_ERROR([Unknown cross-compilation architecture '$arch']) ;;
esac
done],
......@@ -837,6 +837,9 @@ do
aarch64)
AC_CHECK_PROGS(aarch64_CC,[aarch64-w64-mingw32-clang aarch64-w64-mingw32-gcc clang],[false])
;;
arm64ec)
AC_CHECK_PROGS(arm64ec_CC,[arm64ec-w64-mingw32-clang arm64ec-w64-mingw32-gcc clang],[false])
;;
arm)
AC_CHECK_PROGS(arm_CC,[armv7-w64-mingw32-clang armv7-w64-mingw32-gcc clang],[false])
;;
......
......@@ -126,7 +126,7 @@ enum install_rules { INSTALL_LIB, INSTALL_DEV, INSTALL_TEST, NB_INSTALL_RULES };
static const char *install_targets[NB_INSTALL_RULES] = { "install-lib", "install-dev", "install-test" };
static const char *install_variables[NB_INSTALL_RULES] = { "INSTALL_LIB", "INSTALL_DEV", "INSTALL_TEST" };
#define MAX_ARCHS 5
#define MAX_ARCHS 6
/* variables common to all makefiles */
static struct strarray archs;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment