diff options
| author | fanquake <fanquake@gmail.com> | 2024-04-10 12:21:22 +0200 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2024-04-10 13:59:43 +0200 |
| commit | a0dc2ebcda9e33aa5320221cd4ea371f84d221fd (patch) | |
| tree | 9b50562f98dc29c8bc81c36d157bd1ff6d395694 /contrib/guix/manifest.scm | |
| parent | 3f6a6da3b08da15c10cbf2806f672da4a57254f6 (diff) | |
| download | bitcoin-a0dc2ebcda9e33aa5320221cd4ea371f84d221fd.tar.xz | |
guix: replace GCC unaligned VMOV patch with binutils patch
Rather than invasively patching GCC. Given we have binutils 2.38
available, we can patch it to flip the default for
`-muse-unaligned-vector-move`.
Diffstat (limited to 'contrib/guix/manifest.scm')
| -rw-r--r-- | contrib/guix/manifest.scm | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm index 87dcf49bcb..f6d3db2fe9 100644 --- a/contrib/guix/manifest.scm +++ b/contrib/guix/manifest.scm @@ -110,12 +110,15 @@ desirable for building Bitcoin Core release binaries." (define (gcc-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 (binutils-mingw-patches binutils) + (package-with-extra-patches binutils + (search-our-patches "binutils-unaligned-default.patch"))) (define (make-mingw-pthreads-cross-toolchain target) "Create a cross-compilation toolchain package for TARGET" - (let* ((xbinutils (cross-binutils target)) + (let* ((xbinutils (binutils-mingw-patches (cross-binutils target))) (pthreads-xlibc mingw-w64-x86_64-winpthreads) (pthreads-xgcc (cross-gcc target #:xgcc (gcc-mingw-patches mingw-w64-base-gcc) |