[commits] r14260 - in /fsf/trunk/ports: ./ sysdeps/unix/sysv/linux/arm/eabi/ sysdeps/unix/sysv/linux/mips/bits/ sysdeps/unix/sysv/linu...

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Tue Jun 21 00:04:14 2011
New Revision: 14260

Log:
Import glibc-ports-mainline for 2011-06-21

Added:
    fsf/trunk/ports/sysdeps/unix/sysv/linux/arm/eabi/internal_sendmmsg.S
    fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/mips32/internal_sendmmsg.S
    fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/mips32/sendmmsg.c
Modified:
    fsf/trunk/ports/ChangeLog.arm
    fsf/trunk/ports/ChangeLog.mips
    fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/bits/siginfo.h
    fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/bits/socket.h

Modified: fsf/trunk/ports/ChangeLog.arm
==============================================================================
--- fsf/trunk/ports/ChangeLog.arm (original)
+++ fsf/trunk/ports/ChangeLog.arm Tue Jun 21 00:04:14 2011
@@ -1,3 +1,7 @@
+2010-06-20  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/arm/eabi/internal_sendmmsg.S: New.
+
 2011-05-07  Konstantinos Margaritis  <markos@xxxxxxxxxxxxxx>
 
 	* sysdeps/arm/preconfigure: Detect arm-linux-gnueabi* as ARM EABI.

Modified: fsf/trunk/ports/ChangeLog.mips
==============================================================================
--- fsf/trunk/ports/ChangeLog.mips (original)
+++ fsf/trunk/ports/ChangeLog.mips Tue Jun 21 00:04:14 2011
@@ -1,3 +1,13 @@
+2011-06-20  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/mips/mips32/sendmmsg.c,
+	sysdeps/unix/sysv/linux/mips/mips32/internal_sendmmsg.S: New.
+
+2011-06-20  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/mips/bits/siginfo.h (SI_USER): Don't
+	mention raise in the comment.
+
 2011-05-23  Aurelien Jarno  <aurelien@xxxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/mips/bits/resource.h (RLIMIT_RTTIME):

Added: fsf/trunk/ports/sysdeps/unix/sysv/linux/arm/eabi/internal_sendmmsg.S
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/arm/eabi/internal_sendmmsg.S (added)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/arm/eabi/internal_sendmmsg.S Tue Jun 21 00:04:14 2011
@@ -1,0 +1,6 @@
+/* Tag_ABI_align8_preserved: This code preserves 8-byte
+   alignment in any callee.  */
+	.eabi_attribute 25, 1
+/* Tag_ABI_align8_needed: This code may require 8-byte alignment from
+   the caller.  */
+	.eabi_attribute 24, 1

Modified: fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/bits/siginfo.h
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/bits/siginfo.h (original)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/bits/siginfo.h Tue Jun 21 00:04:14 2011
@@ -1,5 +1,5 @@
 /* siginfo_t, sigevent and constants.  Linux/MIPS version.
-   Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
+   Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2011
 	Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -146,7 +146,7 @@
 # define SI_ASYNCIO	SI_ASYNCIO
   SI_QUEUE,			/* Sent by sigqueue.  */
 # define SI_QUEUE	SI_QUEUE
-  SI_USER,			/* Sent by kill, sigsend, raise.  */
+  SI_USER,			/* Sent by kill, sigsend.  */
 # define SI_USER	SI_USER
   SI_KERNEL = 0x80		/* Send by kernel.  */
 #define SI_KERNEL	SI_KERNEL

Modified: fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/bits/socket.h
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/bits/socket.h (original)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/bits/socket.h Tue Jun 21 00:04:14 2011
@@ -415,7 +415,7 @@
 
 __BEGIN_DECLS
 
-/* Receive a message as described by MESSAGE from socket FD.
+/* Receive up to VLEN messages as described by VMESSAGES from socket FD.
    Returns the number of bytes read or -1 for errors.
 
    This function is a cancellation point and therefore not marked with
@@ -424,6 +424,13 @@
 		     unsigned int __vlen, int __flags,
 		     __const struct timespec *__tmo);
 
+/* Send a VLEN messages as described by VMESSAGES to socket FD.
+   Return the number of datagrams successfully written or -1 for errors.
+This function is a cancellation point and therefore not marked with
+   __THROW.  */
+extern int sendmmsg (int __fd, struct mmsghdr *__vmessages,
+		     unsigned int __vlen, int __flags);
+
 __END_DECLS
 
 #endif	/* bits/socket.h */

Added: fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/mips32/internal_sendmmsg.S
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/mips32/internal_sendmmsg.S (added)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/mips32/internal_sendmmsg.S Tue Jun 21 00:04:14 2011
@@ -1,0 +1,2 @@
+/* MIPS does not have socket.S and the socketcall syscall should
+   generally be avoided, though it exists.  */

Added: fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/mips32/sendmmsg.c
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/mips32/sendmmsg.c (added)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/mips32/sendmmsg.c Tue Jun 21 00:04:14 2011
@@ -1,0 +1,31 @@
+/* Copyright (C) 2011 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
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+/* Avoid sendmmsg.c trying to use a definition based on the socketcall
+   syscall and internal_sendmmsg.S.  */
+
+#include <errno.h>
+#include <sys/socket.h>
+
+#include <sysdep-cancel.h>
+#include <sys/syscall.h>
+#include <kernel-features.h>
+
+#undef __NR_socketcall
+
+#include <sysdeps/unix/sysv/linux/sendmmsg.c>