Patch FLINT to not include immintrin.h

Author: oscarbenjamin

bin/build_dependencies_unix.sh

@@ -20,6 +20,7 @@ SKIP_GMP=no
 SKIP_MPFR=no
 PATCH_GMP_C23=no
 PATCH_LDD=no
+PATCH_IMMINTRIN=no
 GMP_FAT_ARG="--enable-fat"
 HOST_ARG=
 
@@ -44,6 +45,7 @@ do
       echo "  --skip-mpfr       - skip building MPFR"
       echo "  --disable-fat     - disable building fat binaries"
       echo "  --patch-ldd       - patch flint shared linking for mingw on arm64"
+      echo "  --patch-immintrin - patch flint arm64 msvc header to avoid immintrin.h"
       echo
       echo "Legacy options:"
       echo "  --gmp gmp         - build based on GMP (default)"
@@ -111,6 +113,11 @@ do
       PATCH_LDD=yes
       shift
     ;;
+    --patch-immintrin)
+      # Needed only for the FLINT headers consumed by MSVC on Windows arm64.
+      PATCH_IMMINTRIN=yes
+      shift
+    ;;
     --use-gmp-github-mirror)
       USE_GMP_GITHUB_MIRROR=yes
       shift
@@ -333,6 +340,13 @@ cd flint-$FLINTVER
     echo --------------------------------------------
     patch -N -Z -p1 < ../../../bin/patch-flint-windows-arm64-link.diff
   fi
+  if [ "$PATCH_IMMINTRIN" = "yes" ]; then
+    echo
+    echo --------------------------------------------
+    echo "           patching FLINT"
+    echo --------------------------------------------
+    patch -N -Z -p1 < ../../../bin/patch-flint-windows-arm64-immintrin.diff
+  fi
   ./bootstrap.sh
   ./configure --prefix=$PREFIX\
     --host=$HOST_ARG\

bin/cibw_before_all_windows_arm64.sh

@@ -21,6 +21,7 @@ bin/build_dependencies_unix.sh \
     --host aarch64-w64-mingw32\
     --patch-C23\
     --patch-ldd\
+    --patch-immintrin\
     #
 
 mkdir -p .local/lib

bin/patch-flint-windows-arm64-immintrin.diff

@@ -0,0 +1,12 @@
+diff --git a/src/longlong_msc_arm64.h b/src/longlong_msc_arm64.h
+index 44d96f03f..6ade48289 100644
+--- a/src/longlong_msc_arm64.h
++++ b/src/longlong_msc_arm64.h
+@@ -14,7 +14,6 @@
+ 
+ #include <stdlib.h>
+ #include <intrin.h>
+-#include <immintrin.h>
+ 
+ /* Trailing and leading zeros */
+ # define flint_clz _CountLeadingZeros64