This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH/committed] hppa: fix pthreadtypes.h namespace failures
- From: Mike Frysinger <vapier at gentoo dot org>
- To: libc-alpha at sourceware dot org
- Date: Thu, 30 Jul 2015 05:30:54 -0400
- Subject: [PATCH/committed] hppa: fix pthreadtypes.h namespace failures
- Authentication-results: sourceware.org; auth=none
The conform tests flag the "aligned" symbol used inside the attributes,
so rename it to __aligned__ like other headers.
---
ChangeLog | 6 ++++++
sysdeps/hppa/nptl/bits/pthreadtypes.h | 6 +++---
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index e686f42..bcb14cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-07-30 Mike Frysinger <vapier@gentoo.org>
+
+ * sysdeps/hppa/nptl/bits/pthreadtypes.h (pthread_mutex_t): Change
+ aligned to __aligned__.
+ (pthread_cond_t, pthread_rwlock_t): Likewise.
+
2015-07-30 Torvald Riegel <triegel@redhat.com>
* sysdeps/unix/sysv/linux/hppa/lowlevellock.h: Remove file.
diff --git a/sysdeps/hppa/nptl/bits/pthreadtypes.h b/sysdeps/hppa/nptl/bits/pthreadtypes.h
index 845629d..a361ecf 100644
--- a/sysdeps/hppa/nptl/bits/pthreadtypes.h
+++ b/sysdeps/hppa/nptl/bits/pthreadtypes.h
@@ -67,7 +67,7 @@ typedef union
{
struct __pthread_mutex_s
{
- int __lock __attribute__ ((aligned(16)));
+ int __lock __attribute__ ((__aligned__(16)));
unsigned int __count;
int __owner;
/* KIND must stay at this position in the structure to maintain
@@ -119,7 +119,7 @@ typedef union
start of the 4-word lock structure, the next four words
are set all to 1 by the Linuxthreads
PTHREAD_COND_INITIALIZER. */
- int __lock __attribute__ ((aligned(16)));
+ int __lock __attribute__ ((__aligned__(16)));
/* Tracks the initialization of this structure:
0 initialized with NPTL PTHREAD_COND_INITIALIZER.
1 initialized with Linuxthreads PTHREAD_COND_INITIALIZER.
@@ -167,7 +167,7 @@ typedef union
start of the 4-word 16-byte aligned lock structure. The
next four words are all set to 1 by the Linuxthreads
PTHREAD_RWLOCK_INITIALIZER. We ignore them in NPTL. */
- int __compat_padding[4] __attribute__ ((aligned(16)));
+ int __compat_padding[4] __attribute__ ((__aligned__(16)));
int __lock;
unsigned int __nr_readers;
unsigned int __readers_wakeup;
--
2.4.4