From 040aed16ed4c87dc91b9d3ff31cde17a5f81024b Mon Sep 17 00:00:00 2001
From: userdocs <16525024+userdocs@users.noreply.github.com>
Date: Tue, 29 Jul 2025 19:50:42 +0100
Subject: [PATCH] add patch to musl 1.2.5

required for s390x targets built using gcc 14 onwards

Origin:

https://www.openwall.com/lists/musl/2024/10/10/6

https://git.musl-libc.org/cgit/musl/commit/arch/s390x/reloc.h?id=5be920e9103fb7c7e492af7cd8bf56a71ae0b2c6
---
 .../0003-no-br-r0-in-CRTJMP-asm.ddiff         | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 patches/musl-1.2.5/0003-no-br-r0-in-CRTJMP-asm.ddiff

diff --git a/patches/musl-1.2.5/0003-no-br-r0-in-CRTJMP-asm.ddiff b/patches/musl-1.2.5/0003-no-br-r0-in-CRTJMP-asm.ddiff
new file mode 100644
index 00000000..4475b657
--- /dev/null
+++ b/patches/musl-1.2.5/0003-no-br-r0-in-CRTJMP-asm.ddiff
@@ -0,0 +1,30 @@
+From 5be920e9103fb7c7e492af7cd8bf56a71ae0b2c6 Mon Sep 17 00:00:00 2001
+From: Stefan Liebler <stli@linux.ibm.com>
+Date: Thu, 10 Oct 2024 15:02:44 +0200
+Subject: s390x: don't allow br r0 in CRTJMP asm
+
+The instruction encoding that would be "br %r0" is not actually a
+branch to r0, but instead a nop/memory-barrier. gcc 14 has been found
+to choose r0 for the "r"(pc) constraint, breaking CRTJMP.
+
+This patch adjusts the inline assembly constraints and marks "pc" as
+address ("a"), which disallows usage of r0.
+---
+ arch/s390x/reloc.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+(limited to 'arch/s390x/reloc.h')
+
+diff --git a/arch/s390x/reloc.h b/arch/s390x/reloc.h
+index 6e5c1fb8..38de9d9b 100644
+--- a/arch/s390x/reloc.h
++++ b/arch/s390x/reloc.h
+@@ -10,4 +10,4 @@
+ #define REL_TPOFF       R_390_TLS_TPOFF
+ 
+ #define CRTJMP(pc,sp) __asm__ __volatile__( \
+-	"lgr %%r15,%1; br %0" : : "r"(pc), "r"(sp) : "memory" )
++	"lgr %%r15,%1; br %0" : : "a"(pc), "r"(sp) : "memory" )
+-- 
+cgit v1.2.1
+