File tree Expand file tree Collapse file tree 2 files changed +34
-1
lines changed Expand file tree Collapse file tree 2 files changed +34
-1
lines changed Original file line number Diff line number Diff line change @@ -537,7 +537,8 @@ inspecting signatures in Mach-O binaries.")
537
537
(patches (search-our-patches " glibc-ldd-x86_64.patch"
538
538
" glibc-versioned-locpath.patch"
539
539
" glibc-2.24-elfm-loadaddr-dynamic-rewrite.patch"
540
- " glibc-2.24-no-build-time-cxx-header-run.patch" ))))))
540
+ " glibc-2.24-no-build-time-cxx-header-run.patch"
541
+ " glibc-2.24-fcommon.patch" ))))))
541
542
542
543
(define-public glibc-2.27/bitcoin-patched
543
544
(package
Original file line number Diff line number Diff line change
1
+ commit 264a4a0dbe1f4369db315080034b500bed66016c
2
+ Author: fanquake <
[email protected] >
3
+ Date: Fri May 6 11:03:04 2022 +0100
4
+
5
+ build: use -fcommon to retain legacy behaviour with GCC 10
6
+
7
+ 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
9
+ the issue, 18363b4f010da9ba459b13310b113ac0647c2fcc but is non-trvial
10
+ to backport, and was broken in at least one way, see the followup in
11
+ commit 7650321ce037302bfc2f026aa19e0213b8d02fe6.
12
+
13
+ For now, retain the legacy GCC behaviour by passing -fcommon when
14
+ building glibc.
15
+
16
+ https://gcc.gnu.org/onlinedocs/gcc/Code-Gen-Options.html.
17
+ https://sourceware.org/git/?p=glibc.git;a=commit;h=18363b4f010da9ba459b13310b113ac0647c2fcc
18
+ https://sourceware.org/git/?p=glibc.git;a=commit;h=7650321ce037302bfc2f026aa19e0213b8d02fe6
19
+
20
+ diff --git a/Makeconfig b/Makeconfig
21
+ index ee379f5852..63c4a2f234 100644
22
+ --- a/Makeconfig
23
+ +++ b/Makeconfig
24
+ @@ -824,7 +824,7 @@ ifeq "$(strip $(+cflags))" ""
25
+ +cflags := $(default_cflags)
26
+ endif # $(+cflags) == ""
27
+
28
+ - +cflags += $(cflags-cpu) $(+gccwarn) $(+merge-constants) $(+math-flags)
29
+ + +cflags += $(cflags-cpu) $(+gccwarn) $(+merge-constants) $(+math-flags) -fcommon
30
+ +gcc-nowarn := -w
31
+
32
+ # Don't duplicate options if we inherited variables from the parent.
You can’t perform that action at this time.
0 commit comments