1*4882a593SmuzhiyunFrom bf84f8f74f087fbf1c4adc293433cd2e7b70df58 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Jeffy Chen <jeffy.chen@rock-chips.com> 3*4882a593SmuzhiyunDate: Wed, 25 May 2022 21:46:16 +0800 4*4882a593SmuzhiyunSubject: [PATCH] The signal definitions of musl and gdb collide 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunThe kernel defines "struct sigcontext" in asm/sigcontext.h and musl libc 7*4882a593Smuzhiyundefines it in signal.h which collides. 8*4882a593SmuzhiyunKernel 4.14 misses the definitions of struct user_sve_header so we still 9*4882a593Smuzhiyunhave to use the aarch64-sve-linux-sigcontext.h header file which also 10*4882a593Smuzhiyunprovides that and make sure aarch64-sve-linux-sigcontext.h does not 11*4882a593Smuzhiyunprovide the same headers as the kernel or musl. 12*4882a593Smuzhiyun 13*4882a593SmuzhiyunFrom: 14*4882a593Smuzhiyunhttps://git.openwrt.org/?p=openwrt/openwrt.git;a=blob;f=package/devel/gdb/patches/010-aarch64-headers.patch;h=a718a8c6a4e2d898f33a4f61ab1dc3228f4c3a48;hb=bc89690f6e2c80e100b4dbfbabc7c7adb8218d74 15*4882a593Smuzhiyun 16*4882a593SmuzhiyunSigned-off-by: Jeffy Chen <jeffy.chen@rock-chips.com> 17*4882a593Smuzhiyun--- 18*4882a593Smuzhiyun gdb/nat/aarch64-sve-linux-ptrace.h | 2 +- 19*4882a593Smuzhiyun gdb/nat/aarch64-sve-linux-sigcontext.h | 2 ++ 20*4882a593Smuzhiyun 2 files changed, 3 insertions(+), 1 deletion(-) 21*4882a593Smuzhiyun 22*4882a593Smuzhiyundiff --git a/gdb/nat/aarch64-sve-linux-ptrace.h b/gdb/nat/aarch64-sve-linux-ptrace.h 23*4882a593Smuzhiyunindex 5c264b3..bf959dc 100644 24*4882a593Smuzhiyun--- a/gdb/nat/aarch64-sve-linux-ptrace.h 25*4882a593Smuzhiyun+++ b/gdb/nat/aarch64-sve-linux-ptrace.h 26*4882a593Smuzhiyun@@ -31,7 +31,7 @@ 27*4882a593Smuzhiyun #include <sys/ptrace.h> 28*4882a593Smuzhiyun #include <asm/ptrace.h> 29*4882a593Smuzhiyun 30*4882a593Smuzhiyun-#ifndef SVE_SIG_ZREGS_SIZE 31*4882a593Smuzhiyun+#ifndef SVE_PT_REGS_SVE 32*4882a593Smuzhiyun #include "aarch64-sve-linux-sigcontext.h" 33*4882a593Smuzhiyun #endif 34*4882a593Smuzhiyun 35*4882a593Smuzhiyundiff --git a/gdb/nat/aarch64-sve-linux-sigcontext.h b/gdb/nat/aarch64-sve-linux-sigcontext.h 36*4882a593Smuzhiyunindex 1b40ffa..373e222 100644 37*4882a593Smuzhiyun--- a/gdb/nat/aarch64-sve-linux-sigcontext.h 38*4882a593Smuzhiyun+++ b/gdb/nat/aarch64-sve-linux-sigcontext.h 39*4882a593Smuzhiyun@@ -19,6 +19,7 @@ 40*4882a593Smuzhiyun #ifndef NAT_AARCH64_SVE_LINUX_SIGCONTEXT_H 41*4882a593Smuzhiyun #define NAT_AARCH64_SVE_LINUX_SIGCONTEXT_H 42*4882a593Smuzhiyun 43*4882a593Smuzhiyun+#ifndef SVE_MAGIC 44*4882a593Smuzhiyun #define SVE_MAGIC 0x53564501 45*4882a593Smuzhiyun 46*4882a593Smuzhiyun struct sve_context { 47*4882a593Smuzhiyun@@ -128,6 +129,7 @@ struct sve_context { 48*4882a593Smuzhiyun (SVE_SIG_FFR_OFFSET(vq) + SVE_SIG_FFR_SIZE(vq) - SVE_SIG_REGS_OFFSET) 49*4882a593Smuzhiyun 50*4882a593Smuzhiyun #define SVE_SIG_CONTEXT_SIZE(vq) (SVE_SIG_REGS_OFFSET + SVE_SIG_REGS_SIZE(vq)) 51*4882a593Smuzhiyun+#endif 52*4882a593Smuzhiyun 53*4882a593Smuzhiyun /* SVE/FP/SIMD state (NT_ARM_SVE) */ 54*4882a593Smuzhiyun 55*4882a593Smuzhiyun-- 56*4882a593Smuzhiyun2.20.1 57*4882a593Smuzhiyun 58