ARM: fix pthread_attr_t definitions.

diff --git a/ChangeLog.arm b/ChangeLog.arm
index 7d23c11..982699c 100644 (file)
--- a/ChangeLog.arm
+++ b/ChangeLog.arm
@@ -1,3 +1,9 @@
+2012-02-27  Joseph Myers  <joseph@codesourcery.com>
+
+       * 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@codesourcery.com>
 
        * sysdeps/unix/sysv/linux/arm/nptl/bits/pthreadtypes.h: Name

diff --git a/sysdeps/unix/sysv/linux/arm/nptl/bits/pthreadtypes.h b/sysdeps/unix/sysv/linux/arm/nptl/bits/pthreadtypes.h
index c75a506..bb186ae 100644 (file)
--- a/sysdeps/unix/sysv/linux/arm/nptl/bits/pthreadtypes.h
+++ b/sysdeps/unix/sysv/linux/arm/nptl/bits/pthreadtypes.h
@@ -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