From 12afe0c9950da5a9647ee43daa548b68710ce76c Mon Sep 17 00:00:00 2001 From: fanquake Date: Wed, 15 Mar 2023 08:36:44 +0100 Subject: [PATCH] Merge bitcoin/bitcoin#27153: guix: pass `--enable-initfini-array` to release GCC 127c637cf0a80e0ea68a7c5aaa088e5ccc9d3d13 guix: pass --enable-initfini-array to release GCC (fanquake) Pull request description: This returns us to pre-Guix behaviour, where the compilers we were using to build releases, were configured with this option. > [--enable-initfini-array](https://gcc.gnu.org/install/configure.html) > Force the use of sections .init_array and .fini_array (instead of .init and .fini) for constructors and destructors. Option --disable-initfini-array has the opposite effect. If neither option is specified, the configure script will try to guess whether the .init_array and .fini_array sections are supported and, if they are, use them. ACKs for top commit: TheCharlatan: ACK 127c637cf0a80e0ea68a7c5aaa088e5ccc9d3d13 vincenzopalazzo: utACK https://github.com/bitcoin/bitcoin/pull/27153/commits/127c637cf0a80e0ea68a7c5aaa088e5ccc9d3d13 Tree-SHA512: fa61227054d52d4dfb4524af3888203a501f680661bdef00bb0970d4e8f7c96cf7f592686c4795be5a0debca267b8e564a4960859297c31f6b261c0729238382 --- contrib/guix/manifest.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm index 0f7e0bb214..ebf8d02129 100644 --- a/contrib/guix/manifest.scm +++ b/contrib/guix/manifest.scm @@ -139,9 +139,11 @@ chain for " target " development.")) ;; https://gcc.gnu.org/install/configure.html (define (hardened-gcc gcc) (package-with-extra-configure-variable ( - package-with-extra-configure-variable gcc - "--enable-default-ssp" "yes") - "--enable-default-pie" "yes")) + package-with-extra-configure-variable ( + package-with-extra-configure-variable gcc + "--enable-initfini-array" "yes") + "--enable-default-ssp" "yes") + "--enable-default-pie" "yes")) (define* (make-bitcoin-cross-toolchain target #:key