patches/glibc/ports-2.10.1/660-debug-readlink_chk-readklinkat_chk.patch
author Anthony Foiani <anthony.foiani@gmail.com>
Thu Oct 07 22:37:06 2010 +0200 (2010-10-07)
changeset 2138 2242d87c5404
parent 1394 51d112dfbe79
permissions -rw-r--r--
scripts: always create lib32 and lib64 symlinks

Unconditionally create the lib32 -> lib/ and lib64 -> lib/ symlinks.

This is reportedly a fix to build a toolchain for a 32-bit target on
a 'pure' 64-bit host (eg. on Fedora FC12, host libs are in lib64/,
and there is no lib -> lib64 symlink, as we can see on other distors,
as Debian). As gcc only puts static host lib in lib64/ (along with
target files in subdirs), we can safely create the symlinks.

Also note that the symlinks are summarily removed at the end
of the build.

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