From 4285591989568484ec1c7478da1a519d82d8f2b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
Date: Thu, 7 Feb 2019 12:35:33 +0200
Subject: [PATCH] configure: Don't set X86ASMFLAGS for windows on arm
This avoids enabling HAVE_X86ASM in these configurations, fixing
compilation.
Also set proper values for WINDOWS_ARCH in these configurations.
---
configure.ac | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 1e142f42c9c3..36a633542785 100644
--- a/configure.ac
+++ b/configure.ac
@@ -271,13 +271,23 @@ case "${host_os}" in
dnl NSIS/MSI Installer prefix and WIN64
dnl
case "${host_cpu}" in
- amd64|x86_64|aarch64)
+ aarch64)
+ HAVE_WIN64="1"
+ WINDOWS_ARCH="arm64"
+ PROGRAMFILES="PROGRAMFILES64"
+ LDFLAGS="${LDFLAGS} -Wl,--high-entropy-va -Wl,--image-base,0x140000000"
+ ;;
+ amd64|x86_64)
HAVE_WIN64="1"
WINDOWS_ARCH="x64"
PROGRAMFILES="PROGRAMFILES64"
LDFLAGS="${LDFLAGS} -Wl,--high-entropy-va -Wl,--image-base,0x140000000"
X86ASMFLAGS="-f win64"
;;
+ armv7)
+ WINDOWS_ARCH="arm"
+ PROGRAMFILES="PROGRAMFILES"
+ ;;
*)
WINDOWS_ARCH="x86"
PROGRAMFILES="PROGRAMFILES"
--
GitLab