Rebase against adffa11609093c3c21cf43970bbecda1b2c43eb1.

This commit is contained in:
Alistair Leslie-Hughes
2021-07-07 12:21:45 +10:00
parent fcf7b80107
commit a0716c9cfe
8 changed files with 77 additions and 74 deletions

View File

@@ -1,4 +1,4 @@
From d99a6180cdca6274f1a8b868c38a89883daf6e23 Mon Sep 17 00:00:00 2001
From 40088e644ecba6005de000c49b65cb168cc9ad5d Mon Sep 17 00:00:00 2001
From: Martin Storsjo <martin@martin.st>
Date: Wed, 21 Jun 2017 11:42:40 +0300
Subject: [PATCH] configure: Avoid clobbering x18 on arm64 within wine
@@ -16,17 +16,20 @@ been built with the same flag.
Signed-off-by: Martin Storsjo <martin@martin.st>
---
configure.ac | 4 ++++
1 file changed, 4 insertions(+)
configure.ac | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/configure.ac b/configure.ac
index d1502bacf7..6cf838ef09 100644
index b0981767977..67e82744dae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -212,6 +212,10 @@ case $host in
@@ -219,8 +219,13 @@ case $host in
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h>]], [[void func(__builtin_ms_va_list *args);]])],
[wine_cv_builtin_ms_va_list=yes],[wine_cv_builtin_ms_va_list=no])])
test $wine_cv_builtin_ms_va_list != no || AC_MSG_ERROR([You need clang >= 5.0 to build Wine for arm64.])
+
enable_wow64=${enable_wow64:-yes}
enable_wow64win=${enable_wow64win:-yes}
+ # Avoid clobbering the x18 register which is reserved in windows.
+ # This isn't complete/enough unless all of the system libraries have
+ # been built with the same flag though.
@@ -35,5 +38,5 @@ index d1502bacf7..6cf838ef09 100644
i[[3456789]]86*)
enable_win16=${enable_win16:-yes}
--
2.17.1
2.30.2