mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-06-04 18:22:57 +02:00
Merge bitcoin/bitcoin#33775: guix: use GCC 14.3.0 over 13.3.0
2a746500faci: migrate some jobs to Debian Trixie, use GCC 14 (fanquake)fb0e6edfe8guix: Apply SSA generation patch to maintain determinism (Mara van der Laan)34909799feguix: use GCC 14.3.0 over 13.3.0 (fanquake)47be9122a7guix: disable gprofng in GCC (fanquake)ea29329eb7guix: build GCC with --enable-host-bind-now (fanquake)6f54e267d0guix: disable libquadmath in GCC (fanquake)7735901ed2guix: disable building libgomp in GCC (fanquake) Pull request description: Switching to using GCC 14.x for release builds has come up multiple times recently. It will eventually be needed for #25573, and could also be useful for #30210. ACKs for top commit: hebasto: ACK2a746500fa. I have reviewed the code and it looks OK. The new GCC patch looks reasonable. theuni: utACK2a746500fasedited: ACK2a746500faTree-SHA512: 56912bed19386f06d52fb94e0ef6d96f5415ab2de8b5e94890806d7cc0b937a3c4b11cc161aa2e06ca2fd3c392ef7501c91688e0897e1c1c51aafa963f3e50d9
This commit is contained in:
@@ -94,7 +94,17 @@ chain for " target " development."))
|
||||
(home-page (package-home-page xgcc))
|
||||
(license (package-license xgcc)))))
|
||||
|
||||
(define base-gcc gcc-13) ;; 13.3.0
|
||||
(define base-gcc
|
||||
(package
|
||||
(inherit gcc-14) ;; 14.2.0
|
||||
(version "14.3.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/gcc/gcc-"
|
||||
version "/gcc-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0fna78ly417g69fdm4i5f3ms96g8xzzjza8gwp41lqr5fqlpgp70"))))))
|
||||
|
||||
(define base-linux-kernel-headers linux-libre-headers-6.1)
|
||||
|
||||
@@ -114,7 +124,7 @@ desirable for building Bitcoin Core release binaries."
|
||||
|
||||
(define (gcc-libgcc-patches gcc)
|
||||
(package-with-extra-patches gcc
|
||||
(search-our-patches "gcc-remap-guix-store.patch")))
|
||||
(search-our-patches "gcc-remap-guix-store.patch" "gcc-ssa-generation.patch")))
|
||||
|
||||
(define (binutils-mingw-patches binutils)
|
||||
(package-with-extra-patches binutils
|
||||
@@ -432,7 +442,9 @@ inspecting signatures in Mach-O binaries.")
|
||||
;; https://gcc.gnu.org/install/configure.html
|
||||
(list "--enable-threads=posix",
|
||||
"--enable-default-ssp=yes",
|
||||
"--enable-host-bind-now=yes",
|
||||
"--disable-gcov",
|
||||
"--disable-libgomp",
|
||||
building-on)))))))
|
||||
|
||||
(define-public linux-base-gcc
|
||||
@@ -446,9 +458,13 @@ inspecting signatures in Mach-O binaries.")
|
||||
(list "--enable-initfini-array=yes",
|
||||
"--enable-default-ssp=yes",
|
||||
"--enable-default-pie=yes",
|
||||
"--enable-host-bind-now=yes",
|
||||
"--enable-standard-branch-protection=yes",
|
||||
"--enable-cet=yes",
|
||||
"--enable-gprofng=no",
|
||||
"--disable-gcov",
|
||||
"--disable-libgomp",
|
||||
"--disable-libquadmath",
|
||||
"--disable-libsanitizer",
|
||||
building-on)))
|
||||
((#:phases phases)
|
||||
@@ -555,7 +571,7 @@ inspecting signatures in Mach-O binaries.")
|
||||
gzip
|
||||
xz
|
||||
;; Build tools
|
||||
gcc-toolchain-13
|
||||
gcc-toolchain-14
|
||||
cmake-minimal
|
||||
gnu-make
|
||||
ninja
|
||||
@@ -575,7 +591,7 @@ inspecting signatures in Mach-O binaries.")
|
||||
((string-contains target "-linux-")
|
||||
(list bison
|
||||
pkg-config
|
||||
(list gcc-toolchain-13 "static")
|
||||
(list gcc-toolchain-14 "static")
|
||||
(make-bitcoin-cross-toolchain target)))
|
||||
((string-contains target "darwin")
|
||||
(list clang-toolchain-19
|
||||
|
||||
49
contrib/guix/patches/gcc-ssa-generation.patch
Normal file
49
contrib/guix/patches/gcc-ssa-generation.patch
Normal file
@@ -0,0 +1,49 @@
|
||||
commit b46614ebfc57ccca8a050668ad0e8ba5968c5943
|
||||
Author: Jakub Jelinek <jakub@redhat.com>
|
||||
Date: Tue Jan 6 08:36:20 2026 +0100
|
||||
|
||||
tree-object-size: Deterministic SSA generation [PR123351]
|
||||
|
||||
The order of evaluation of function arguments is unspecified in C++.
|
||||
The function object_sizes_set_temp called object_sizes_set with two
|
||||
calls to make_ssa_name() as arguments. Since make_ssa_name() has the
|
||||
side effect of incrementing the global SSA version counter, different
|
||||
architectures of the same compiler evaluated these calls in different
|
||||
orders.
|
||||
|
||||
This resulted in non-deterministic SSA version numbering between
|
||||
x86_64 and aarch64 hosts during cross-compilation, leading to
|
||||
divergent object files.
|
||||
|
||||
Sequencing the calls into separate statements ensures deterministic
|
||||
evaluation order.
|
||||
|
||||
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=123351
|
||||
https://gcc.gnu.org/pipermail/gcc-patches/2026-January/704817.html
|
||||
|
||||
2026-01-06 Jakub Jelinek <jakub@redhat.com>
|
||||
Marco Falke <falke.marco@gmail.com>
|
||||
|
||||
PR tree-optimization/123351
|
||||
* tree-object-size.cc (object_sizes_set_temp): Separate calls to
|
||||
make_ssa_name to ensure deterministic execution order.
|
||||
|
||||
diff --git a/gcc/tree-object-size.cc b/gcc/tree-object-size.cc
|
||||
index 018fbc30cbb..24e7d710371 100644
|
||||
--- a/gcc/tree-object-size.cc
|
||||
+++ b/gcc/tree-object-size.cc
|
||||
@@ -319,9 +319,11 @@ object_sizes_set_temp (struct object_size_info *osi, unsigned varno)
|
||||
tree val = object_sizes_get (osi, varno);
|
||||
|
||||
if (size_initval_p (val, osi->object_size_type))
|
||||
- object_sizes_set (osi, varno,
|
||||
- make_ssa_name (sizetype),
|
||||
- make_ssa_name (sizetype));
|
||||
+ {
|
||||
+ val = make_ssa_name (sizetype);
|
||||
+ tree wholeval = make_ssa_name (sizetype);
|
||||
+ object_sizes_set (osi, varno, val, wholeval);
|
||||
+ }
|
||||
}
|
||||
|
||||
/* Initialize OFFSET_LIMIT variable. */
|
||||
Reference in New Issue
Block a user