[WIP] guix: use -muse-unaligned-vector-move for Windows

bitcoin · Aug 2, 2023 · 6c3f6a9 · 6c3f6a9
1 parent 06df8c3
commit 6c3f6a9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 290 deletions.
diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh
@@ -219,6 +219,15 @@ case "$HOST" in
     *darwin*) unset HOST_CFLAGS ;;
 esac
 
+# Avoid the use of aligned vector instructions when building for Windows.
+# Attempt to use this assembler flag, as opposed patching what we want
+# into GCC.
+# See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=54412.
+# Also https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=c8480b58e1968f209b6365af7422678f348222c2.
+case "$HOST" in
+    *mingw*) HOST_CFLAGS="${HOST_CFLAGS} -Wa,-muse-unaligned-vector-move" ;;
+esac
+
 # CXXFLAGS
 HOST_CXXFLAGS="$HOST_CFLAGS"
 

diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm
@@ -110,8 +110,7 @@ desirable for building Bitcoin Core release binaries."
 
 (define (make-gcc-with-mingw-patches gcc)
   (package-with-extra-patches gcc
-    (search-our-patches "gcc-remap-guix-store.patch"
-                        "vmov-alignment.patch")))
+    (search-our-patches "gcc-remap-guix-store.patch")))
 
 (define (make-mingw-pthreads-cross-toolchain target)
   "Create a cross-compilation toolchain package for TARGET"

diff --git a/contrib/guix/patches/vmov-alignment.patch b/contrib/guix/patches/vmov-alignment.patch