[commits] r10643 - in /fsf/glibc-2_12-branch/ports: ./ sysdeps/unix/sysv/linux/arm/eabi/ sysdeps/unix/sysv/linux/mips/mips32/

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Sat Jun  5 00:07:21 2010
New Revision: 10643

Log:
Import glibc-ports-2.12 for 2010-06-05

Added:
    fsf/glibc-2_12-branch/ports/sysdeps/unix/sysv/linux/arm/eabi/internal_recvmmsg.S
    fsf/glibc-2_12-branch/ports/sysdeps/unix/sysv/linux/mips/mips32/internal_recvmmsg.S
    fsf/glibc-2_12-branch/ports/sysdeps/unix/sysv/linux/mips/mips32/recvmmsg.c
Modified:
    fsf/glibc-2_12-branch/ports/ChangeLog.arm
    fsf/glibc-2_12-branch/ports/ChangeLog.mips

Modified: fsf/glibc-2_12-branch/ports/ChangeLog.arm
==============================================================================
--- fsf/glibc-2_12-branch/ports/ChangeLog.arm (original)
+++ fsf/glibc-2_12-branch/ports/ChangeLog.arm Sat Jun  5 00:07:21 2010
@@ -1,3 +1,7 @@
+2010-05-21  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/arm/eabi/internal_recvmmsg.S: New.
+
 2010-04-08  Daniel Jacobowitz  <dan@xxxxxxxxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/arm/eabi/libc-do-syscall.S: New file.

Modified: fsf/glibc-2_12-branch/ports/ChangeLog.mips
==============================================================================
--- fsf/glibc-2_12-branch/ports/ChangeLog.mips (original)
+++ fsf/glibc-2_12-branch/ports/ChangeLog.mips Sat Jun  5 00:07:21 2010
@@ -1,3 +1,8 @@
+2010-05-21  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/mips/mips32/recvmmsg.c,
+	sysdeps/unix/sysv/linux/mips/mips32/internal_recvmmsg.S: New.
+
 2010-04-14  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/mips/libc-abis: New.

Added: fsf/glibc-2_12-branch/ports/sysdeps/unix/sysv/linux/arm/eabi/internal_recvmmsg.S
==============================================================================
--- fsf/glibc-2_12-branch/ports/sysdeps/unix/sysv/linux/arm/eabi/internal_recvmmsg.S (added)
+++ fsf/glibc-2_12-branch/ports/sysdeps/unix/sysv/linux/arm/eabi/internal_recvmmsg.S Sat Jun  5 00:07:21 2010
@@ -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

Added: fsf/glibc-2_12-branch/ports/sysdeps/unix/sysv/linux/mips/mips32/internal_recvmmsg.S
==============================================================================
--- fsf/glibc-2_12-branch/ports/sysdeps/unix/sysv/linux/mips/mips32/internal_recvmmsg.S (added)
+++ fsf/glibc-2_12-branch/ports/sysdeps/unix/sysv/linux/mips/mips32/internal_recvmmsg.S Sat Jun  5 00:07:21 2010
@@ -1,0 +1,2 @@
+/* MIPS does not have socket.S and the socketcall syscall should
+   generally be avoided, though it exists.  */

Added: fsf/glibc-2_12-branch/ports/sysdeps/unix/sysv/linux/mips/mips32/recvmmsg.c
==============================================================================
--- fsf/glibc-2_12-branch/ports/sysdeps/unix/sysv/linux/mips/mips32/recvmmsg.c (added)
+++ fsf/glibc-2_12-branch/ports/sysdeps/unix/sysv/linux/mips/mips32/recvmmsg.c Sat Jun  5 00:07:21 2010
@@ -1,0 +1,31 @@
+/* Copyright (C) 2010 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 recvmmsg.c trying to use a definition based on the socketcall
+   syscall and internal_recvmmsg.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/recvmmsg.c>