[gentoo-commits] gentoo commit in src/patchsets/glibc/2.11: 0056_all_glibc-2.11-preadv-pwritev-fallocate-64bit.patch 0057_all_glibc-2.11-readahead-ppc32.patch 0058_all_glibc-2.11-memset-fortify-const-warning.patch

[Mike Frysinger (vapier)]

vapier      09/12/02 02:37:58

  Added:               
                        0056_all_glibc-2.11-preadv-pwritev-fallocate-64bit.patch
                        0057_all_glibc-2.11-readahead-ppc32.patch
                        0058_all_glibc-2.11-memset-fortify-const-warning.patch
  Log:
  grab some fixes from mainline

Revision  Changes    Path
1.1                  src/patchsets/glibc/2.11/0056_all_glibc-2.11-preadv-pwritev-fallocate-64bit.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/glibc/2.11/0056_all_glibc-2.11-preadv-pwritev-fallocate-64bit.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/glibc/2.11/0056_all_glibc-2.11-preadv-pwritev-fallocate-64bit.patch?rev=1.1&content-type=text/plain

Index: 0056_all_glibc-2.11-preadv-pwritev-fallocate-64bit.patch
===================================================================
From 34df851b3364e14133b865574dbc5f2a8b88874e Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@××××××.com>
Date: Fri, 6 Nov 2009 09:26:31 -0800
Subject: [PATCH 03/25] Fix preadv, pwritev and fallocate for	-D_FILE_OFFSET_BITS=64.

As reported in http://bugzilla.redhat.com/533063 , preadv/pwritev prototypes
are wrong on 32-bit arches with -D_FILE_OFFSET_BITS=64 and as I've just
found, fallocate is wrong too.
The problem is that only off_t is remapped to the 64-bit type transparently,
__off_t is not.
---
 ChangeLog                                    |   14 ++++++++++++++
 misc/sys/uio.h                               |    4 ++--
 sysdeps/unix/sysv/linux/i386/bits/fcntl.h    |    4 ++--
 sysdeps/unix/sysv/linux/ia64/bits/fcntl.h    |    4 ++--
 sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h |    4 ++--
 sysdeps/unix/sysv/linux/s390/bits/fcntl.h    |    4 ++--
 sysdeps/unix/sysv/linux/sh/bits/fcntl.h      |    4 ++--
 sysdeps/unix/sysv/linux/sparc/bits/fcntl.h   |    4 ++--
 sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h  |    4 ++--
 9 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/misc/sys/uio.h b/misc/sys/uio.h
index 05d956b..a32b7ed 100644
--- a/misc/sys/uio.h
+++ b/misc/sys/uio.h
@@ -80,10 +80,10 @@ extern ssize_t pwritev (int __fd, __const struct iovec *__iovec, int __count,
 # else
 #  ifdef __REDIRECT
 extern ssize_t __REDIRECT (preadv, (int __fd, __const struct iovec *__iovec,
-				    int __count, __off_t __offset),
+				    int __count, __off64_t __offset),
 			   preadv64) __wur;
 extern ssize_t __REDIRECT (pwritev, (int __fd, __const struct iovec *__iovec,
-				     int __count, __off_t __offset),
+				     int __count, __off64_t __offset),
 			   pwritev64) __wur;
 #  else
 #   define preadv preadv64
diff --git a/sysdeps/unix/sysv/linux/i386/bits/fcntl.h b/sysdeps/unix/sysv/linux/i386/bits/fcntl.h
index 06b9e48..6a38dc0 100644
--- a/sysdeps/unix/sysv/linux/i386/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/i386/bits/fcntl.h
@@ -259,8 +259,8 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len,
 extern int fallocate (int __fd, int __mode, __off_t __offset, __off_t __len);
 # else
 #  ifdef __REDIRECT
