aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2012-02-27 15:14:04 +0000
committerJoseph Myers <joseph@codesourcery.com>2012-02-27 15:14:04 +0000
commite7c0dc24ea997ace937eaa3df7fb20b01eb95d14 (patch)
tree3ef2b1a327afa3fbcd52f8bf93f61ef05e615401
parentd735f8d4f0290b443ca09d26d9d2272752cac266 (diff)
downloadglibc-e7c0dc24ea997ace937eaa3df7fb20b01eb95d14.tar.xz
glibc-e7c0dc24ea997ace937eaa3df7fb20b01eb95d14.zip
ARM: fix pthread_attr_t definitions.
-rw-r--r--ChangeLog.arm6
-rw-r--r--sysdeps/unix/sysv/linux/arm/nptl/bits/pthreadtypes.h8
2 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog.arm b/ChangeLog.arm
index 7d23c114e6..982699cb24 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 c75a506e18..bb186aec06 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