Alexandre Julliard : configure: Require a PE compiler for 32-bit ARM.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 9b8409fce4da18e3d9a914a9e5831d10eb9052de
URL:    https://gitlab.winehq.org/wine/wine/-/commit/9b8409fce4da18e3d9a914a9e5831d1...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Wed Jan 31 12:09:02 2024 +0100

configure: Require a PE compiler for 32-bit ARM.

---

 configure    | 16 ++++++++--------
 configure.ac | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/configure b/configure
index 0e0d653b21c..ca82387287a 100755
--- a/configure
+++ b/configure
@@ -10765,7 +10765,7 @@ fi
     then
         if test ${enable_archs+y}
 then :
-  as_fn_error $? "MinGW $wine_arch compiler not found.
+  as_fn_error $? "$wine_arch PE cross-compiler not found.
 This is an error since --enable-archs=$wine_arch was requested." "$LINENO" 5
 fi
         continue
@@ -10813,7 +10813,7 @@ printf "%s\n" "none needed" >&6; } ;;
 printf "%s\n" "unsupported" >&6; }
            if test ${enable_archs+y}
 then :
-  as_fn_error $? "MinGW $wine_arch compiler supporting C99 not found.
+  as_fn_error $? "$wine_arch PE cross-compiler supporting C99 not found.
 This is an error since --enable-archs=$wine_arch was requested." "$LINENO" 5
 fi
            continue
@@ -10865,7 +10865,7 @@ then :
 else $as_nop
   if test ${enable_archs+y}
 then :
-  as_fn_error $? "The $wine_arch cross-compiler doesn't support SEH directives.
+  as_fn_error $? "The $wine_arch PE cross-compiler doesn't support SEH directives.
 This is an error since --enable-archs=$wine_arch was requested." "$LINENO" 5
 fi
                           continue
@@ -11964,11 +11964,11 @@ CC=$saved_CC
 CFLAGS=$saved_CFLAGS
 LDFLAGS=$saved_LDFLAGS
 
-if test $HOST_ARCH = aarch64
-then
-    test "x$PE_ARCHS" != x || as_fn_error $? "PE cross-compilation is required for ARM64, please install clang/llvm-dlltool/lld, or llvm-mingw." "$LINENO" 5
-    DLLEXT=""
-fi
+case $HOST_ARCH in
+  arm|aarch64)
+    test "x$PE_ARCHS" != x || as_fn_error $? "PE cross-compilation is required for $HOST_ARCH, please install clang/llvm-dlltool/lld, or llvm-mingw." "$LINENO" 5
+    DLLEXT="" ;;
+esac
 
 
 if test "x$with_system_dllpath" != "x" -a -n "$PE_ARCHS"
diff --git a/configure.ac b/configure.ac
index edba6e2f0fb..4bf9f76848e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -922,7 +922,7 @@ do
     if test -z "$target"
     then
         AS_VAR_SET_IF([enable_archs],
-            [AC_MSG_ERROR([MinGW $wine_arch compiler not found.
+            [AC_MSG_ERROR([$wine_arch PE cross-compiler not found.
 This is an error since --enable-archs=$wine_arch was requested.])])
         continue
     fi
@@ -946,7 +946,7 @@ This is an error since --enable-archs=$wine_arch was requested.])])
       x) AC_MSG_RESULT([none needed]) ;;
       xno) AC_MSG_RESULT([unsupported])
            AS_VAR_SET_IF([enable_archs],
-                [AC_MSG_ERROR([MinGW $wine_arch compiler supporting C99 not found.
+                [AC_MSG_ERROR([$wine_arch PE cross-compiler supporting C99 not found.
 This is an error since --enable-archs=$wine_arch was requested.])])
            continue
            ;;
@@ -963,7 +963,7 @@ This is an error since --enable-archs=$wine_arch was requested.])])
                AS_VAR_POPDEF([wine_cv_seh_support])
                AS_VAR_IF([res],[yes],[],
                          [AS_VAR_SET_IF([enable_archs],
-                             [AC_MSG_ERROR([The $wine_arch cross-compiler doesn't support SEH directives.
+                             [AC_MSG_ERROR([The $wine_arch PE cross-compiler doesn't support SEH directives.
 This is an error since --enable-archs=$wine_arch was requested.])])
                           continue])])
 
@@ -1040,11 +1040,11 @@ CC=$saved_CC
 CFLAGS=$saved_CFLAGS
 LDFLAGS=$saved_LDFLAGS
 
-if test $HOST_ARCH = aarch64
-then
-    test "x$PE_ARCHS" != x || AC_MSG_ERROR([PE cross-compilation is required for ARM64, please install clang/llvm-dlltool/lld, or llvm-mingw.])
-    DLLEXT=""
-fi
+case $HOST_ARCH in
+  arm|aarch64)
+    test "x$PE_ARCHS" != x || AC_MSG_ERROR([PE cross-compilation is required for $HOST_ARCH, please install clang/llvm-dlltool/lld, or llvm-mingw.])
+    DLLEXT="" ;;
+esac
 
 dnl **** External libraries ****