mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-01-29 21:08:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

m4: Fix build on musl/ppc

Browse Source 
(From OE-Core rev: 41ccf5b38506608032754beaff393f74e0403fd1)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj
2022-03-09 23:53:34 -08:00
committed by Richard Purdie
parent 720eb2cc8d
commit 9ad40791fe
2 changed files with 38 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
meta/recipes-devtools/m4/m4-1.4.19.inc
View File

@@ -8,6 +8,7 @@ inherit autotools texinfo ptest gettext
SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz \
file://ac_config_links.patch \
file://0001-sigsegv-Fix-build-on-ppc-musl.patch \
"
SRC_URI:append:class-target = " file://run-ptest \
file://serial-tests-config.patch \

37
meta/recipes-devtools/m4/m4/0001-sigsegv-Fix-build-on-ppc-musl.patch Normal file
View File

@@ -0,0 +1,37 @@
From 36d5e26f606e070553eb0fff1f738e61970be5d7 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 9 Mar 2022 20:22:20 -0800
Subject: [PATCH] sigsegv: Fix build on ppc/musl
mcontext is not a standard layout so glibc and musl differ sadly.
Fixes
../../m4-1.4.19/lib/sigsegv.c: In function 'sigsegv_handler': ../../m4-1.4.19/lib/sigsegv.c:223:75: error: 'mcontext_t' has no member named 'uc_regs'; did you mean 'gregs'? 223 | # define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.uc_regs->gregs[1] | ^~~~~~~
Upstream-Status: Submitted [https://lists.gnu.org/archive/html/m4-patches/2022-03/msg00000.html]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
lib/sigsegv.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/sigsegv.c b/lib/sigsegv.c
index 696a152..fa0c465 100644
--- a/lib/sigsegv.c
+++ b/lib/sigsegv.c
@@ -217,10 +217,10 @@ int libsigsegv_version = LIBSIGSEGV_VERSION;
# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.gp_regs[1]
# else /* 32-bit */
/* both should be equivalent */
-# if 0
-# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.regs->gpr[1]
+# if ! defined __GLIBC__
+# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_regs->gregs[1]
# else
-# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.uc_regs->gregs[1]
+# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.uc_regs->gregs[1]
# endif
# endif
--
2.35.1