Skip to content

Commit 594f05d

Browse files
committed
Merge bitcoin/bitcoin#27668: guix: document when certain patches can be dropped
a09269a guix: document when certain guix patches can be dropped (fanquake) Pull request description: Additional notes for when patches can be dropped. ACKs for top commit: hebasto: ACK a09269a, I have reviewed the changes and they look OK. jarolrod: ACK a09269a Tree-SHA512: c1876b9a4e3cf73645d25c9077cef19a9b6b7fe2eda5dc9d82fd3ca3f9105453406c1b197e6635035b6ce19c9f255c070bebed5563f68913033d04627202155a
2 parents 4c3d67a + a09269a commit 594f05d

5 files changed

+9
-2
lines changed

contrib/guix/patches/gcc-broken-longjmp.patch

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ Date: Wed May 5 22:48:51 2021 +0200
2929
gcc/testsuite/
3030
* gcc.c-torture/execute/20210505-1.c: New test.
3131

32+
This patch can be dropped when we are building with GCC 10.4.0 or later.
33+
3234
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
3335
index 2f838840e96..06ad1b2274e 100644
3436
--- a/gcc/config/i386/i386.c

contrib/guix/patches/glibc-2.27-fcommon.patch

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Date: Fri May 6 11:03:04 2022 +0100
55
build: use -fcommon to retain legacy behaviour with GCC 10
66

77
GCC 10 started using -fno-common by default, which causes issues with
8-
the powerpc builds using gibc 2.24. A patch was commited to glibc to fix
8+
the powerpc builds using gibc 2.27. A patch was commited to glibc to fix
99
the issue, 18363b4f010da9ba459b13310b113ac0647c2fcc but is non-trvial
1010
to backport, and was broken in at least one way, see the followup in
1111
commit 7650321ce037302bfc2f026aa19e0213b8d02fe6.
@@ -17,6 +17,8 @@ Date: Fri May 6 11:03:04 2022 +0100
1717
https://sourceware.org/git/?p=glibc.git;a=commit;h=18363b4f010da9ba459b13310b113ac0647c2fcc
1818
https://sourceware.org/git/?p=glibc.git;a=commit;h=7650321ce037302bfc2f026aa19e0213b8d02fe6
1919

20+
This patch can be dropped when we are building with glibc 2.31+.
21+
2022
diff --git a/Makeconfig b/Makeconfig
2123
index 86a71e5802..aa2166be60 100644
2224
--- a/Makeconfig

contrib/guix/patches/glibc-2.27-guix-prefix.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ In order to be reproducible regardless of the architecture used to build
55
the package, map all guix store prefixes to something fixed, e.g. /usr.
66

77
We might be able to drop this in favour of using --with-nonshared-cflags
8-
when we being using newer versions of glibc.
8+
when we begin using newer versions of glibc.
99

1010
--- a/Makeconfig
1111
+++ b/Makeconfig

contrib/guix/patches/glibc-2.27-riscv64-Use-__has_include-to-include-asm-syscalls.h.patch

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ See also: http://lists.busybox.net/pipermail/buildroot/2020-July/590376.html.
44

55
https://sourceware.org/git/?p=glibc.git;a=commit;h=0b9c84906f653978fb8768c7ebd0ee14a47e662e
66

7+
This patch can be dropped when we are building with glibc 2.28+.
8+
79
From 562c52cc81a4e456a62e6455feb32732049e9070 Mon Sep 17 00:00:00 2001
810
From: "H.J. Lu" <[email protected]>
911
Date: Mon, 31 Dec 2018 09:26:42 -0800

contrib/guix/patches/vmov-alignment.patch

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
Description: Use unaligned VMOV instructions
22
Author: Stephen Kitt <[email protected]>
33
Bug-Debian: https://bugs.debian.org/939559
4+
See also: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=54412
45

56
Based on a patch originally by Claude Heiland-Allen <[email protected]>
67

0 commit comments

Comments
 (0)