diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index aa407cddcd..dbc3be9d75 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,7 @@
 2008-10-09  Thomas Schwinge  <tschwinge@gnu.org>
 
+	* reply_mig_hack.awk: Use the `BAD_TYPECHECK' macro.
+
 	* MAINTAINERS (Write After Approval): Add myself.
 
 2008-10-09  Pedro Alves  <pedro@codesourcery.com>
diff --git a/gdb/reply_mig_hack.awk b/gdb/reply_mig_hack.awk
index a201d06299..4d8f6c1ddb 100644
--- a/gdb/reply_mig_hack.awk
+++ b/gdb/reply_mig_hack.awk
@@ -101,7 +101,7 @@ parse_phase == 5 && /^#if[ \t]TypeCheck/ {
   # structure that we want to check for.
   print "\tif (In0P->Head.msgh_size == sizeof (Reply)";
   print "\t    && ! (In0P->Head.msgh_bits & MACH_MSGH_BITS_COMPLEX)";
-  print "\t    && *(int *)&In0P->" arg_type_code_name[0] " == *(int *)&" arg_check_name[0];
+  print "\t    && ! BAD_TYPECHECK(&In0P->" arg_type_code_name[0] ", &" arg_check_name[0] ")";
   print "\t    && In0P->" arg_name[0] " != 0)";
   print "\t  /* Error return, only the error code argument is passed.  */";
   print "\t  {";