This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.21-662-g243cc40
- From: vapier at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 30 Jul 2015 09:30:55 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.21-662-g243cc40
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 243cc404ca2fca24bd3f78d9bc6fda417896d1f7 (commit)
from 87ab9d55f7558fbf2547cf066a99097120abb29d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=243cc404ca2fca24bd3f78d9bc6fda417896d1f7
commit 243cc404ca2fca24bd3f78d9bc6fda417896d1f7
Author: Mike Frysinger <vapier@gentoo.org>
Date: Thu Jul 30 05:02:15 2015 -0400
hppa: fix pthreadtypes.h namespace failures
The conform tests flag the "aligned" symbol used inside the attributes,
so rename it to __aligned__ like other headers.
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;
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 ++++++
sysdeps/hppa/nptl/bits/pthreadtypes.h | 6 +++---
2 files changed, 9 insertions(+), 3 deletions(-)
hooks/post-receive
--
GNU C Library master sources