[PATCH 2/2] configure: Default i386_CFLAGS to -march=x86-64 when also building x86_64 Wine.

[Matteo Bruni]

From: Matteo Bruni <[e-mail]>

---
 configure.ac | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index fea864659ff..13dcc0d8a90 100644
--- a/configure.ac
+++ b/configure.ac
@@ -414,6 +414,14 @@ do
   esac
 done
 
+for wine_arch in $cross_archs $extra_arch
+do
+    case $wine_arch in
+      x86_64)
+        x86_64_cpu_available=1 ;;
+    esac
+done
+
 for wine_arch in $cross_archs $extra_arch
 do
     case $wine_arch in
@@ -451,7 +459,12 @@ do
     CPPFLAGS=""
     case $wine_arch in
       i386)
-        AS_VAR_SET_IF([${wine_arch}_CFLAGS],[],[AS_VAR_SET([${wine_arch}_CFLAGS],[${CROSSCFLAGS:-"-g -O2 -msse"}])]) ;;
+        if test -n "$x86_64_cpu_available" -o -n "$with_wine64"
+        then
+            AS_VAR_SET_IF([${wine_arch}_CFLAGS],[],[AS_VAR_SET([${wine_arch}_CFLAGS],[${CROSSCFLAGS:-"-g -O2 -march=x86-64"}])])
+        else
+            AS_VAR_SET_IF([${wine_arch}_CFLAGS],[],[AS_VAR_SET([${wine_arch}_CFLAGS],[${CROSSCFLAGS:-"-g -O2 -msse"}])])
+        fi ;;
       *)
         AS_VAR_SET_IF([${wine_arch}_CFLAGS],[],[AS_VAR_SET([${wine_arch}_CFLAGS],[${CROSSCFLAGS:-"-g -O2"}])]) ;;
     esac
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/10953