patches/gcc/4.4.3/330-libmudflap-susv3-legacy.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Mon Mar 28 01:05:18 2011 +0200 (2011-03-28)
changeset 2362 0888065f8c4d
parent 1611 e2516bba8fe5
permissions -rw-r--r--
cc/gcc: cleanup the _or_later logic

So far, we've had a version always select appropriate _or_later option,
which in turn would select all previous _or_later options.

Because the dependencies on companion libs were cumulative, that was
working OK. But the upcoming 4.6 will no longer depend on libelf, so
we can't keep the cumulative scheme we've been using so far.

Have each release family select the corresponding dependencies, instead
of relying on selecting previous _or_later.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
yann@1393
     1
diff -durN gcc-4.4.0.orig/libmudflap/mf-hooks2.c gcc-4.4.0/libmudflap/mf-hooks2.c
yann@1393
     2
--- gcc-4.4.0.orig/libmudflap/mf-hooks2.c	2009-04-10 01:23:07.000000000 +0200
yann@1393
     3
+++ gcc-4.4.0/libmudflap/mf-hooks2.c	2009-05-27 21:39:00.000000000 +0200
yann@1393
     4
@@ -421,7 +421,7 @@
yann@1393
     5
 {
yann@1393
     6
   TRACE ("%s\n", __PRETTY_FUNCTION__);
yann@1393
     7
   MF_VALIDATE_EXTENT(s, n, __MF_CHECK_WRITE, "bzero region");
yann@1393
     8
-  bzero (s, n);
yann@1393
     9
+  memset (s, 0, n);
yann@1393
    10
 }
yann@1393
    11
 
yann@1393
    12
 
yann@1393
    13
@@ -431,7 +431,7 @@
yann@1393
    14
   TRACE ("%s\n", __PRETTY_FUNCTION__);
yann@1393
    15
   MF_VALIDATE_EXTENT(src, n, __MF_CHECK_READ, "bcopy src");
yann@1393
    16
   MF_VALIDATE_EXTENT(dest, n, __MF_CHECK_WRITE, "bcopy dest");
yann@1393
    17
-  bcopy (src, dest, n);
yann@1393
    18
+  memmove (dest, src, n);
yann@1393
    19
 }
yann@1393
    20
 
yann@1393
    21
 
yann@1393
    22
@@ -441,7 +441,7 @@
yann@1393
    23
   TRACE ("%s\n", __PRETTY_FUNCTION__);
yann@1393
    24
   MF_VALIDATE_EXTENT(s1, n, __MF_CHECK_READ, "bcmp 1st arg");
yann@1393
    25
   MF_VALIDATE_EXTENT(s2, n, __MF_CHECK_READ, "bcmp 2nd arg");
yann@1393
    26
-  return bcmp (s1, s2, n);
yann@1393
    27
+  return n == 0 ? 0 : memcmp (s1, s2, n);
yann@1393
    28
 }
yann@1393
    29
 
yann@1393
    30
 
yann@1393
    31
@@ -450,7 +450,7 @@
yann@1393
    32
   size_t n = strlen (s);
yann@1393
    33
   TRACE ("%s\n", __PRETTY_FUNCTION__);
yann@1393
    34
   MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "index region");
yann@1393
    35
-  return index (s, c);
yann@1393
    36
+  return strchr (s, c);
yann@1393
    37
 }
yann@1393
    38
 
yann@1393
    39
 
yann@1393
    40
@@ -459,7 +459,7 @@
yann@1393
    41
   size_t n = strlen (s);
yann@1393
    42
   TRACE ("%s\n", __PRETTY_FUNCTION__);
yann@1393
    43
   MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "rindex region");
yann@1393
    44
-  return rindex (s, c);
yann@1393
    45
+  return strrchr (s, c);
yann@1393
    46
 }
yann@1393
    47
 
yann@1393
    48
 /* XXX:  stpcpy, memccpy */