From c966a859b96f78920c16e1161578405d88b425cf Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Sun, 1 Mar 2015 14:55:29 +0000 Subject: Fix 32-bit x86 in-process agent build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Git commit 3c14e5a39bb4fddd added a declaration for gdb_agent_get_raw_reg to tracepoint.h, and this now caught that the 32-bit x86 implementation has the wrong prototype: ../../../src/gdb/gdbserver/linux-i386-ipa.c:103:1: error: conflicting types for ‘gdb_agent_get_raw_reg’ gdb_agent_get_raw_reg (unsigned char *raw_regs, int regnum) ^ In file included from ../../../src/gdb/gdbserver/linux-i386-ipa.c:24:0: ../../../src/gdb/gdbserver/tracepoint.h:168:31: note: previous declaration of ‘gdb_agent_get_raw_reg’ was here IP_AGENT_EXPORT_FUNC ULONGEST gdb_agent_get_raw_reg ^ make[2]: *** [linux-i386-ipa.o] Error 1 gdb/gdbserver/ 2015-03-01 Pedro Alves * linux-i386-ipa.c (gdb_agent_get_raw_reg): Constify 'raw_regs' parameter. --- gdb/gdbserver/ChangeLog | 5 +++++ gdb/gdbserver/linux-i386-ipa.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'gdb/gdbserver') diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index c420c06..0b49167 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,8 @@ +2015-03-01 Pedro Alves + + * linux-i386-ipa.c (gdb_agent_get_raw_reg): Constify 'raw_regs' + parameter. + 2015-02-27 Pedro Alves * linux-x86-low.c (u_debugreg_offset): New function. diff --git a/gdb/gdbserver/linux-i386-ipa.c b/gdb/gdbserver/linux-i386-ipa.c index c00d01b..eb30dcd 100644 --- a/gdb/gdbserver/linux-i386-ipa.c +++ b/gdb/gdbserver/linux-i386-ipa.c @@ -100,7 +100,7 @@ supply_fast_tracepoint_registers (struct regcache *regcache, } IP_AGENT_EXPORT_FUNC ULONGEST -gdb_agent_get_raw_reg (unsigned char *raw_regs, int regnum) +gdb_agent_get_raw_reg (const unsigned char *raw_regs, int regnum) { /* This should maybe be allowed to return an error code, or perhaps better, have the emit_reg detect this, and emit a constant zero, -- cgit v1.1