From a8a7b75a0115b753f2d52d00d7764e8177986599 Mon Sep 17 00:00:00 2001 From: fanquake Date: Wed, 23 Aug 2023 09:42:16 +0100 Subject: guix: backport glibc patch to fix powerpc build Do this prior to bumping the time-machine, to avoid the following build failure: ```bash /tmp/guix-build-glibc-cross-powerpc64le-linux-gnu-2.27.drv-0/build/string/memset-power8.o.dt -MT /tmp/guix-build-glibc-cross-powerpc64le-linux-gnu-2.27.drv-0/build/string/memset-power8.o ../sysdeps/powerpc/powerpc64/power4/memcmp.S: Assembler messages: ../sysdeps/powerpc/powerpc64/power4/memcmp.S:87: Error: unrecognized opcode: `ldbrx' ../sysdeps/powerpc/powerpc64/power4/memcmp.S:88: Error: unrecognized opcode: `ldbrx' ../sysdeps/powerpc/powerpc64/power4/memcmp.S:112: Error: unrecognized opcode: `ldbrx' ``` See: https://sourceware.org/git/?p=glibc.git;a=commit;h=9250e6610fdb0f3a6f238d2813e319a41fb7a810. https://github.com/gcc-mirror/gcc/commit/e154242724b084380e3221df7c08fcdbd8460674. --- contrib/guix/manifest.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'contrib/guix/manifest.scm') diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm index c0cf0d6be0..02556320ab 100644 --- a/contrib/guix/manifest.scm +++ b/contrib/guix/manifest.scm @@ -539,7 +539,8 @@ inspecting signatures in Mach-O binaries.") (patches (search-our-patches "glibc-2.27-riscv64-Use-__has_include-to-include-asm-syscalls.h.patch" "glibc-2.27-fcommon.patch" "glibc-2.27-guix-prefix.patch" - "glibc-2.27-no-librt.patch")))) + "glibc-2.27-no-librt.patch" + "glibc-2.27-powerpc-ldbrx.patch")))) (arguments (substitute-keyword-arguments (package-arguments glibc) ((#:configure-flags flags) -- cgit v1.2.3