diff options
Diffstat (limited to 'gdb/gdbserver')
| -rw-r--r-- | gdb/gdbserver/ChangeLog | 11 | ||||
| -rw-r--r-- | gdb/gdbserver/linux-arm-low.c | 2 | ||||
| -rw-r--r-- | gdb/gdbserver/linux-low.c | 10 | ||||
| -rw-r--r-- | gdb/gdbserver/linux-low.h | 5 | ||||
| -rw-r--r-- | gdb/gdbserver/linux-x86-low.c | 4 |
5 files changed, 21 insertions, 11 deletions
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 238679e..155dbb1 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,14 @@ +2012-03-21 Thomas Schwinge <thomas@codesourcery.com> + + * linux-arm-low.c (arm_stopped_by_watchpoint): Use siginfo_t instead of + struct siginfo. + * linux-low.c (siginfo_fixup, linux_xfer_siginfo): Likewise. + * linux-x86-low.c (x86_siginfo_fixup): Likewise. + * linux-low.h: Include <signal.h>. + (struct siginfo): Remove forward declaration. + (struct linux_target_ops) <siginfo_fixup>: Use siginfo_t instead of + struct siginfo. + 2012-03-21 Mike Frysinger <vapier@gentoo.org> * .gitignore: Ignore more files. diff --git a/gdb/gdbserver/linux-arm-low.c b/gdb/gdbserver/linux-arm-low.c index ff2437d..01208ef 100644 --- a/gdb/gdbserver/linux-arm-low.c +++ b/gdb/gdbserver/linux-arm-low.c @@ -631,7 +631,7 @@ static int arm_stopped_by_watchpoint (void) { struct lwp_info *lwp = get_thread_lwp (current_inferior); - struct siginfo siginfo; + siginfo_t siginfo; /* We must be able to set hardware watchpoints. */ if (arm_linux_get_hw_watchpoint_count () == 0) diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c index d2d4c1d..4734f15 100644 --- a/gdb/gdbserver/linux-low.c +++ b/gdb/gdbserver/linux-low.c @@ -4779,7 +4779,7 @@ linux_qxfer_osdata (const char *annex, layout of the inferiors' architecture. */ static void -siginfo_fixup (struct siginfo *siginfo, void *inf_siginfo, int direction) +siginfo_fixup (siginfo_t *siginfo, void *inf_siginfo, int direction) { int done = 0; @@ -4791,9 +4791,9 @@ siginfo_fixup (struct siginfo *siginfo, void *inf_siginfo, int direction) if (!done) { if (direction == 1) - memcpy (siginfo, inf_siginfo, sizeof (struct siginfo)); + memcpy (siginfo, inf_siginfo, sizeof (siginfo_t)); else - memcpy (inf_siginfo, siginfo, sizeof (struct siginfo)); + memcpy (inf_siginfo, siginfo, sizeof (siginfo_t)); } } @@ -4802,8 +4802,8 @@ linux_xfer_siginfo (const char *annex, unsigned char *readbuf, unsigned const char *writebuf, CORE_ADDR offset, int len) { int pid; - struct siginfo siginfo; - char inf_siginfo[sizeof (struct siginfo)]; + siginfo_t siginfo; + char inf_siginfo[sizeof (siginfo_t)]; if (current_inferior == NULL) return -1; diff --git a/gdb/gdbserver/linux-low.h b/gdb/gdbserver/linux-low.h index 677d261..3aeae70 100644 --- a/gdb/gdbserver/linux-low.h +++ b/gdb/gdbserver/linux-low.h @@ -20,6 +20,7 @@ #ifdef HAVE_THREAD_DB_H #include <thread_db.h> #endif +#include <signal.h> #include "gdb_proc_service.h" @@ -46,8 +47,6 @@ struct regset_info extern struct regset_info target_regsets[]; #endif -struct siginfo; - struct process_info_private { /* Arch-specific additions. */ @@ -109,7 +108,7 @@ struct linux_target_ops Returns true if any conversion was done; false otherwise. If DIRECTION is 1, then copy from INF to NATIVE. If DIRECTION is 0, copy from NATIVE to INF. */ - int (*siginfo_fixup) (struct siginfo *native, void *inf, int direction); + int (*siginfo_fixup) (siginfo_t *native, void *inf, int direction); /* Hook to call when a new process is created or attached to. If extra per-process architecture-specific data is needed, diff --git a/gdb/gdbserver/linux-x86-low.c b/gdb/gdbserver/linux-x86-low.c index ed1f8a8..b466b5d 100644 --- a/gdb/gdbserver/linux-x86-low.c +++ b/gdb/gdbserver/linux-x86-low.c @@ -918,13 +918,13 @@ siginfo_from_compat_siginfo (siginfo_t *to, compat_siginfo_t *from) INF. */ static int -x86_siginfo_fixup (struct siginfo *native, void *inf, int direction) +x86_siginfo_fixup (siginfo_t *native, void *inf, int direction) { #ifdef __x86_64__ /* Is the inferior 32-bit? If so, then fixup the siginfo object. */ if (register_size (0) == 4) { - if (sizeof (struct siginfo) != sizeof (compat_siginfo_t)) + if (sizeof (siginfo_t) != sizeof (compat_siginfo_t)) fatal ("unexpected difference in siginfo"); if (direction == 0) |