[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

r6047 - in glibc-package/trunk/debian: . patches patches/any



Author: aurel32
Date: 2014-05-05 16:05:58 +0000 (Mon, 05 May 2014)
New Revision: 6047

Added:
   glibc-package/trunk/debian/patches/any/cvs-socketcall-syscall.diff
Modified:
   glibc-package/trunk/debian/changelog
   glibc-package/trunk/debian/patches/series
Log:
patches/any/cvs-socketcall-syscall.diff: new patch from upstream to fix
socketcall multiplex syscall features detection.  Closes: #730744.

Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog	2014-05-05 13:11:48 UTC (rev 6046)
+++ glibc-package/trunk/debian/changelog	2014-05-05 16:05:58 UTC (rev 6047)
@@ -26,6 +26,8 @@
   * patches/all/submitted-po-fr-fixes.diff: new patch to fix the French
     translation of inappropriate (inappropré -> inapproprié).  Closes:
     #733237.
+  * patches/any/cvs-socketcall-syscall.diff: new patch from upstream to fix
+    socketcall multiplex syscall features detection.  Closes: #730744.
 
  -- Adam Conrad <adconrad@0c3.net>  Sun, 27 Apr 2014 23:15:13 -0600
 

Added: glibc-package/trunk/debian/patches/any/cvs-socketcall-syscall.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-socketcall-syscall.diff	                        (rev 0)
+++ glibc-package/trunk/debian/patches/any/cvs-socketcall-syscall.diff	2014-05-05 16:05:58 UTC (rev 6047)
@@ -0,0 +1,676 @@
+2014-02-20  Joseph Myers  <joseph@codesourcery.com>
+ 
+	[BZ #16611]
+	* sysdeps/unix/sysv/linux/kernel-features.h
+	[__LINUX_KERNEL_VERSION >= 0x030000 && __ASSUME_SOCKETCALL]
+	(__ASSUME_SENDMMSG_SOCKETCALL): Define.
+	[__LINUX_KERNEL_VERSION >= 0x030000 && (__i386__ || __x86_64__ ||
+	__powerpc__ || __sh__ || __sparc__)] (__ASSUME_SENDMMSG_SYSCALL):
+	Likewise.
+	[__i386__ || __powerpc__ || __sh__ || __sparc__]
+	(__ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL): Likewise.
+	[__ASSUME_SENDMMSG_SOCKETCALL || __ASSUME_SENDMMSG_SYSCALL]
+	(__ASSUME_SENDMMSG): Define instead of using previous
+	[__LINUX_KERNEL_VERSION >= 0x020627] condition.
+	* ports/sysdeps/unix/sysv/linux/aarch64/kernel-features.h
+	(__ASSUME_SENDMMSG_SYSCALL): Define.
+	* ports/sysdeps/unix/sysv/linux/alpha/kernel-features.h
+	[__LINUX_KERNEL_VERSION >= 0x030200] (__ASSUME_SENDMMSG_SYSCALL):
+	Likewise.
+	* ports/sysdeps/unix/sysv/linux/arm/kernel-features.h
+	[__LINUX_KERNEL_VERSION >= 0x030000] (__ASSUME_SENDMMSG_SYSCALL):
+	Likewise.
+	* ports/sysdeps/unix/sysv/linux/ia64/kernel-features.h
+	[__LINUX_KERNEL_VERSION >= 0x030000] (__ASSUME_SENDMMSG_SYSCALL):
+	Likewise.
+	* sysdeps/unix/sysv/linux/internal_sendmmsg.S [__ASSUME_SOCKETCALL
+	&& !__ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL &&
+	!__ASSUME_SENDMMSG_SYSCALL] (__NR_sendmmsg): Undefine.
+	[__ASSUME_SENDMMSG]: Change conditionals to
+	[__ASSUME_SENDMMSG_SOCKETCALL].
+	* ports/sysdeps/unix/sysv/linux/microblaze/kernel-features.h
+	[__LINUX_KERNEL_VERSION >= 0x030300] (__ASSUME_SENDMMSG_SYSCALL):
+	Define.
+	* ports/sysdeps/unix/sysv/linux/mips/kernel-features.h
+	[__LINUX_KERNEL_VERSION >= 0x030100] (__ASSUME_SENDMMSG_SYSCALL):
+	Likewise.
+	* sysdeps/unix/sysv/linux/sendmmsg.c [__ASSUME_SOCKETCALL &&
+	!__ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL &&
+	!__ASSUME_SENDMMSG_SYSCALL] (__NR_sendmmsg): Undefine.
+	[!__ASSUME_SENDMMSG]: Change conditional to
+	[!__ASSUME_SENDMMSG_SOCKETCALL].
+	* ports/sysdeps/unix/sysv/linux/tile/kernel-features.h
+	[__LINUX_KERNEL_VERSION >= 0x030000] (__ASSUME_SENDMMSG_SYSCALL):
+	Define.
+
+	[BZ #16610]
+	* sysdeps/unix/sysv/linux/kernel-features.h
+	[__LINUX_KERNEL_VERSION >= 0x020621 && __ASSUME_SOCKETCALL]
+	(__ASSUME_RECVMMSG_SOCKETCALL): Define.
+	[(__LINUX_KERNEL_VERSION >= 0x020621 && (__i386__ || __x86_64__ ||
+	__sparc__)) || (__LINUX_KERNEL_VERSION >= 0x020625 && (__powerpc__
+	|| __sh__))] (__ASSUME_RECVMMSG_SYSCALL): Likewise.
+	[__i386__ || __sparc__]
+	(__ASSUME_RECVMMSG_SYSCALL_WITH_SOCKETCALL): Likewise.
+	[__ASSUME_RECVMMSG_SOCKETCALL || __ASSUME_RECVMMSG_SYSCALL]
+	(__ASSUME_RECVMMSG): Define instead of using previous
+	[__LINUX_KERNEL_VERSION >= 0x020621] condition.
+	* ports/sysdeps/unix/sysv/linux/aarch64/kernel-features.h
+	(__ASSUME_RECVMMSG_SYSCALL): Define.
+	* ports/sysdeps/unix/sysv/linux/alpha/kernel-features.h
+	[__LINUX_KERNEL_VERSION >= 0x020621] (__ASSUME_RECVMMSG_SYSCALL):
+	Likewise.
+	* ports/sysdeps/unix/sysv/linux/arm/kernel-features.h
+	[__LINUX_KERNEL_VERSION >= 0x020621] (__ASSUME_RECVMMSG_SYSCALL):
+	Likewise.
+	* ports/sysdeps/unix/sysv/linux/ia64/kernel-features.h
+	[__LINUX_KERNEL_VERSION >= 0x020621] (__ASSUME_RECVMMSG_SYSCALL):
+	Likewise.
+	* sysdeps/unix/sysv/linux/internal_recvmmsg.S [__ASSUME_SOCKETCALL
+	&& !__ASSUME_RECVMMSG_SYSCALL_WITH_SOCKETCALL &&
+	!__ASSUME_RECVMMSG_SYSCALL] (__NR_recvmmsg): Undefine.
+	[__ASSUME_RECVMMSG]: Change condition to
+	[__ASSUME_RECVMMSG_SOCKETCALL].
+	* ports/sysdeps/unix/sysv/linux/microblaze/kernel-features.h
+	[__LINUX_KERNEL_VERSION >= 0x020621] (__ASSUME_RECVMMSG_SYSCALL):
+	Define.
+	(__ASSUME_RECVMMSG_SYSCALL_WITH_SOCKETCALL): Likewise.
+	* ports/sysdeps/unix/sysv/linux/mips/kernel-features.h
+	[__LINUX_KERNEL_VERSION >= 0x020621] (__ASSUME_RECVMMSG_SYSCALL):
+	Likewise.
+	* sysdeps/unix/sysv/linux/recvmmsg.c [__ASSUME_SOCKETCALL &&
+	!__ASSUME_RECVMMSG_SYSCALL_WITH_SOCKETCALL &&
+	!__ASSUME_RECVMMSG_SYSCALL] (__NR_recvmmsg): Undefine.
+	[!__ASSUME_RECVMMSG]: Change condition to
+	[!__ASSUME_RECVMMSG_SOCKETCALL].
+	* ports/sysdeps/unix/sysv/linux/tile/kernel-features.h
+	(__ASSUME_RECVMMSG_SYSCALL): Define.
+
+	[BZ #16609]
+	* sysdeps/unix/sysv/linux/kernel-features.h [__i386__ ||
+	__powerpc__ || __s390__ || __sh__ || __sparc__]
+	(__ASSUME_SOCKETCALL): Define.
+	[__LINUX_KERNEL_VERSION && __ASSUME_SOCKETCALL]
+	(__ASSUME_ACCEPT4_SOCKETCALL): Likewise.
+	[(__LINUX_KERNEL_VERSION >= 0x02061c && (__x86_64__ || __sparc__))
+	|| (__LINUX_KERNEL_VERSION >= 0x020625 && (__powerpc__ ||
+	__sh__))] (__ASSUME_ACCEPT4_SYSCALL): Likewise.
+	[__sparc__] (__ASSUME_ACCEPT4_SYSCALL_WITH_SOCKETCALL): Likewise.
+	[__ASSUME_ACCEPT4_SOCKETCALL || __ASSUME_ACCEPT4_SYSCALL]
+	(__ASSUME_ACCEPT4): Define instead of using previous
+	[__LINUX_KERNEL_VERSION >= 0x02061c && (__i386__ || __x86_64__ ||
+	__powerpc__ || __sparc__ || __s390__)] condition.
+	* ports/sysdeps/unix/sysv/linux/aarch64/kernel-features.h
+	(__ASSUME_ACCEPT4): Change to __ASSUME_ACCEPT4_SYSCALL.
+	* sysdeps/unix/sysv/linux/accept4.c [__ASSUME_SOCKETCALL &&
+	!__ASSUME_ACCEPT4_SYSCALL_WITH_SOCKETCALL &&
+	!__ASSUME_ACCEPT4_SYSCALL] (__NR_accept4): Undefine.
+	[!__ASSUME_ACCEPT4]: Change condition to
+	[!__ASSUME_ACCEPT4_SOCKETCALL].
+	* ports/sysdeps/unix/sysv/linux/alpha/kernel-features.h
+	(__ASSUME_ACCEPT4): Change to __ASSUME_ACCEPT4_SYSCALL.  Correct
+	condition to [__LINUX_KERNEL_VERSION >= 0x030200].
+	* ports/sysdeps/unix/sysv/linux/arm/kernel-features.h
+	[__LINUX_KERNEL_VERSION >= 0x020624] (__ASSUME_ACCEPT4): Change to
+	__ASSUME_ACCEPT4_SYSCALL.
+	* sysdeps/unix/sysv/linux/i386/accept4.S [__ASSUME_ACCEPT4]:
+	Change conditions to [__ASSUME_ACCEPT4_SOCKETCALL].
+	* ports/sysdeps/unix/sysv/linux/ia64/kernel-features.h
+	[__LINUX_KERNEL_VERSION >= 0x030300] (__ASSUME_ACCEPT4): Change to
+	__ASSUME_ACCEPT4_SYSCALL.
+	* sysdeps/unix/sysv/linux/internal_accept4.S [__ASSUME_SOCKETCALL
+	&& !__ASSUME_ACCEPT4_SYSCALL_WITH_SOCKETCALL &&
+	!__ASSUME_ACCEPT4_SYSCALL] (__NR_accept4): Undefine.
+	[__ASSUME_ACCEPT4]: Change condition to
+	[__ASSUME_ACCEPT4_SOCKETCALL].
+	* ports/sysdeps/unix/sysv/linux/m68k/kernel-features.h
+	(__ASSUME_SOCKETCALL): Define.
+	[__LINUX_KERNEL_VERSION >= 0x02061c] (__ASSUME_ACCEPT4): Remove.
+	* ports/sysdeps/unix/sysv/linux/microblaze/kernel-features.h
+	(__ASSUME_SOCKETCALL): Define.
+	(__ASSUME_ACCEPT4): Remove.
+	[__LINUX_KERNEL_VERSION >= 0x020621] (__ASSUME_ACCEPT4_SYSCALL):
+	Define.
+	* ports/sysdeps/unix/sysv/linux/mips/kernel-features.h
+	[__LINUX_KERNEL_VERSION >= 0x02061f] (__ASSUME_ACCEPT4_SYSCALL):
+	Likewise.
+	* ports/sysdeps/unix/sysv/linux/tile/kernel-features.h
+	(__ASSUME_ACCEPT4): Change to __ASSUME_ACCEPT4_SYSCALL.
+
+2014-02-20  Joseph Myers  <joseph@codesourcery.com>
+ 
+	[BZ #16611]
+	* sysdeps/unix/sysv/linux/hppa/kernel-features.h
+	[__LINUX_KERNEL_VERSION >= 0x030100] (__ASSUME_SENDMMSG_SYSCALL):
+	Define.
+
+ 	[BZ #16610]
+ 	* sysdeps/unix/sysv/linux/hppa/kernel-features.h
+ 	[__LINUX_KERNEL_VERSION >= 0x020622] (__ASSUME_RECVMMSG_SYSCALL):
+	[BZ #16610]
+	* sysdeps/unix/sysv/linux/hppa/kernel-features.h
+	[__LINUX_KERNEL_VERSION >= 0x020622] (__ASSUME_RECVMMSG_SYSCALL):
+	Define.
+
+ 	[BZ #16609]
+ 	* sysdeps/unix/sysv/linux/hppa/kernel-features.h
+ 	[__LINUX_KERNEL_VERSION >= 0x020622] (__ASSUME_ACCEPT4_SYSCALL):
+
+--- a/ports/sysdeps/unix/sysv/linux/hppa/kernel-features.h
++++ b/ports/sysdeps/unix/sysv/linux/hppa/kernel-features.h
+@@ -30,4 +30,15 @@
+ /* PA-RISC 2.6.9 kernels had the first LWS CAS support */
+ #define __ASSUME_LWS_CAS		1
+ 
++/* Support for the accept4 and recvmmsg syscalls was added in 2.6.34.  */
++#if __LINUX_KERNEL_VERSION >= 0x020622
++# define __ASSUME_ACCEPT4_SYSCALL	1
++# define __ASSUME_RECVMMSG_SYSCALL	1
++#endif
++
++/* Support for the sendmmsg syscall was added in 3.1.  */
++#if __LINUX_KERNEL_VERSION >= 0x030100
++# define __ASSUME_SENDMMSG_SYSCALL	1
++#endif
++
+ #include_next <kernel-features.h>
+--- a/ports/sysdeps/unix/sysv/linux/aarch64/kernel-features.h
++++ b/ports/sysdeps/unix/sysv/linux/aarch64/kernel-features.h
+@@ -24,12 +24,14 @@
+ /* AArch64 support starts with 3.7.0, guaranteeing many kernel
+    features.  */
+ 
+-#define __ASSUME_ACCEPT4                1
++#define __ASSUME_ACCEPT4_SYSCALL        1
+ #define __ASSUME_DUP3                   1
+ #define __ASSUME_EVENTFD2		1
+ #define __ASSUME_IN_NONBLOCK            1
+ #define __ASSUME_O_CLOEXEC              1
+ #define __ASSUME_PIPE2                  1
++#define __ASSUME_RECVMMSG_SYSCALL       1
++#define __ASSUME_SENDMMSG_SYSCALL       1
+ #define __ASSUME_SIGNALFD4		1
+ #define __ASSUME_SOCK_CLOEXEC           1
+ #define __ASSUME_UTIMES                 1
+--- a/sysdeps/unix/sysv/linux/accept4.c
++++ b/sysdeps/unix/sysv/linux/accept4.c
+@@ -24,6 +24,14 @@
+ #include <sys/syscall.h>
+ #include <kernel-features.h>
+ 
++/* Do not use the accept4 syscall on socketcall architectures unless
++   it was added at the same time as the socketcall support or can be
++   assumed to be present.  */
++#if defined __ASSUME_SOCKETCALL \
++    && !defined __ASSUME_ACCEPT4_SYSCALL_WITH_SOCKETCALL \
++    && !defined __ASSUME_ACCEPT4_SYSCALL
++# undef __NR_accept4
++#endif
+ 
+ #ifdef __NR_accept4
+ int
+@@ -42,7 +50,7 @@
+   return result;
+ }
+ #elif defined __NR_socketcall
+-# ifndef __ASSUME_ACCEPT4
++# ifndef __ASSUME_ACCEPT4_SOCKETCALL
+ extern int __internal_accept4 (int fd, __SOCKADDR_ARG addr,
+ 			       socklen_t *addr_len, int flags)
+      attribute_hidden;
+@@ -83,7 +91,8 @@
+   return -1;
+ }
+ # else
+-/* When __ASSUME_ACCEPT4 accept4 is defined in internal_accept4.S.  */
++/* When __ASSUME_ACCEPT4_SOCKETCALL accept4 is defined in
++   internal_accept4.S.  */
+ # endif
+ #else
+ int
+--- a/ports/sysdeps/unix/sysv/linux/alpha/kernel-features.h
++++ b/ports/sysdeps/unix/sysv/linux/alpha/kernel-features.h
+@@ -42,9 +42,15 @@
+ # define __ASSUME_SIGNALFD4 1
+ #endif
+ 
+-/* Support for accept4 was added for alpha after 2.6.33-rc1.  */
++/* Support for recvmmsg was added for alpha in 2.6.33.  */
+ #if __LINUX_KERNEL_VERSION >= 0x020621
+-# define __ASSUME_ACCEPT4      1
++# define __ASSUME_RECVMMSG_SYSCALL       1
++#endif
++
++/* Support for accept4 and sendmmsg was added for alpha in 3.2.  */
++#if __LINUX_KERNEL_VERSION >= 0x030200
++# define __ASSUME_ACCEPT4_SYSCALL      1
++# define __ASSUME_SENDMMSG_SYSCALL     1
+ #endif
+ 
+ #include_next <kernel-features.h>
+--- a/ports/sysdeps/unix/sysv/linux/arm/kernel-features.h
++++ b/ports/sysdeps/unix/sysv/linux/arm/kernel-features.h
+@@ -31,9 +31,19 @@
+ # define __ASSUME_SIGNALFD4	1
+ #endif
+ 
++/* Support for the recvmmsg syscall was added in 2.6.33.  */
++#if __LINUX_KERNEL_VERSION >= 0x020621
++# define __ASSUME_RECVMMSG_SYSCALL	1
++#endif
++
+ /* Support for the accept4 syscall was added in 2.6.36.  */
+ #if __LINUX_KERNEL_VERSION >= 0x020624
+-# define __ASSUME_ACCEPT4	1
++# define __ASSUME_ACCEPT4_SYSCALL	1
++#endif
++
++/* Support for the sendmmsg syscall was added in 3.0.  */
++#if __LINUX_KERNEL_VERSION >= 0x030000
++# define __ASSUME_SENDMMSG_SYSCALL	1
+ #endif
+ 
+ #include_next <kernel-features.h>
+--- a/sysdeps/unix/sysv/linux/i386/accept4.S
++++ b/sysdeps/unix/sysv/linux/i386/accept4.S
+@@ -23,7 +23,7 @@
+ #define EINVAL	22
+ #define ENOSYS	38
+ 
+-#ifdef __ASSUME_ACCEPT4
++#ifdef __ASSUME_ACCEPT4_SOCKETCALL
+ # define errlabel SYSCALL_ERROR_LABEL
+ #else
+ # define errlabel .Lerr
+@@ -114,7 +114,7 @@
+ 	ret
+ #endif
+ 
+-#ifndef __ASSUME_ACCEPT4
++#ifndef __ASSUME_ACCEPT4_SOCKETCALL
+ 	/* The kernel returns -EINVAL for unknown socket operations.
+ 	   We need to convert that error to an ENOSYS error.  */
+ .Lerr:	cmpl $-EINVAL, %eax
+--- a/ports/sysdeps/unix/sysv/linux/ia64/kernel-features.h
++++ b/ports/sysdeps/unix/sysv/linux/ia64/kernel-features.h
+@@ -47,9 +47,19 @@
+ # define __ASSUME_DUP3		1
+ #endif
+ 
++/* Support for the recvmmsg syscall was added in 2.6.33.  */
++#if __LINUX_KERNEL_VERSION >= 0x020621
++# define __ASSUME_RECVMMSG_SYSCALL	1
++#endif
++
++/* Support for the sendmmsg syscall was added in 3.0.  */
++#if __LINUX_KERNEL_VERSION >= 0x030000
++# define __ASSUME_SENDMMSG_SYSCALL	1
++#endif
++
+ /* Support for the accept4 syscall was added in 3.3.  */
+ #if __LINUX_KERNEL_VERSION >= 0x030300
+-# define __ASSUME_ACCEPT4	1
++# define __ASSUME_ACCEPT4_SYSCALL	1
+ #endif
+ 
+ #include_next <kernel-features.h>
+--- a/sysdeps/unix/sysv/linux/internal_accept4.S
++++ b/sysdeps/unix/sysv/linux/internal_accept4.S
+@@ -1,8 +1,18 @@
+ #include <kernel-features.h>
+ #include <sys/syscall.h>
++
++/* Do not use the accept4 syscall on socketcall architectures unless
++   it was added at the same time as the socketcall support or can be
++   assumed to be present.  */
++#if defined __ASSUME_SOCKETCALL \
++    && !defined __ASSUME_ACCEPT4_SYSCALL_WITH_SOCKETCALL \
++    && !defined __ASSUME_ACCEPT4_SYSCALL
++# undef __NR_accept4
++#endif
++
+ #if !defined __NR_accept4 && defined __NR_socketcall
+ # define socket	accept4
+-# ifdef __ASSUME_ACCEPT4
++# ifdef __ASSUME_ACCEPT4_SOCKETCALL
+ #  define __socket accept4
+ # else
+ #  define __socket __internal_accept4
+--- a/sysdeps/unix/sysv/linux/kernel-features.h
++++ b/sysdeps/unix/sysv/linux/kernel-features.h
+@@ -40,6 +40,18 @@
+ /* The sendfile syscall was introduced in 2.2.0.  */
+ #define __ASSUME_SENDFILE		1
+ 
++/* Some architectures use the socketcall multiplexer for some or all
++   socket-related operations, via a socket.S file in glibc, instead of
++   separate syscalls.  __ASSUME_SOCKETCALL is defined for such
++   architectures.  */
++#if defined __i386__ \
++    || defined __powerpc__ \
++    || defined __s390__ \
++    || defined __sh__ \
++    || defined __sparc__
++# define __ASSUME_SOCKETCALL		1
++#endif
++
+ /* Linux 2.3.39 introduced IPC64.  Except for powerpc.  Linux 2.4.0 on
+    PPC introduced a correct IPC64.  But PowerPC64 does not support a
+    separate 64-bit syscall, already 64-bit.  */
+@@ -164,10 +176,34 @@
+ # define __ASSUME_DUP3		1
+ #endif
+ 
+-/* Support for the accept4 syscall was added in 2.6.28.  */
+-#if __LINUX_KERNEL_VERSION >= 0x02061c \
+-    && (defined __i386__ || defined __x86_64__ || defined __powerpc__ \
+-	|| defined __sparc__ || defined __s390__)
++/* Support for accept4 functionality was added in 2.6.28, but for some
++   architectures using a separate syscall rather than socketcall that
++   syscall was only added later, and some architectures first had
++   socketcall support then a separate syscall.  Define
++   __ASSUME_ACCEPT4_SOCKETCALL if glibc uses socketcall on this
++   architecture and accept4 is available through socketcall,
++   __ASSUME_ACCEPT4_SYSCALL if it is available through a separate
++   syscall, __ASSUME_ACCEPT4_SYSCALL_WITH_SOCKETCALL if it became
++   available through a separate syscall at the same time as through
++   socketcall, and __ASSUME_ACCEPT4 if the accept4 function is known
++   to work.  */
++#if __LINUX_KERNEL_VERSION >= 0x02061c && defined __ASSUME_SOCKETCALL
++# define __ASSUME_ACCEPT4_SOCKETCALL	1
++#endif
++
++/* The accept4 syscall was added for x86_64 and SPARC in 2.6.28, and
++   for PowerPC and SH in 2.6.37.  */
++#if (__LINUX_KERNEL_VERSION >= 0x02061c			\
++     && (defined __x86_64__ || defined __sparc__))	\
++    || (__LINUX_KERNEL_VERSION >= 0x020625		\
++	&& (defined __powerpc__ || defined __sh__))
++# define __ASSUME_ACCEPT4_SYSCALL	1
++#endif
++#ifdef __sparc__
++# define __ASSUME_ACCEPT4_SYSCALL_WITH_SOCKETCALL	1
++#endif
++
++#if defined __ASSUME_ACCEPT4_SOCKETCALL || defined __ASSUME_ACCEPT4_SYSCALL
+ # define __ASSUME_ACCEPT4	1
+ #endif
+ 
+@@ -197,8 +233,25 @@
+ # define __ASSUME_F_GETOWN_EX	1
+ #endif
+ 
+-/* Support for the recvmmsg syscall was added in 2.6.33.  */
+-#if __LINUX_KERNEL_VERSION >= 0x020621
++/* Support for recvmmsg functionality was added in 2.6.33.  The macros
++   defined correspond to those for accept4.  */
++#if __LINUX_KERNEL_VERSION >= 0x020621 && defined __ASSUME_SOCKETCALL
++# define __ASSUME_RECVMMSG_SOCKETCALL	1
++#endif
++
++/* The recvmmsg syscall was added for i386, x86_64 and SPARC in
++   2.6.33, and for PowerPC and SH in 2.6.37.  */
++#if (__LINUX_KERNEL_VERSION >= 0x020621			\
++     && (defined __i386__ || defined __x86_64__ || defined __sparc__))	\
++    || (__LINUX_KERNEL_VERSION >= 0x020625		\
++	&& (defined __powerpc__ || defined __sh__))
++# define __ASSUME_RECVMMSG_SYSCALL	1
++#endif
++#if defined __i386__ || defined __sparc__
++# define __ASSUME_RECVMMSG_SYSCALL_WITH_SOCKETCALL	1
++#endif
++
++#if defined __ASSUME_RECVMMSG_SOCKETCALL || defined __ASSUME_RECVMMSG_SYSCALL
+ # define __ASSUME_RECVMMSG	1
+ #endif
+ 
+@@ -212,8 +265,25 @@
+ # define __ASSUME_PRLIMIT64	1
+ #endif
+ 
+-/* sendmmsg is available in 2.6.39.  */
+-#if __LINUX_KERNEL_VERSION >= 0x020627
++/* Support for sendmmsg functionality was added in 3.0.  The macros
++   defined correspond to those for accept4 and recvmmsg.  */
++#if __LINUX_KERNEL_VERSION >= 0x030000 && defined __ASSUME_SOCKETCALL
++# define __ASSUME_SENDMMSG_SOCKETCALL	1
++#endif
++
++/* The sendmmsg syscall was added for i386, x86_64, PowerPC, SH and
++   SPARC in 3.0.  */
++#if __LINUX_KERNEL_VERSION >= 0x030000					\
++    && (defined __i386__ || defined __x86_64__ || defined __powerpc__	\
++	|| defined __sh__ || defined __sparc__)
++# define __ASSUME_SENDMMSG_SYSCALL	1
++#endif
++#if defined __i386__ || defined __powerpc__ || defined __sh__ \
++    || defined __sparc__
++# define __ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL	1
++#endif
++
++#if defined __ASSUME_SENDMMSG_SOCKETCALL || defined __ASSUME_SENDMMSG_SYSCALL
+ # define __ASSUME_SENDMMSG	1
+ #endif
+ 
+--- a/ports/sysdeps/unix/sysv/linux/m68k/kernel-features.h
++++ b/ports/sysdeps/unix/sysv/linux/m68k/kernel-features.h
+@@ -17,6 +17,9 @@
+    License along with the GNU C Library.  If not, see
+    <http://www.gnu.org/licenses/>.  */
+ 
++/* m68k uses socketcall.  */
++#define __ASSUME_SOCKETCALL	1
++
+ /* Many syscalls were added in 2.6.10 for m68k.  */
+ #define __ASSUME_UTIMES	1
+ 
+@@ -35,11 +38,6 @@
+ # define __ASSUME_DUP3		1
+ #endif
+ 
+-/* Support for the accept4 syscall was added in 2.6.28.  */
+-#if __LINUX_KERNEL_VERSION >= 0x02061c
+-# define __ASSUME_ACCEPT4	1
+-#endif
+-
+ #include_next <kernel-features.h>
+ 
+ /* These syscalls were added only in 3.0 for m68k.  */
+--- a/ports/sysdeps/unix/sysv/linux/microblaze/kernel-features.h
++++ b/ports/sysdeps/unix/sysv/linux/microblaze/kernel-features.h
+@@ -16,6 +16,9 @@
+    <http://www.gnu.org/licenses/>.  */
+ 
+ 
++/* MicroBlaze uses socketcall.  */
++#define __ASSUME_SOCKETCALL	1
++
+ /* MicroBlaze glibc support starts with 2.6.30, guaranteeing many kernel features.  */
+ #define __ASSUME_UTIMES         1
+ #define __ASSUME_O_CLOEXEC      1
+@@ -24,7 +27,18 @@
+ #define __ASSUME_PIPE2          1
+ #define __ASSUME_EVENTFD2       1
+ #define __ASSUME_SIGNALFD4      1
+-#define __ASSUME_ACCEPT4        1
+ #define __ASSUME_DUP3           1
+ 
++/* Support for the accept4 and recvmmsg syscalls was added in 2.6.33.  */
++#if __LINUX_KERNEL_VERSION >= 0x020621
++# define __ASSUME_ACCEPT4_SYSCALL        1
++# define __ASSUME_RECVMMSG_SYSCALL       1
++#endif
++#define __ASSUME_RECVMMSG_SYSCALL_WITH_SOCKETCALL      1
++
++/* Support for the sendmmsg syscall was added in 3.3.  */
++#if __LINUX_KERNEL_VERSION >= 0x030300
++# define __ASSUME_SENDMMSG_SYSCALL       1
++#endif
++
+ #include_next <kernel-features.h>
+--- a/ports/sysdeps/unix/sysv/linux/mips/kernel-features.h
++++ b/ports/sysdeps/unix/sysv/linux/mips/kernel-features.h
+@@ -31,6 +31,21 @@
+ # define __ASSUME_SIGNALFD4	1
+ #endif
+ 
++/* Support for the accept4 syscall was added in 2.6.31.  */
++#if __LINUX_KERNEL_VERSION >= 0x02061f
++# define __ASSUME_ACCEPT4_SYSCALL	1
++#endif
++
++/* Support for the recvmmsg syscall was added in 2.6.33.  */
++#if __LINUX_KERNEL_VERSION >= 0x020621
++# define __ASSUME_RECVMMSG_SYSCALL	1
++#endif
++
++/* Support for the sendmmsg syscall was added in 3.1.  */
++#if __LINUX_KERNEL_VERSION >= 0x030100
++# define __ASSUME_SENDMMSG_SYSCALL	1
++#endif
++
+ #include_next <kernel-features.h>
+ 
+ /* The n32 syscall ABI did not have a getdents64 syscall until
+--- a/ports/sysdeps/unix/sysv/linux/tile/kernel-features.h
++++ b/ports/sysdeps/unix/sysv/linux/tile/kernel-features.h
+@@ -25,8 +25,14 @@
+ #define __ASSUME_PIPE2			1
+ #define __ASSUME_EVENTFD2		1
+ #define __ASSUME_SIGNALFD4		1
+-#define __ASSUME_ACCEPT4		1
++#define __ASSUME_ACCEPT4_SYSCALL	1
+ #define __ASSUME_DUP3			1
++#define __ASSUME_RECVMMSG_SYSCALL	1
++
++/* Support for the sendmmsg syscall was added in 3.0.  */
++#if __LINUX_KERNEL_VERSION >= 0x030000
++# define __ASSUME_SENDMMSG_SYSCALL	1
++#endif
+ 
+ #include_next <kernel-features.h>
+ 
+--- a/sysdeps/unix/sysv/linux/internal_recvmmsg.S
++++ b/sysdeps/unix/sysv/linux/internal_recvmmsg.S
+@@ -1,8 +1,18 @@
+ #include <kernel-features.h>
+ #include <sys/syscall.h>
++
++/* Do not use the recvmmsg syscall on socketcall architectures unless
++   it was added at the same time as the socketcall support or can be
++   assumed to be present.  */
++#if defined __ASSUME_SOCKETCALL \
++    && !defined __ASSUME_RECVMMSG_SYSCALL_WITH_SOCKETCALL \
++    && !defined __ASSUME_RECVMMSG_SYSCALL
++# undef __NR_recvmmsg
++#endif
++
+ #if !defined __NR_recvmmsg && defined __NR_socketcall
+ # define socket	recvmmsg
+-# ifdef __ASSUME_RECVMMSG
++# ifdef __ASSUME_RECVMMSG_SOCKETCALL
+ #  define __socket recvmmsg
+ # else
+ #  define __socket __internal_recvmmsg
+--- a/sysdeps/unix/sysv/linux/recvmmsg.c
++++ b/sysdeps/unix/sysv/linux/recvmmsg.c
+@@ -23,6 +23,14 @@
+ #include <sys/syscall.h>
+ #include <kernel-features.h>
+ 
++/* Do not use the recvmmsg syscall on socketcall architectures unless
++   it was added at the same time as the socketcall support or can be
++   assumed to be present.  */
++#if defined __ASSUME_SOCKETCALL \
++    && !defined __ASSUME_RECVMMSG_SYSCALL_WITH_SOCKETCALL \
++    && !defined __ASSUME_RECVMMSG_SYSCALL
++# undef __NR_recvmmsg
++#endif
+ 
+ #ifdef __NR_recvmmsg
+ int
+@@ -41,7 +49,7 @@
+   return result;
+ }
+ #elif defined __NR_socketcall
+-# ifndef __ASSUME_RECVMMSG
++# ifndef __ASSUME_RECVMMSG_SOCKETCALL
+ extern int __internal_recvmmsg (int fd, struct mmsghdr *vmessages,
+ 				unsigned int vlen, int flags,
+ 				const struct timespec *tmo)
+@@ -85,7 +93,8 @@
+   return -1;
+ }
+ # else
+-/* When __ASSUME_RECVMMSG recvmmsg is defined in internal_recvmmsg.S.  */
++/* When __ASSUME_RECVMMSG_SOCKETCALL recvmmsg is defined in
++   internal_recvmmsg.S.  */
+ # endif
+ #else
+ # include <socket/recvmmsg.c>
+--- a/sysdeps/unix/sysv/linux/internal_sendmmsg.S
++++ b/sysdeps/unix/sysv/linux/internal_sendmmsg.S
+@@ -1,15 +1,25 @@
+ #include <kernel-features.h>
+ #include <sys/syscall.h>
++
++/* Do not use the sendmmsg syscall on socketcall architectures unless
++   it was added at the same time as the socketcall support or can be
++   assumed to be present.  */
++#if defined __ASSUME_SOCKETCALL \
++    && !defined __ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL \
++    && !defined __ASSUME_SENDMMSG_SYSCALL
++# undef __NR_sendmmsg
++#endif
++
+ #if !defined __NR_sendmmsg && defined __NR_socketcall
+ # define socket	sendmmsg
+-# ifndef __ASSUME_SENDMMSG
++# ifndef __ASSUME_SENDMMSG_SOCKETCALL
+ #  define __socket __internal_sendmmsg
+ #  define NO_WEAK_ALIAS
+ # endif
+ # define NARGS 4
+ # define NEED_CANCELLATION
+ # include <socket.S>
+-# ifdef __ASSUME_SENDMMSG
++# ifdef __ASSUME_SENDMMSG_SOCKETCALL
+ libc_hidden_def (__sendmmsg)
+ # endif
+ #endif
+--- a/sysdeps/unix/sysv/linux/sendmmsg.c
++++ b/sysdeps/unix/sysv/linux/sendmmsg.c
+@@ -23,6 +23,14 @@
+ #include <sys/syscall.h>
+ #include <kernel-features.h>
+ 
++/* Do not use the sendmmsg syscall on socketcall architectures unless
++   it was added at the same time as the socketcall support or can be
++   assumed to be present.  */
++#if defined __ASSUME_SOCKETCALL \
++    && !defined __ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL \
++    && !defined __ASSUME_SENDMMSG_SYSCALL
++# undef __NR_sendmmsg
++#endif
+ 
+ #ifdef __NR_sendmmsg
+ int
+@@ -42,7 +50,7 @@
+ libc_hidden_def (__sendmmsg)
+ weak_alias (__sendmmsg, sendmmsg)
+ #elif defined __NR_socketcall
+-# ifndef __ASSUME_SENDMMSG
++# ifndef __ASSUME_SENDMMSG_SOCKETCALL
+ extern int __internal_sendmmsg (int fd, struct mmsghdr *vmessages,
+ 				unsigned int vlen, int flags)
+      attribute_hidden;
+@@ -86,7 +94,8 @@
+ libc_hidden_def (__sendmmsg)
+ weak_alias (__sendmmsg, sendmmsg)
+ # else
+-/* When __ASSUME_SENDMMSG sendmmsg is defined in internal_sendmmsg.S.  */
++/* When __ASSUME_SENDMMSG_SOCKETCALL sendmmsg is defined in
++   internal_sendmmsg.S.  */
+ # endif
+ #else
+ # include <socket/sendmmsg.c>

Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series	2014-05-05 13:11:48 UTC (rev 6046)
+++ glibc-package/trunk/debian/patches/series	2014-05-05 16:05:58 UTC (rev 6047)
@@ -279,3 +279,4 @@
 any/cvs-wprintf.diff
 any/cvs-resolv-first-query-failure.diff
 any/submitted-ptsname_r-uninitialized-memory.diff
+any/cvs-socketcall-syscall.diff


Reply to: