OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Jim Wilson 2018-08-29 10:52:42 -07:00
parent 7a6dbc2fdb
commit 4d3928d7e0
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gdb/ChangeLog
View File

@ -1,3 +1,10 @@
2018-08-29 Jim Wilson <jimw@sifive.com>
* 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 <sergiodj@redhat.com>
PR gdb/23555

9
gdb/riscv-linux-nat.c
View File

@ -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 <sys/ptrace.h>
/* 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 = &regs;
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 = &regs;
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, &regs, 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"));
}