# HG changeset patch # User "Yann E. MORIN" # Date 1259182071 -3600 # Node ID 20a3813e7ca30a95a01dd392bc754d596aa0792e # Parent 489e9f2158fa8bd86e3080af1c63983b097fc93e libc/glibc: update 2.10.1 patchset According to: http://sourceware.org/ml/crossgcc/2009-11/msg00109.html update the patchset for correct Alpha build. diff -r 489e9f2158fa -r 20a3813e7ca3 patches/glibc/ports-2.10.1/440-alpha-cache-shape.patch --- a/patches/glibc/ports-2.10.1/440-alpha-cache-shape.patch Wed Nov 25 00:10:42 2009 -0800 +++ b/patches/glibc/ports-2.10.1/440-alpha-cache-shape.patch Wed Nov 25 21:47:51 2009 +0100 @@ -8,7 +8,6 @@ diff -durN glibc-2.10.1.orig/glibc-ports-2.10.1/sysdeps/unix/sysv/linux/alpha/dl-support.c glibc-2.10.1/glibc-ports-2.10.1/sysdeps/unix/sysv/linux/alpha/dl-support.c --- glibc-2.10.1.orig/glibc-ports-2.10.1/sysdeps/unix/sysv/linux/alpha/dl-support.c 2009-05-16 10:36:20.000000000 +0200 +++ glibc-2.10.1/glibc-ports-2.10.1/sysdeps/unix/sysv/linux/alpha/dl-support.c 2009-11-13 00:50:53.000000000 +0100 -@@ -1,2 +0,0 @@ +@@ -1,2 +1,1 @@ -#include "dl-auxv.h" --#include -diff -durN glibc-2.10.1.orig/ports/sysdeps/unix/sysv/linux/alpha/dl-support.c glibc-2.10.1/ports/sysdeps/unix/sysv/linux/alpha/dl-support.c + #include diff -r 489e9f2158fa -r 20a3813e7ca3 patches/glibc/ports-2.10.1/640-alpha-atfcts.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/glibc/ports-2.10.1/640-alpha-atfcts.patch Wed Nov 25 21:47:51 2009 +0100 @@ -0,0 +1,12 @@ +--- glibc-2.7/sysdeps/unix/sysv/linux/kernel-features.h 2007-08-14 06:21:09.000000000 +0300 ++++ glibc-2.7/sysdeps/unix/sysv/linux/kernel-features.h.new 2008-07-23 07:05:20.000000000 +0300 +@@ -454,8 +454,7 @@ + and on Alpha just after 2.6.22-rc1. */ + #if __LINUX_KERNEL_VERSION >= 0x020611 \ + && ((!defined __sh__ && !defined __alpha__) \ +- || (__LINUX_KERNEL_VERSION >= 0x020613 && defined __sh__) \ +- || (__LINUX_KERNEL_VERSION >= 0x020617 && defined __alpha__)) ++ || (__LINUX_KERNEL_VERSION >= 0x020613 && defined __sh__)) + # define __ASSUME_ATFCTS 1 + #endif + diff -r 489e9f2158fa -r 20a3813e7ca3 patches/glibc/ports-2.10.1/650-syslog.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/glibc/ports-2.10.1/650-syslog.patch Wed Nov 25 21:47:51 2009 +0100 @@ -0,0 +1,12 @@ +diff -durN glibc-cvs-2.9.orig/misc/syslog.c glibc-cvs-2.9/misc/syslog.c +--- glibc-cvs-2.9.orig/misc/syslog.c 2009-06-01 10:16:50.000000000 +0200 ++++ glibc-cvs-2.9/misc/syslog.c 2009-06-01 10:17:20.000000000 +0200 +@@ -152,7 +152,7 @@ + #define INTERNALLOG LOG_ERR|LOG_CONS|LOG_PERROR|LOG_PID + /* Check for invalid bits. */ + if (pri & ~(LOG_PRIMASK|LOG_FACMASK)) { +- syslog(INTERNALLOG, ++ __syslog(INTERNALLOG, + "syslog: unknown facility/priority: %x", pri); + pri &= LOG_PRIMASK|LOG_FACMASK; + } diff -r 489e9f2158fa -r 20a3813e7ca3 patches/glibc/ports-2.10.1/660-debug-readlink_chk-readklinkat_chk.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/glibc/ports-2.10.1/660-debug-readlink_chk-readklinkat_chk.patch Wed Nov 25 21:47:51 2009 +0100 @@ -0,0 +1,24 @@ +diff -dur glibc-cvs-2.9.orig/debug/readlink_chk.c glibc-cvs-2.9/debug/readlink_chk.c +--- glibc-cvs-2.9.orig/debug/readlink_chk.c 2005-03-01 01:41:15.000000000 +0100 ++++ glibc-cvs-2.9/debug/readlink_chk.c 2009-06-01 10:59:37.000000000 +0200 +@@ -25,7 +25,7 @@ + + + ssize_t +-__readlink_chk (const char *path, void *buf, size_t len, size_t buflen) ++__readlink_chk (const char *path, char *buf, size_t len, size_t buflen) + { + if (len > buflen) + __chk_fail (); +diff -dur glibc-cvs-2.9.orig/debug/readlinkat_chk.c glibc-cvs-2.9/debug/readlinkat_chk.c +--- glibc-cvs-2.9.orig/debug/readlinkat_chk.c 2006-04-24 18:56:12.000000000 +0200 ++++ glibc-cvs-2.9/debug/readlinkat_chk.c 2009-06-01 11:07:26.000000000 +0200 +@@ -21,7 +21,7 @@ + + + ssize_t +-__readlinkat_chk (int fd, const char *path, void *buf, size_t len, ++__readlinkat_chk (int fd, const char *path, char *buf, size_t len, + size_t buflen) + { + if (len > buflen)