From: Joseph Myers <joseph@codesourcery.com>
Date: Mon, 27 Feb 2012 15:14:04 +0000 (+0000)
Subject: ARM: fix pthread_attr_t definitions.
X-Git-Tag: glibc-2.16-ports-before-merge~236
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e7c0dc24ea997ace937eaa3df7fb20b01eb95d14;p=thirdparty%2Fglibc.git

ARM: fix pthread_attr_t definitions.
---

diff --git a/ChangeLog.arm b/ChangeLog.arm
index 7d23c114e68..982699cb241 100644
--- 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 c75a506e183..bb186aec068 100644
--- 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