Merge 8.7

1 files changed, 32 insertions, 13 deletions

diff --git a/win/configure b/win/configure
index 4912ba2..bbe0562 100755
--- a/win/configure
+++ b/win/configure
@@ -4084,12 +4084,12 @@ printf "%s\n" "$ac_cv_cross" >&6; }
 		RANLIB="x86_64-w64-mingw32-ranlib"
 		RC="x86_64-w64-mingw32-windres"
 	    ;;
-	    arm64)
-		CC="arm64-w64-mingw32-${CC}"
-		LD="arm64-w64-mingw32-ld"
-		AR="arm64-w64-mingw32-ar"
-		RANLIB="arm64-w64-mingw32-ranlib"
-		RC="arm64-w64-mingw32-windres"
+	    arm64|aarch64)
+		CC="aarch64-w64-mingw32-${CC}"
+		LD="aarch64-w64-mingw32-ld"
+		AR="aarch64-w64-mingw32-ar"
+		RANLIB="aarch64-w64-mingw32-ranlib"
+		RC="aarch64-w64-mingw32-windres"
 	    ;;
 	    *)
 		CC="i686-w64-mingw32-${CC}"
@@ -4476,7 +4476,7 @@ printf "%s\n" "using shared flags" >&6; }
 		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:    Using 64-bit $MACHINE mode" >&5
 printf "%s\n" "   Using 64-bit $MACHINE mode" >&6; }
 		;;
-	    arm64)
+	    arm64|aarch64)
 		MACHINE="ARM64"
 		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:    Using ARM64 $MACHINE mode" >&5
 printf "%s\n" "   Using ARM64 $MACHINE mode" >&6; }
@@ -4554,7 +4554,7 @@ printf "%s\n" "using shared flags" >&6; }
 		amd64|x64|yes)
 		    MACHINE="AMD64" ; # assume AMD64 as default 64-bit build
 		    ;;
-		arm64)
+		arm64|aarch64)
 		    MACHINE="ARM64"
 		    ;;
 		ia64)
@@ -4578,8 +4578,7 @@ printf "%s\n" "   Using 64-bit $MACHINE mode" >&6; }
 	if test "$do64bit" != "no" ; then
 	    RC="rc"
 	    CFLAGS_DEBUG="-nologo -Zi -Od ${runtime}d"
-	    # Do not use -O2 for Win64 - this has proved buggy in code gen.
-	    CFLAGS_OPTIMIZE="-nologo -O1 ${runtime}"
+	    CFLAGS_OPTIMIZE="-nologo -O2 ${runtime}"
 	    lflags="${lflags} -nologo -MACHINE:${MACHINE}"
 	    LINKBIN="link"
 	    # Avoid 'unresolved external symbol __security_cookie' errors.
@@ -4929,18 +4928,38 @@ then :
 
 printf "%s\n" "#define MP_64BIT 1" >>confdefs.h
 
-    if test "$GCC" == "yes"
+    if test "$do64bit" = "arm64"
+then :
+
+      if test "$GCC" == "yes"
 then :
 
-      ZLIB_LIBS=\${ZLIB_DIR_NATIVE}/win64/libz.dll.a
+        ZLIB_LIBS=\${ZLIB_DIR_NATIVE}/win64-arm/libz.dll.a
 
+
+else $as_nop
+
+        ZLIB_LIBS=\${ZLIB_DIR_NATIVE}/win64-arm/zdll.lib
+
+
+fi
       TOMMATH_LIBS=\${TOMMATH_DIR_NATIVE}/win64/libtommath.dll.a
 
 
 else $as_nop
 
-      ZLIB_LIBS=\${ZLIB_DIR_NATIVE}/win64/zdll.lib
+      if test "$GCC" == "yes"
+then :
+
+        ZLIB_LIBS=\${ZLIB_DIR_NATIVE}/win64/libz.dll.a
+
+
+else $as_nop
+
+        ZLIB_LIBS=\${ZLIB_DIR_NATIVE}/win64/zdll.lib
 
+
+fi
       TOMMATH_LIBS=\${TOMMATH_DIR_NATIVE}/win64/tommath.lib