Index: gcc-4.2/libmudflap/mf-hooks2.c

 ===================================================================

 --- gcc-4.2/libmudflap/mf-hooks2.c	(revision 119834)

 +++ gcc-4.2/libmudflap/mf-hooks2.c	(working copy)

 @@ -427,7 +427,7 @@

  {

    TRACE ("%s\n", __PRETTY_FUNCTION__);

    MF_VALIDATE_EXTENT(s, n, __MF_CHECK_WRITE, "bzero region");

 -  bzero (s, n);

 +  memset (s, 0, n);

  }

 @@ -437,7 +437,7 @@

    TRACE ("%s\n", __PRETTY_FUNCTION__);

    MF_VALIDATE_EXTENT(src, n, __MF_CHECK_READ, "bcopy src");

    MF_VALIDATE_EXTENT(dest, n, __MF_CHECK_WRITE, "bcopy dest");

 -  bcopy (src, dest, n);

 +  memmove (dest, src, n);

  }

 @@ -447,7 +447,7 @@

    TRACE ("%s\n", __PRETTY_FUNCTION__);

    MF_VALIDATE_EXTENT(s1, n, __MF_CHECK_READ, "bcmp 1st arg");

    MF_VALIDATE_EXTENT(s2, n, __MF_CHECK_READ, "bcmp 2nd arg");

 -  return bcmp (s1, s2, n);

 +  return n == 0 ? 0 : memcmp (s1, s2, n);

  }

 @@ -456,7 +456,7 @@

    size_t n = strlen (s);

    TRACE ("%s\n", __PRETTY_FUNCTION__);

    MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "index region");

 -  return index (s, c);

 +  return strchr (s, c);

  }

 @@ -465,7 +465,7 @@

    size_t n = strlen (s);

    TRACE ("%s\n", __PRETTY_FUNCTION__);

    MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "rindex region");

 -  return rindex (s, c);

 +  return strrchr (s, c);

  }

  /* XXX:  stpcpy, memccpy */