diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7cd464157c3..4a6723d888c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2002-07-01  Roger Sayle  <roger@eyesopen.com>
+
+	* config/sh/sh.c (sh_media_init_builtins): Change use of poisoned
+	identifier "bzero" to "memset".  Pass extra NULL_TREE argument to
+	builtin_function.
+
 2002-07-02  Alan Modra  <amodra@bigpond.net.au>
 
 	* README.Portability: Fix typos.
diff --git a/gcc/config/sh/sh.c b/gcc/config/sh/sh.c
index 429eda6d1e0..6ab45d289ca 100644
--- a/gcc/config/sh/sh.c
+++ b/gcc/config/sh/sh.c
@@ -7192,7 +7192,7 @@ sh_media_init_builtins ()
   tree shared[SH_BLTIN_NUM_SHARED_SIGNATURES];
   const struct builtin_description *d;
 
-  bzero (shared, sizeof shared);
+  memset (shared, 0, sizeof shared);
   for (d = bdesc; d - bdesc < sizeof bdesc / sizeof bdesc[0]; d++)
     {
       tree type, arg_type;
@@ -7235,7 +7235,8 @@ sh_media_init_builtins ()
 	  if (signature < SH_BLTIN_NUM_SHARED_SIGNATURES)
 	    shared[signature] = type;
 	}
-      builtin_function (d->name, type, d - bdesc, BUILT_IN_MD, NULL);
+      builtin_function (d->name, type, d - bdesc, BUILT_IN_MD,
+			NULL, NULL_TREE);
     }
 }