guix: use gcc 12.3.0 for linux, windows targets

This commit is contained in:
tobtoht 2024-03-18 13:10:30 +01:00
parent 113fcb00bd
commit aca3f064f3
No known key found for this signature in database
GPG key ID: E45B10DD027D2472
2 changed files with 46 additions and 17 deletions

View file

@ -97,7 +97,7 @@ chain for " target " development."))
(home-page (package-home-page xgcc)) (home-page (package-home-page xgcc))
(license (package-license xgcc))))) (license (package-license xgcc)))))
(define base-gcc gcc-10) (define base-gcc gcc-12)
(define base-linux-kernel-headers linux-libre-headers-6.1) (define base-linux-kernel-headers linux-libre-headers-6.1)
(define* (make-bitcoin-cross-toolchain target (define* (make-bitcoin-cross-toolchain target
@ -291,9 +291,6 @@ chain for " target " development."))
meson meson
ninja ninja
zig zig
;; Native GCC 10 toolchain
gcc-toolchain-10
(list gcc-toolchain-10 "static")
;; Scripting ;; Scripting
perl perl
python-minimal python-minimal
@ -310,10 +307,21 @@ chain for " target " development."))
(let ((target (getenv "HOST"))) (let ((target (getenv "HOST")))
(cond ((string-suffix? "-mingw32" target) (cond ((string-suffix? "-mingw32" target)
;; Windows ;; Windows
(list (make-mingw-pthreads-cross-toolchain "x86_64-w64-mingw32") (list
nsis-x86_64)) gcc-toolchain-12
(list gcc-toolchain-12 "static")
(make-mingw-pthreads-cross-toolchain "x86_64-w64-mingw32")
nsis-x86_64))
((string-contains target "-linux-") ((string-contains target "-linux-")
(list (make-bitcoin-cross-toolchain target))) (list
gcc-toolchain-12
(list gcc-toolchain-12 "static")
(make-bitcoin-cross-toolchain target)))
((string-contains target "darwin") ((string-contains target "darwin")
(list clang-toolchain-10 binutils ldid)) (list
gcc-toolchain-10
(list gcc-toolchain-10 "static")
binutils
clang-toolchain-10
ldid))
(else '()))))) (else '())))))

View file

@ -1,6 +1,7 @@
Description: Use unaligned VMOV instructions Description: Use unaligned VMOV instructions
Author: Stephen Kitt <skitt@debian.org> Author: Stephen Kitt <skitt@debian.org>
Bug-Debian: https://bugs.debian.org/939559 Bug-Debian: https://bugs.debian.org/939559
See also: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=54412
Based on a patch originally by Claude Heiland-Allen <claude@mathr.co.uk> Based on a patch originally by Claude Heiland-Allen <claude@mathr.co.uk>
@ -167,14 +168,19 @@ Based on a patch originally by Claude Heiland-Allen <claude@mathr.co.uk>
default: default:
gcc_unreachable (); gcc_unreachable ();
} }
--- a/gcc/config/i386/i386.c --- a/gcc/config/i386/i386.cc
+++ b/gcc/config/i386/i386.c +++ b/gcc/config/i386/i386.cc
@@ -4981,13 +4981,13 @@ @@ -5418,17 +5418,15 @@ ix86_get_ssemov (rtx *operands, unsigned size,
switch (type)
{ {
case opcode_int: case opcode_int:
- opcode = misaligned_p ? "vmovdqu32" : "vmovdqa32"; if (scalar_mode == E_HFmode)
+ opcode = "vmovdqu32"; - opcode = (misaligned_p
- ? (TARGET_AVX512BW ? "vmovdqu16" : "vmovdqu64")
- : "vmovdqa64");
+ opcode = TARGET_AVX512BW ? "vmovdqu16" : "vmovdqu64";
else
- opcode = misaligned_p ? "vmovdqu32" : "vmovdqa32";
+ opcode = "vmovdqu32";
break; break;
case opcode_float: case opcode_float:
- opcode = misaligned_p ? "vmovups" : "vmovaps"; - opcode = misaligned_p ? "vmovups" : "vmovaps";
@ -186,9 +192,24 @@ Based on a patch originally by Claude Heiland-Allen <claude@mathr.co.uk>
break; break;
} }
} }
@@ -4996,16 +4996,16 @@ @@ -5438,29 +5436,21 @@ ix86_get_ssemov (rtx *operands, unsigned size,
switch (scalar_mode)
{ {
case E_HFmode:
if (evex_reg_p)
- opcode = (misaligned_p
- ? (TARGET_AVX512BW
- ? "vmovdqu16"
- : "vmovdqu64")
- : "vmovdqa64");
+ opcode = TARGET_AVX512BW ? "vmovdqu16" : "vmovdqu64";
else
- opcode = (misaligned_p
- ? (TARGET_AVX512BW
- ? "vmovdqu16"
- : "%vmovdqu")
- : "%vmovdqa");
+ opcode = TARGET_AVX512BW ? "vmovdqu16" : "%vmovdqu";
break;
case E_SFmode: case E_SFmode:
- opcode = misaligned_p ? "%vmovups" : "%vmovaps"; - opcode = misaligned_p ? "%vmovups" : "%vmovaps";
+ opcode = "%vmovups"; + opcode = "%vmovups";
@ -207,7 +228,7 @@ Based on a patch originally by Claude Heiland-Allen <claude@mathr.co.uk>
break; break;
default: default:
gcc_unreachable (); gcc_unreachable ();
@@ -5017,48 +5017,32 @@ @@ -5472,48 +5462,32 @@ ix86_get_ssemov (rtx *operands, unsigned size,
{ {
case E_QImode: case E_QImode:
if (evex_reg_p) if (evex_reg_p)