[Commits] r17323 - in /fsf/trunk/ports: ./ sysdeps/unix/sysv/linux/arm/nptl/bits/ sysdeps/unix/sysv/linux/m68k/nptl/bits/ sysdeps/unix...

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Tue Feb 28 00:02:17 2012
New Revision: 17323

Log:
Import glibc-ports-mainline for 2012-02-28

Modified:
    fsf/trunk/ports/ChangeLog.arm
    fsf/trunk/ports/ChangeLog.m68k
    fsf/trunk/ports/ChangeLog.mips
    fsf/trunk/ports/sysdeps/unix/sysv/linux/arm/nptl/bits/pthreadtypes.h
    fsf/trunk/ports/sysdeps/unix/sysv/linux/m68k/nptl/bits/pthreadtypes.h
    fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/bits/siginfo.h
    fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/bits/socket.h
    fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/nptl/bits/pthreadtypes.h

Modified: fsf/trunk/ports/ChangeLog.arm
==============================================================================
--- fsf/trunk/ports/ChangeLog.arm (original)
+++ fsf/trunk/ports/ChangeLog.arm Tue Feb 28 00:02:17 2012
@@ -1,3 +1,9 @@
+2012-02-27  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/arm/nptl/bits/pthreadtypes.h
+	(pthread_attr_t): Change union tag to pthread_attr_t.  Only define
+	typedef if not already defined.
+
 2012-02-26  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/arm/nptl/bits/pthreadtypes.h: Name

Modified: fsf/trunk/ports/ChangeLog.m68k
==============================================================================
--- fsf/trunk/ports/ChangeLog.m68k (original)
+++ fsf/trunk/ports/ChangeLog.m68k Tue Feb 28 00:02:17 2012
@@ -1,3 +1,9 @@
+2012-02-27  Andreas Schwab  <schwab@xxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/m68k/nptl/bits/pthreadtypes.h
+	(pthread_attr_t): Fix name of union.  Only define if not already
+	defined.
+
 2012-02-26  Andreas Schwab  <schwab@xxxxxxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/m68k/nptl/bits/pthreadtypes.h: Name

Modified: fsf/trunk/ports/ChangeLog.mips
==============================================================================
--- fsf/trunk/ports/ChangeLog.mips (original)
+++ fsf/trunk/ports/ChangeLog.mips Tue Feb 28 00:02:17 2012
@@ -1,3 +1,17 @@
+2012-02-27  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/mips/bits/socket.h [!__USE_GNU]: Do not
+	declare recvmmsg and sendmmsg.
+
+2012-02-27  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/mips/bits/siginfo.h (pthread_attr_t):
+	Change union tag to pthread_attr_t.  Only define typedef if not
+	already defined.
+	* sysdeps/unix/sysv/linux/mips/nptl/bits/pthreadtypes.h
+	(pthread_attr_t): Change union tag to pthread_attr_t.  Only define
+	typedef if not already defined.
+
 2012-02-26  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/mips/bits/siginfo.h: Don't name

Modified: fsf/trunk/ports/sysdeps/unix/sysv/linux/arm/nptl/bits/pthreadtypes.h
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/arm/nptl/bits/pthreadtypes.h (original)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/arm/nptl/bits/pthreadtypes.h Tue Feb 28 00:02:17 2012
@@ -38,11 +38,15 @@
 typedef unsigned long int pthread_t;
 
 
-typedef union __pthread_attr
+union pthread_attr_t
 {
   char __size[__SIZEOF_PTHREAD_ATTR_T];
   long int __align;
-} pthread_attr_t;
+};
+#ifndef __have_pthread_attr_t
+typedef union pthread_attr_t pthread_attr_t;
+# define __have_pthread_attr_t	1
+#endif
 
 
 typedef struct __pthread_internal_slist

Modified: fsf/trunk/ports/sysdeps/unix/sysv/linux/m68k/nptl/bits/pthreadtypes.h
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/m68k/nptl/bits/pthreadtypes.h (original)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/m68k/nptl/bits/pthreadtypes.h Tue Feb 28 00:02:17 2012
@@ -38,11 +38,15 @@
 typedef unsigned long int pthread_t;
 
 
-typedef union __pthread_attr
+union pthread_attr_t
 {
   char __size[__SIZEOF_PTHREAD_ATTR_T];
   long int __align;
-} pthread_attr_t;
+};
+#ifndef __have_pthread_attr_t
+typedef union pthread_attr_t pthread_attr_t;
+# define __have_pthread_attr_t	1
+#endif
 
 
 typedef struct __pthread_internal_slist

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 Feb 28 00:02:17 2012
@@ -274,7 +274,10 @@
 # endif
 
 /* Forward declaration.  */
-typedef union __pthread_attr pthread_attr_t;
+# ifndef __have_pthread_attr_t
+typedef union pthread_attr_t pthread_attr_t;
+#  define __have_pthread_attr_t	1
+# endif
 
 typedef struct sigevent
   {

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 Feb 28 00:02:17 2012
@@ -417,6 +417,7 @@
 
 __BEGIN_DECLS
 
+#ifdef __USE_GNU
 /* Receive up to VLEN messages as described by VMESSAGES from socket FD.
    Returns the number of bytes read or -1 for errors.
 
@@ -432,6 +433,7 @@
    __THROW.  */
 extern int sendmmsg (int __fd, struct mmsghdr *__vmessages,
 		     unsigned int __vlen, int __flags);
+#endif
 
 __END_DECLS
 

Modified: fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/nptl/bits/pthreadtypes.h
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/nptl/bits/pthreadtypes.h (original)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/nptl/bits/pthreadtypes.h Tue Feb 28 00:02:17 2012
@@ -50,11 +50,15 @@
 typedef unsigned long int pthread_t;
 
 
-typedef union __pthread_attr
+union pthread_attr_t
 {
   char __size[__SIZEOF_PTHREAD_ATTR_T];
   long int __align;
-} pthread_attr_t;
+};
+#ifndef __have_pthread_attr_t
+typedef union pthread_attr_t pthread_attr_t;
+# define __have_pthread_attr_t	1
+#endif
 
 
 #if _MIPS_SIM == _ABI64

_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits