patches/gcc/4.2.1/210-libmudflap-susv3-legacy.patch
author "Benoît Thébaudeau" <benoit.thebaudeau@advansee.com>
Wed Dec 14 16:55:22 2011 +0100 (2011-12-14)
branch1.13
changeset 2848 1ff89596dab0
parent 313 2f223aafc7cb
permissions -rw-r--r--
libc/eglibc: fix localedef 2.14 build

The localedef of eglibc 2.14 requires NOT_IN_libc to be defined in order to
compile intl/l10nflist.c.

This is because localedef is built separately from eglibc and uses some parts of
eglibc that don't compile in standalone without this preprocessor definition.

This fixes the following error:

[ALL ] gcc -g -O2 -DNO_SYSCONF -DNO_UNCOMPRESS
-DLOCALE_PATH='"/usr/lib/locale:/usr/share/i18n"'
-DLOCALEDIR='"/usr/lib/locale"' -DLOCALE_ALIAS_PATH='"/usr/share/locale"'
-DCHARMAP_PATH='"/usr/share/i18n/charmaps"'
-DREPERTOIREMAP_PATH='"/usr/share/i18n/repertoiremaps"'
-DLOCSRCDIR='"/usr/share/i18n/locales"' -Iglibc/locale/programs -Iglibc/locale
-I/<snip>/.build/src/eglibc-localedef-2_14/include
-I/<snip>/.build/src/eglibc-localedef-2_14 -I.
-include /<snip>/.build/src/eglibc-localedef-2_14/include/always.h -Wall
-Wno-format -c -o locarchive.o glibc/locale/programs/locarchive.c
[ALL ] glibc/locale/programs/locarchive.c: In function 'enlarge_archive':
[ALL ] glibc/locale/programs/locarchive.c:303:21: warning: variable
'oldlocrectab' set but not used [-Wunused-but-set-variable]
[ALL ] In file included from glibc/locale/programs/locarchive.c:651:0:
[ALL ] glibc/locale/programs/../../intl/l10nflist.c: In function
'_nl_normalize_codeset':
[ERROR] glibc/locale/programs/../../intl/l10nflist.c:342:9: error:
'_nl_C_locobj_ptr' undeclared (first use in this function)
[ALL ] glibc/locale/programs/../../intl/l10nflist.c:342:9: note: each
undeclared identifier is reported only once for each function it appears in
[ALL ] glibc/locale/programs/locarchive.c: In function
'add_locales_to_archive':
[ALL ] glibc/locale/programs/locarchive.c:1450:7: warning: passing argument
1 of '__xpg_basename' discards 'const' qualifier from pointer target type
[enabled by default]
[ALL ] /usr/include/libgen.h:35:14: note: expected 'char *' but argument is
of type 'const char *'
[ERROR] make[1]: *** [locarchive.o] Error 1

Signed-off-by: "Benoît Thébaudeau" <benoit.thebaudeau@advansee.com>
(transplanted from 4cd9134739b594451794cf61a6e1b137422cdafd)
yann@313
     1
diff -durN gcc-4.2.1.orig/libmudflap/mf-hooks2.c gcc-4.2.1/libmudflap/mf-hooks2.c
yann@313
     2
--- gcc-4.2.1.orig/libmudflap/mf-hooks2.c	2005-09-23 23:58:39.000000000 +0200
yann@313
     3
+++ gcc-4.2.1/libmudflap/mf-hooks2.c	2007-08-03 20:35:09.000000000 +0200
yann@313
     4
@@ -427,7 +427,7 @@
yann@313
     5
 {
yann@313
     6
   TRACE ("%s\n", __PRETTY_FUNCTION__);
yann@313
     7
   MF_VALIDATE_EXTENT(s, n, __MF_CHECK_WRITE, "bzero region");
yann@313
     8
-  bzero (s, n);
yann@313
     9
+  memset (s, 0, n);
yann@313
    10
 }
yann@313
    11
 
yann@313
    12
 
yann@313
    13
@@ -437,7 +437,7 @@
yann@313
    14
   TRACE ("%s\n", __PRETTY_FUNCTION__);
yann@313
    15
   MF_VALIDATE_EXTENT(src, n, __MF_CHECK_READ, "bcopy src");
yann@313
    16
   MF_VALIDATE_EXTENT(dest, n, __MF_CHECK_WRITE, "bcopy dest");
yann@313
    17
-  bcopy (src, dest, n);
yann@313
    18
+  memmove (dest, src, n);
yann@313
    19
 }
yann@313
    20
 
yann@313
    21
 
yann@313
    22
@@ -447,7 +447,7 @@
yann@313
    23
   TRACE ("%s\n", __PRETTY_FUNCTION__);
yann@313
    24
   MF_VALIDATE_EXTENT(s1, n, __MF_CHECK_READ, "bcmp 1st arg");
yann@313
    25
   MF_VALIDATE_EXTENT(s2, n, __MF_CHECK_READ, "bcmp 2nd arg");
yann@313
    26
-  return bcmp (s1, s2, n);
yann@313
    27
+  return n == 0 ? 0 : memcmp (s1, s2, n);
yann@313
    28
 }
yann@313
    29
 
yann@313
    30
 
yann@313
    31
@@ -456,7 +456,7 @@
yann@313
    32
   size_t n = strlen (s);
yann@313
    33
   TRACE ("%s\n", __PRETTY_FUNCTION__);
yann@313
    34
   MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "index region");
yann@313
    35
-  return index (s, c);
yann@313
    36
+  return strchr (s, c);
yann@313
    37
 }
yann@313
    38
 
yann@313
    39
 
yann@313
    40
@@ -465,7 +465,7 @@
yann@313
    41
   size_t n = strlen (s);
yann@313
    42
   TRACE ("%s\n", __PRETTY_FUNCTION__);
yann@313
    43
   MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "rindex region");
yann@313
    44
-  return rindex (s, c);
yann@313
    45
+  return strrchr (s, c);
yann@313
    46
 }
yann@313
    47
 
yann@313
    48
 /* XXX:  stpcpy, memccpy */