Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/glibc/2.9/570-debug-readlink_chk-readklinkat_chk.patch
author Esben Haabendal <eha@dev.doredevelopment.dk>
Wed Apr 06 20:15:23 2011 +0200 (2011-04-06)
changeset 2379 372245834071
permissions -rw-r--r--
libc/glibc: workaround for autoconf'ed define of caddr_t

When building canadian cross compiler, I have some trouble with
configure defining caddr_t as a macro, like:
#define caddr_t char *

When combined with the types.h where caddr_t is protected together
with daddr_t, the typedef of caddr_t breaks.

This patch works around it by protecting the caddr_t typedef
specifically.

I am uncertain as to the real cause and solution to this :-(

Signed-off-by: Esben Haabendal <eha@dev.doredevelopment.dk> 
     1 diff -dur glibc-cvs-2.9.orig/debug/readlink_chk.c glibc-cvs-2.9/debug/readlink_chk.c

     2 --- glibc-cvs-2.9.orig/debug/readlink_chk.c	2005-03-01 01:41:15.000000000 +0100

     3 +++ glibc-cvs-2.9/debug/readlink_chk.c	2009-06-01 10:59:37.000000000 +0200

     4 @@ -25,7 +25,7 @@

     5  

     6  

     7  ssize_t

     8 -__readlink_chk (const char *path, void *buf, size_t len, size_t buflen)

     9 +__readlink_chk (const char *path, char *buf, size_t len, size_t buflen)

    10  {

    11    if (len > buflen)

    12      __chk_fail ();

    13 diff -dur glibc-cvs-2.9.orig/debug/readlinkat_chk.c glibc-cvs-2.9/debug/readlinkat_chk.c

    14 --- glibc-cvs-2.9.orig/debug/readlinkat_chk.c	2006-04-24 18:56:12.000000000 +0200

    15 +++ glibc-cvs-2.9/debug/readlinkat_chk.c	2009-06-01 11:07:26.000000000 +0200

    16 @@ -21,7 +21,7 @@

    17  

    18  

    19  ssize_t

    20 -__readlinkat_chk (int fd, const char *path, void *buf, size_t len,

    21 +__readlinkat_chk (int fd, const char *path, char *buf, size_t len,

    22  		  size_t buflen)

    23  {

    24    if (len > buflen)
crosstool-ng