1From c3fdbc0a24c83246f951ba79c7167547da979ae5 Mon Sep 17 00:00:00 2001 2From: Fabrice Fontaine <fontaine.fabrice@gmail.com> 3Date: Wed, 10 Nov 2021 23:14:54 +0100 4Subject: [PATCH] fix musl build on riscv 5 6Fix the following build failure raised with musl: 7 8../../gdbserver/linux-riscv-low.cc: In function 'void riscv_fill_fpregset(regcache*, void*)': 9../../gdbserver/linux-riscv-low.cc:140:19: error: 'ELF_NFPREG' was not declared in this scope; did you mean 'ELF_NGREG'? 10 140 | for (i = 0; i < ELF_NFPREG - 1; i++, regbuf += flen) 11 | ^~~~~~~~~~ 12 | ELF_NGREG 13 14musl fixed the issue with 15https://git.musl-libc.org/cgit/musl/commit/?id=e5d2823631bbfebacf48e1a34ed28f28d7cb2570 16 17Fixes: 18 - http://autobuild.buildroot.org/results/16b19198980ce9c81a618b3f6e8dc9fe28247a28 19 20Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> 21--- 22 gdb/nat/riscv-linux-tdesc.c | 5 +++++ 23 gdbserver/linux-riscv-low.cc | 5 +++++ 24 2 files changed, 10 insertions(+) 25 26diff --git a/gdb/nat/riscv-linux-tdesc.c b/gdb/nat/riscv-linux-tdesc.c 27index 837b1707e0f..667c013006a 100644 28--- a/gdb/nat/riscv-linux-tdesc.c 29+++ b/gdb/nat/riscv-linux-tdesc.c 30@@ -31,6 +31,11 @@ 31 # define NFPREG 33 32 #endif 33 34+/* Work around musl breakage since version 1.1.24. */ 35+#ifndef ELF_NFPREG 36+# define ELF_NFPREG 33 37+#endif 38+ 39 /* See nat/riscv-linux-tdesc.h. */ 40 41 struct riscv_gdbarch_features 42diff --git a/gdbserver/linux-riscv-low.cc b/gdbserver/linux-riscv-low.cc 43index 8bf97ea4aa3..1142dbc7b16 100644 44--- a/gdbserver/linux-riscv-low.cc 45+++ b/gdbserver/linux-riscv-low.cc 46@@ -30,6 +30,11 @@ 47 # define NFPREG 33 48 #endif 49 50+/* Work around musl breakage since version 1.1.24. */ 51+#ifndef ELF_NFPREG 52+# define ELF_NFPREG 33 53+#endif 54+ 55 /* Linux target op definitions for the RISC-V architecture. */ 56 57 class riscv_target : public linux_process_target 58-- 592.33.0 60 61