-extern int __REDIRECT (fallocate, (int __fd, int __mode, __off_t __offset,
-				   __off_t __len),
+extern int __REDIRECT (fallocate, (int __fd, int __mode, __off64_t __offset,
+				   __off64_t __len),
 		       fallocate64);
 #  else
 #   define fallocate fallocate64
diff --git a/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h b/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h
index 9677394..9a0245a 100644
--- a/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h
@@ -253,8 +253,8 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len,
 extern int fallocate (int __fd, int __mode, __off_t __offset, __off_t __len);
 # else
 #  ifdef __REDIRECT
-extern int __REDIRECT (fallocate, (int __fd, int __mode, __off_t __offset,
-				   __off_t __len),
+extern int __REDIRECT (fallocate, (int __fd, int __mode, __off64_t __offset,
+				   __off64_t __len),
 		       fallocate64);
 #  else
 #   define fallocate fallocate64
diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h b/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h
index ea0ee6e..6c4b66b 100644
--- a/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h
@@ -259,8 +259,8 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len,
 extern int fallocate (int __fd, int __mode, __off_t __offset, __off_t __len);
 # else
 #  ifdef __REDIRECT
-extern int __REDIRECT (fallocate, (int __fd, int __mode, __off_t __offset,
-				   __off_t __len),
+extern int __REDIRECT (fallocate, (int __fd, int __mode, __off64_t __offset,
+				   __off64_t __len),
 		       fallocate64);
 #  else
 #   define fallocate fallocate64
diff --git a/sysdeps/unix/sysv/linux/s390/bits/fcntl.h b/sysdeps/unix/sysv/linux/s390/bits/fcntl.h
index 3a11c48..d3dddbc 100644
--- a/sysdeps/unix/sysv/linux/s390/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/s390/bits/fcntl.h
@@ -279,8 +279,8 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len,
 extern int fallocate (int __fd, int __mode, __off_t __offset, __off_t __len);
 # else
 #  ifdef __REDIRECT
-extern int __REDIRECT (fallocate, (int __fd, int __mode, __off_t __offset,
-				   __off_t __len),
+extern int __REDIRECT (fallocate, (int __fd, int __mode, __off64_t __offset,
+				   __off64_t __len),
 		       fallocate64);
 #  else
 #   define fallocate fallocate64
diff --git a/sysdeps/unix/sysv/linux/sh/bits/fcntl.h b/sysdeps/unix/sysv/linux/sh/bits/fcntl.h
index 03ecd72..d7a21ea 100644
--- a/sysdeps/unix/sysv/linux/sh/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/sh/bits/fcntl.h
@@ -259,8 +259,8 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len,
 extern int fallocate (int __fd, int __mode, __off_t __offset, __off_t __len);
 # else
 #  ifdef __REDIRECT
-extern int __REDIRECT (fallocate, (int __fd, int __mode, __off_t __offset,
-				   __off_t __len),
+extern int __REDIRECT (fallocate, (int __fd, int __mode, __off64_t __offset,
+				   __off64_t __len),
 		       fallocate64);
 #  else
 #   define fallocate fallocate64
diff --git a/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h b/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h
index 2b8c9bd..dfa848a 100644
--- a/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h
@@ -278,8 +278,8 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len,
 extern int fallocate (int __fd, int __mode, __off_t __offset, __off_t __len);
 # else
 #  ifdef __REDIRECT
-extern int __REDIRECT (fallocate, (int __fd, int __mode, __off_t __offset,
-				   __off_t __len),
+extern int __REDIRECT (fallocate, (int __fd, int __mode, __off64_t __offset,
+				   __off64_t __len),
 		       fallocate64);
 #  else
 #   define fallocate fallocate64
diff --git a/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h b/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h
index 29c956c..c3eb859 100644
--- a/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h
@@ -273,8 +273,8 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len,
 extern int fallocate (int __fd, int __mode, __off_t __offset, __off_t __len);
 # else
 #  ifdef __REDIRECT
-extern int __REDIRECT (fallocate, (int __fd, int __mode, __off_t __offset,
-				   __off_t __len),
+extern int __REDIRECT (fallocate, (int __fd, int __mode, __off64_t __offset,
+				   __off64_t __len),
 		       fallocate64);
 #  else
 #   define fallocate fallocate64
-- 
1.6.5.3




1.1                  src/patchsets/glibc/2.11/0057_all_glibc-2.11-readahead-ppc32.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/glibc/2.11/0057_all_glibc-2.11-readahead-ppc32.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/glibc/2.11/0057_all_glibc-2.11-readahead-ppc32.patch?rev=1.1&content-type=text/plain

Index: 0057_all_glibc-2.11-readahead-ppc32.patch
===================================================================
From 5b55d23611e939340d658f42212c474c8188053e Mon Sep 17 00:00:00 2001
From: Andreas Schwab <schwab@××××××.com>
Date: Fri, 6 Nov 2009 09:29:24 -0800
Subject: [PATCH 05/25] Correct readahead syscall wrapper on powerpc32.

Due to alignment of 64bit parameters there is a dummy second argument.
But other than that the syscall arguments are directly mapped to the
function arguments.
---
 ChangeLog                                          |    5 +++++
 .../sysv/linux/powerpc/powerpc32/syscalls.list     |    3 +++
 2 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list b/sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list
index 82025b4..1233be6 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list
@@ -3,3 +3,6 @@
 # System calls with wrappers.
 oldgetrlimit	EXTRA	getrlimit	i:ip	__old_getrlimit	getrlimit@GLIBC_2.0
 oldsetrlimit	EXTRA	setrlimit	i:ip	__old_setrlimit	setrlimit@GLIBC_2.0
+
+# Due to 64bit alignment there is a dummy second parameter
+readahead	-	readahead	i:iiiii	__readahead	readahead
-- 
1.6.5.3




1.1                  src/patchsets/glibc/2.11/0058_all_glibc-2.11-memset-fortify-const-warning.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/glibc/2.11/0058_all_glibc-2.11-memset-fortify-const-warning.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/glibc/2.11/0058_all_glibc-2.11-memset-fortify-const-warning.patch?rev=1.1&content-type=text/plain

Index: 0058_all_glibc-2.11-memset-fortify-const-warning.patch
===================================================================
From 6515a01fc1d35d329886d5a45435537ee9115bc4 Mon Sep 17 00:00:00 2001
From: Caolan McNamara <caolanm@××××××.com>
Date: Tue, 10 Nov 2009 06:29:13 -0800
Subject: [PATCH 10/25] Avoid memset warning in one case.

---
 ChangeLog             |    5 +++++
 string/bits/string3.h |    5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/string/bits/string3.h b/string/bits/string3.h
index a5593e3..1d759f1 100644
--- a/string/bits/string3.h
+++ b/string/bits/string3.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -77,7 +77,8 @@ __NTH (mempcpy (void *__restrict __dest, __const void *__restrict __src,
 __extern_always_inline void *
 __NTH (memset (void *__dest, int __ch, size_t __len))
 {
-  if (__builtin_constant_p (__len) && __len == 0)
+  if (__builtin_constant_p (__len) && __len == 0
+      && (!__builtin_constant_p (__ch) || __ch != 0))
     {
       __warn_memset_zero_len ();
       return __dest;
-- 
1.6.5.3