* linux-x86-low.c: Don't include assert.h.

	(x86_siginfo_fixup): Use fatal, not assert.
	(x86_arch_setup): Fix comment.

diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 798d4de3031df17f0c6d49a1d51609e5e6a48834..333ab718d8c1bf55f4ab32967e54a60a6d183a94 100644 (file)
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,9 @@
+2009-05-13  Doug Evans  <dje@google.com>
+
+       * 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  <dje@google.com>
 
        Biarch support for i386/amd64 gdbserver.

diff --git a/gdb/gdbserver/linux-x86-low.c b/gdb/gdbserver/linux-x86-low.c
index ffb70dc7e2c2b6388ec991153fe849c5f7064c07..416f19f9abbbe8df9db78ea456c6a062cdc2bd09 100644 (file)
--- 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 <http://www.gnu.org/licenses/>.  */
 
-#include <assert.h>
 #include <signal.h>
 #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;
 }
 \f
-/* Return non-zero if the target is 64-bit.  */
+/* Initialize gdbserver for the architecture of the inferior.  */
 
 static void
 x86_arch_setup (void)