patches/gcc/4.3.2/300-libmudflap-susv3-legacy.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Thu Dec 27 12:45:22 2012 +0100 (2012-12-27)
changeset 3152 b286c7993be5
parent 757 90e887b06da3
permissions -rw-r--r--
scripts/addToolsVersion: properly handle .in vs. .in.2

While most components have their version in the .in file, some
have it in the .in.2 (eg. elf2flt).

Currently, to handle this case, we indiscriminately munge both files,
but this is wrong: in the elf2flt case, if we add a binutils version,
we do not want it to be added to elf2flt, and conversely.

So, for each tool, we need to explicitly know what file to munge.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
yann@757
     1
Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/uclibc/90_all_305-libmudflap-susv3-legacy.patch
yann@757
     2
diff -durN gcc-4.3.1.orig/libmudflap/mf-hooks2.c gcc-4.3.1/libmudflap/mf-hooks2.c
yann@757
     3
--- gcc-4.3.1.orig/libmudflap/mf-hooks2.c	2005-09-23 23:58:39.000000000 +0200
yann@757
     4
+++ gcc-4.3.1/libmudflap/mf-hooks2.c	2008-06-10 14:59:05.000000000 +0200
yann@757
     5
@@ -427,7 +427,7 @@
yann@757
     6
 {
yann@757
     7
   TRACE ("%s\n", __PRETTY_FUNCTION__);
yann@757
     8
   MF_VALIDATE_EXTENT(s, n, __MF_CHECK_WRITE, "bzero region");
yann@757
     9
-  bzero (s, n);
yann@757
    10
+  memset (s, 0, n);
yann@757
    11
 }
yann@757
    12
 
yann@757
    13
 
yann@757
    14
@@ -437,7 +437,7 @@
yann@757
    15
   TRACE ("%s\n", __PRETTY_FUNCTION__);
yann@757
    16
   MF_VALIDATE_EXTENT(src, n, __MF_CHECK_READ, "bcopy src");
yann@757
    17
   MF_VALIDATE_EXTENT(dest, n, __MF_CHECK_WRITE, "bcopy dest");
yann@757
    18
-  bcopy (src, dest, n);
yann@757
    19
+  memmove (dest, src, n);
yann@757
    20
 }
yann@757
    21
 
yann@757
    22
 
yann@757
    23
@@ -447,7 +447,7 @@
yann@757
    24
   TRACE ("%s\n", __PRETTY_FUNCTION__);
yann@757
    25
   MF_VALIDATE_EXTENT(s1, n, __MF_CHECK_READ, "bcmp 1st arg");
yann@757
    26
   MF_VALIDATE_EXTENT(s2, n, __MF_CHECK_READ, "bcmp 2nd arg");
yann@757
    27
-  return bcmp (s1, s2, n);
yann@757
    28
+  return memcmp (s1, s2, n);
yann@757
    29
 }
yann@757
    30
 
yann@757
    31
 
yann@757
    32
@@ -456,7 +456,7 @@
yann@757
    33
   size_t n = strlen (s);
yann@757
    34
   TRACE ("%s\n", __PRETTY_FUNCTION__);
yann@757
    35
   MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "index region");
yann@757
    36
-  return index (s, c);
yann@757
    37
+  return strchr (s, c);
yann@757
    38
 }
yann@757
    39
 
yann@757
    40
 
yann@757
    41
@@ -465,7 +465,7 @@
yann@757
    42
   size_t n = strlen (s);
yann@757
    43
   TRACE ("%s\n", __PRETTY_FUNCTION__);
yann@757
    44
   MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "rindex region");
yann@757
    45
-  return rindex (s, c);
yann@757
    46
+  return strrchr (s, c);
yann@757
    47
 }
yann@757
    48
 
yann@757
    49
 /* XXX:  stpcpy, memccpy */