diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1f8895bb35f..0f66fd0cfb3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2002-10-06  Alexandre Oliva  <aoliva@redhat.com>
+
+	* config/mips/mips.h (SIZE_TYPE, PTRDIFF_TYPE): Override
+	previously definitions.
+
 2002-10-06  Frank Ch. Eigler  <fche@redhat.com>
 
 	* cppinit.c (init_standard_includes, parse_option): Use strncmp.
diff --git a/gcc/config/mips/mips.h b/gcc/config/mips/mips.h
index 61e827bdf90..87513a2bda0 100644
--- a/gcc/config/mips/mips.h
+++ b/gcc/config/mips/mips.h
@@ -4584,15 +4584,14 @@ while (0)
 #define MIPS_UNMARK_STAB(code) ((code)-CODE_MASK)
 
 
-/* Default definitions for size_t and ptrdiff_t.  */
+/* Default definitions for size_t and ptrdiff_t.  We must override the
+   definitions from ../svr4.h on mips-*-linux-gnu.  */
 
-#ifndef SIZE_TYPE
+#undef SIZE_TYPE
 #define SIZE_TYPE (Pmode == DImode ? "long unsigned int" : "unsigned int")
-#endif
 
-#ifndef PTRDIFF_TYPE
+#undef PTRDIFF_TYPE
 #define PTRDIFF_TYPE (Pmode == DImode ? "long int" : "int")
-#endif
 
 /* See mips_expand_prologue's use of loadgp for when this should be
    true.  */