From 9f1036c17f3a91b8c1eaadb16a131a37d48540ea Mon Sep 17 00:00:00 2001 From: Doug Evans Date: Wed, 13 May 2009 19:11:04 +0000 Subject: [PATCH] * linux-x86-low.c: Don't include assert.h. (x86_siginfo_fixup): Use fatal, not assert. (x86_arch_setup): Fix comment. --- gdb/gdbserver/ChangeLog | 6 ++++++ gdb/gdbserver/linux-x86-low.c | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 798d4de..333ab71 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,9 @@ +2009-05-13 Doug Evans + + * linux-x86-low.c: Don't include assert.h. + (x86_siginfo_fixup): Use fatal, not assert. + (x86_arch_setup): Fix comment. + 2009-05-12 Doug Evans Biarch support for i386/amd64 gdbserver. diff --git a/gdb/gdbserver/linux-x86-low.c b/gdb/gdbserver/linux-x86-low.c index ffb70dc..416f19f 100644 --- a/gdb/gdbserver/linux-x86-low.c +++ b/gdb/gdbserver/linux-x86-low.c @@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include #include #include "server.h" #include "linux-low.h" @@ -551,7 +550,8 @@ x86_siginfo_fixup (struct siginfo *native, void *inf, int direction) /* Is the inferior 32-bit? If so, then fixup the siginfo object. */ if (register_size (0) == 4) { - assert (sizeof (struct siginfo) == sizeof (compat_siginfo_t)); + if (sizeof (struct siginfo) != sizeof (compat_siginfo_t)) + fatal ("unexpected difference in siginfo"); if (direction == 0) compat_siginfo_from_siginfo ((struct compat_siginfo *) inf, native); @@ -565,7 +565,7 @@ x86_siginfo_fixup (struct siginfo *native, void *inf, int direction) return 0; } -/* Return non-zero if the target is 64-bit. */ +/* Initialize gdbserver for the architecture of the inferior. */ static void x86_arch_setup (void) -- 2.7.4