diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2012-04-16 22:44:55 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2012-04-27 23:10:09 -0400 |
| commit | e43013840b7e68e2f725b0d689bcd1d0f688de15 (patch) | |
| tree | e11c872142975d833caa183ae407c0c3ac7dc51b | |
| parent | 7e4fc5890e07549e5ad98b4244e3e0ed5c709e6a (diff) | |
| download | glibc-e43013840b7e68e2f725b0d689bcd1d0f688de15.tar.xz glibc-e43013840b7e68e2f725b0d689bcd1d0f688de15.zip | |
ia64: pthread_attr_t type mangling
This applies the same updates that already exist in the main tree for
making the pthread_attr_t union more standards compliant.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| -rw-r--r-- | ChangeLog.ia64 | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/ia64/nptl/bits/pthreadtypes.h | 10 |
2 files changed, 13 insertions, 3 deletions
diff --git a/ChangeLog.ia64 b/ChangeLog.ia64 index 111cb5b456..fea858230b 100644 --- a/ChangeLog.ia64 +++ b/ChangeLog.ia64 @@ -1,5 +1,11 @@ 2012-04-27 Mike Frysinger <vapier@gentoo.org> + * sysdeps/unix/sysv/linux/ia64/nptl/bits/pthreadtypes.h + (pthread_attr_t): Change union tag to pthread_attr_t. Only define + typedef if not already defined. + +2012-04-27 Mike Frysinger <vapier@gentoo.org> + * sysdeps/unix/sysv/linux/ia64/bits/mman.h (MAP_STACK): Define. (MAP_HUGETLB): Likewise. diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/bits/pthreadtypes.h b/sysdeps/unix/sysv/linux/ia64/nptl/bits/pthreadtypes.h index 4f87f8b61e..5b30713069 100644 --- a/sysdeps/unix/sysv/linux/ia64/nptl/bits/pthreadtypes.h +++ b/sysdeps/unix/sysv/linux/ia64/nptl/bits/pthreadtypes.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. +/* Copyright (C) 2003-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jakub Jelinek <jakub@redhat.com>, 2003. @@ -35,11 +35,15 @@ typedef unsigned long int pthread_t; -typedef union +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_list |