patches/glibc/ports-2.13/660-debug-readlink_chk-readklinkat_chk.patch
author "Bryan Hundven" <bryanhundven@gmail.com>
Thu Mar 01 15:23:49 2012 -0800 (2012-03-01)
changeset 2909 28ac8fbd9e6a
permissions -rw-r--r--
libg/eglibc: add updated eglibc 2.15

Includes a patch to remove __builtin_expect test:

In eglibc-2.15, the build breaks in configure while testing
for the existance of __builtin_expect. It fails with newer
versions of gcc.

This patch is a modification of an upstream change in glibc
mainline (to be 2.16) to fix the following error:

[CFG ] checking for __builtin_expect... no
[ERROR] configure: error: support for __builtin_expect needed

http://sourceware.org/git/?p=glibc.git;a=commit;h=3857022a761ea7251f8e5c0e45d382ebc3e34cf9

Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>
[yann.morin.1998@free.fr: coalesce both patches into a single changeset]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
yann@2438
     1
diff -dur glibc-cvs-2.9.orig/debug/readlink_chk.c glibc-cvs-2.9/debug/readlink_chk.c
yann@2438
     2
--- glibc-cvs-2.9.orig/debug/readlink_chk.c	2005-03-01 01:41:15.000000000 +0100
yann@2438
     3
+++ glibc-cvs-2.9/debug/readlink_chk.c	2009-06-01 10:59:37.000000000 +0200
yann@2438
     4
@@ -25,7 +25,7 @@
yann@2438
     5
 
yann@2438
     6
 
yann@2438
     7
 ssize_t
yann@2438
     8
-__readlink_chk (const char *path, void *buf, size_t len, size_t buflen)
yann@2438
     9
+__readlink_chk (const char *path, char *buf, size_t len, size_t buflen)
yann@2438
    10
 {
yann@2438
    11
   if (len > buflen)
yann@2438
    12
     __chk_fail ();
yann@2438
    13
diff -dur glibc-cvs-2.9.orig/debug/readlinkat_chk.c glibc-cvs-2.9/debug/readlinkat_chk.c
yann@2438
    14
--- glibc-cvs-2.9.orig/debug/readlinkat_chk.c	2006-04-24 18:56:12.000000000 +0200
yann@2438
    15
+++ glibc-cvs-2.9/debug/readlinkat_chk.c	2009-06-01 11:07:26.000000000 +0200
yann@2438
    16
@@ -21,7 +21,7 @@
yann@2438
    17
 
yann@2438
    18
 
yann@2438
    19
 ssize_t
yann@2438
    20
-__readlinkat_chk (int fd, const char *path, void *buf, size_t len,
yann@2438
    21
+__readlinkat_chk (int fd, const char *path, char *buf, size_t len,
yann@2438
    22
 		  size_t buflen)
yann@2438
    23
 {
yann@2438
    24
   if (len > buflen)