yann@2149: diff -durN gcc-4.4.5.orig/libmudflap/mf-hooks2.c gcc-4.4.5/libmudflap/mf-hooks2.c yann@2149: --- gcc-4.4.5.orig/libmudflap/mf-hooks2.c 2009-04-10 01:23:07.000000000 +0200 yann@2149: +++ gcc-4.4.5/libmudflap/mf-hooks2.c 2010-10-09 23:11:52.000000000 +0200 yann@2149: @@ -421,7 +421,7 @@ yann@2149: { yann@2149: TRACE ("%s\n", __PRETTY_FUNCTION__); yann@2149: MF_VALIDATE_EXTENT(s, n, __MF_CHECK_WRITE, "bzero region"); yann@2149: - bzero (s, n); yann@2149: + memset (s, 0, n); yann@2149: } yann@2149: yann@2149: yann@2149: @@ -431,7 +431,7 @@ yann@2149: TRACE ("%s\n", __PRETTY_FUNCTION__); yann@2149: MF_VALIDATE_EXTENT(src, n, __MF_CHECK_READ, "bcopy src"); yann@2149: MF_VALIDATE_EXTENT(dest, n, __MF_CHECK_WRITE, "bcopy dest"); yann@2149: - bcopy (src, dest, n); yann@2149: + memmove (dest, src, n); yann@2149: } yann@2149: yann@2149: yann@2149: @@ -441,7 +441,7 @@ yann@2149: TRACE ("%s\n", __PRETTY_FUNCTION__); yann@2149: MF_VALIDATE_EXTENT(s1, n, __MF_CHECK_READ, "bcmp 1st arg"); yann@2149: MF_VALIDATE_EXTENT(s2, n, __MF_CHECK_READ, "bcmp 2nd arg"); yann@2149: - return bcmp (s1, s2, n); yann@2149: + return n == 0 ? 0 : memcmp (s1, s2, n); yann@2149: } yann@2149: yann@2149: yann@2149: @@ -450,7 +450,7 @@ yann@2149: size_t n = strlen (s); yann@2149: TRACE ("%s\n", __PRETTY_FUNCTION__); yann@2149: MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "index region"); yann@2149: - return index (s, c); yann@2149: + return strchr (s, c); yann@2149: } yann@2149: yann@2149: yann@2149: @@ -459,7 +459,7 @@ yann@2149: size_t n = strlen (s); yann@2149: TRACE ("%s\n", __PRETTY_FUNCTION__); yann@2149: MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "rindex region"); yann@2149: - return rindex (s, c); yann@2149: + return strrchr (s, c); yann@2149: } yann@2149: yann@2149: /* XXX: stpcpy, memccpy */