diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 360127e5793842b9b3d32f69e5f2477a9004a17b..a53a42b423008ce5291995d10bb7abf1379a0b4c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2000-05-21  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* fixinc/inclhack.def (sun_malloc): Handle `calloc'.
+	(sun_malloc, sysz_stdtypes_for_sun): Add test_text.
+
 Sun May 21 16:42:31 2000  Richard Kenner  <kenner@vlsi1.ultra.nyu.edu>
 
 	* combine.c (try_combine): Handle i3_subst_into_i2 case when I2 is
diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x
index 912a159112ab2bc04d7ab386bd0b372f8f993154..ab5a38c26befe07706950ff08d94c014564a2eb4 100644
--- a/gcc/fixinc/fixincl.x
+++ b/gcc/fixinc/fixincl.x
@@ -3736,6 +3736,7 @@ const char* apzSun_MallocPatch[] = { "sed",
     "-e", "s/int[ \t][ \t]*free/void\tfree/g",
     "-e", "s/char\\([ \t]*\\*[ \t]*malloc\\)/void\\1/g",
     "-e", "s/char\\([ \t]*\\*[ \t]*realloc\\)/void\\1/g",
+    "-e", "s/char\\([ \t]*\\*[ \t]*calloc\\)/void\\1/g",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def
index f8d71910a1a63e73bf144c40f35095273a04a5ee..c952ad7a878c40a0959635f52ed01b4a32667531 100644
--- a/gcc/fixinc/inclhack.def
+++ b/gcc/fixinc/inclhack.def
@@ -2039,11 +2039,13 @@ fix = {
     sed   = "s/int[ \t][ \t]*free/void\tfree/g";
     sed   = "s/char\\([ \t]*\\*[ \t]*malloc\\)/void\\1/g";
     sed   = "s/char\\([ \t]*\\*[ \t]*realloc\\)/void\\1/g";
+    sed   = "s/char\\([ \t]*\\*[ \t]*calloc\\)/void\\1/g";
 
     test_text =
     "typedef char *\tmalloc_t;\n"
     "int \tfree();\n"
     "char*\tmalloc();\n"
+    "char*\tcalloc();\n"
     "char*\trealloc();";
 };
 
@@ -2597,6 +2599,10 @@ fix = {
 
     sed   = "/[\t ]wchar_t.*;/a\\\n"
               "#endif\n";
+
+    test_text = "typedef int size_t; /* ??? */\n"
+     "typedef int ptrdiff_t; /* result of subtracting two pointers */\n"
+     "typedef unsigned short wchar_t; /* big enough for biggest char set */\n";
 };