From 4d3928d7e0a141e0fb16405d33b375cbe2f13123 Mon Sep 17 00:00:00 2001 From: Jim Wilson Date: Wed, 29 Aug 2018 10:52:42 -0700 Subject: [PATCH] Fix riscv-linux native gdb build failure. The linux kernel uses NT_PRFPREG. Glibc before BZ 14890 defines NT_FPREGSET. After it defines both. Avoid glibc version dependency by using the gdb header file instead of the glibc header file, and the macro name that gdb defines which is NT_FPREGSET. gdb/ * riscv-linux-nat.c: Include elf/common.h instead of elf.h. (riscv_linux_nat_target::fetch_registers): Use NT_FPREGSET instead of NT_PRFPREG. (riscv_linux_nat_target::store_registers): Likewise. --- gdb/ChangeLog | 7 +++++++ gdb/riscv-linux-nat.c | 9 +++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index a30dace..e89fbec 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2018-08-29 Jim Wilson + + * riscv-linux-nat.c: Include elf/common.h instead of elf.h. + (riscv_linux_nat_target::fetch_registers): Use NT_FPREGSET instead + of NT_PRFPREG. + (riscv_linux_nat_target::store_registers): Likewise. + 2018-08-29 Sergio Durigan Junior PR gdb/23555 diff --git a/gdb/riscv-linux-nat.c b/gdb/riscv-linux-nat.c index 3faa9f9..7dbfe65 100644 --- a/gdb/riscv-linux-nat.c +++ b/gdb/riscv-linux-nat.c @@ -20,9 +20,10 @@ #include "regcache.h" #include "gregset.h" #include "linux-nat.h" -#include "elf.h" #include "riscv-tdep.h" +#include "elf/common.h" + #include /* RISC-V Linux native additions to the default linux support. */ @@ -191,7 +192,7 @@ riscv_linux_nat_target::fetch_registers (struct regcache *regcache, int regnum) iov.iov_base = ®s; iov.iov_len = sizeof (regs); - if (ptrace (PTRACE_GETREGSET, tid, NT_PRFPREG, + if (ptrace (PTRACE_GETREGSET, tid, NT_FPREGSET, (PTRACE_TYPE_ARG3) &iov) == -1) perror_with_name (_("Couldn't get registers")); else @@ -252,14 +253,14 @@ riscv_linux_nat_target::store_registers (struct regcache *regcache, int regnum) iov.iov_base = ®s; iov.iov_len = sizeof (regs); - if (ptrace (PTRACE_GETREGSET, tid, NT_PRFPREG, + if (ptrace (PTRACE_GETREGSET, tid, NT_FPREGSET, (PTRACE_TYPE_ARG3) &iov) == -1) perror_with_name (_("Couldn't get registers")); else { fill_fpregset (regcache, ®s, regnum); - if (ptrace (PTRACE_SETREGSET, tid, NT_PRFPREG, + if (ptrace (PTRACE_SETREGSET, tid, NT_FPREGSET, (PTRACE_TYPE_ARG3) &iov) == -1) perror_with_name (_("Couldn't set registers")); } -- 2.7.4