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.19-607-gc8daec5
- From: hjl at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 19 Jun 2014 22:27:55 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.19-607-gc8daec5
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 c8daec5c7cd19378112391d2394e6d6344e156dc (commit)
from 5c74e47cd628a6fcd2e4eba021301e275f8a95a3 (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=c8daec5c7cd19378112391d2394e6d6344e156dc
commit c8daec5c7cd19378112391d2394e6d6344e156dc
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Thu Jun 19 15:22:52 2014 -0700
Use 3 bytes for __pad1 in pthread_rwlock_t for x32
Since long is 4 bytes for x32, we should use 3 bytes for __pad1 when
a long __pad1 is replaced by a byte __rwelision and __pad1.
* sysdeps/x86/nptl/bits/pthreadtypes.h (pthread_rwlock_t): Use
3 bytes for __pad1 for x32.
(__PTHREAD_RWLOCK_ELISION_EXTRA): Likewise.
diff --git a/ChangeLog b/ChangeLog
index 841d55e..ec08f77 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-06-19 H.J. Lu <hongjiu.lu@intel.com>
+
+ * sysdeps/x86/nptl/bits/pthreadtypes.h (pthread_rwlock_t): Use
+ 3 bytes for __pad1 for x32.
+ (__PTHREAD_RWLOCK_ELISION_EXTRA): Likewise.
+
2014-06-19 Ling Ma <ling.ml@alibaba-inc.com>
H.J. Lu <hongjiu.lu@intel.com>
diff --git a/sysdeps/x86/nptl/bits/pthreadtypes.h b/sysdeps/x86/nptl/bits/pthreadtypes.h
index b04c32b..7f8076b 100644
--- a/sysdeps/x86/nptl/bits/pthreadtypes.h
+++ b/sysdeps/x86/nptl/bits/pthreadtypes.h
@@ -185,12 +185,17 @@ typedef union
int __writer;
int __shared;
signed char __rwelision;
+# ifdef __ILP32__
+ unsigned char __pad1[3];
+# define __PTHREAD_RWLOCK_ELISION_EXTRA 0, { 0, 0, 0 }
+# else
unsigned char __pad1[7];
+# define __PTHREAD_RWLOCK_ELISION_EXTRA 0, { 0, 0, 0, 0, 0, 0, 0 }
+# endif
unsigned long int __pad2;
/* FLAGS must stay at this position in the structure to maintain
binary compatibility. */
unsigned int __flags;
-# define __PTHREAD_RWLOCK_ELISION_EXTRA 0, {0, 0, 0, 0, 0, 0, 0 }
# define __PTHREAD_RWLOCK_INT_FLAGS_SHARED 1
} __data;
# else
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 ++++++
sysdeps/x86/nptl/bits/pthreadtypes.h | 7 ++++++-
2 files changed, 12 insertions(+), 1 deletions(-)
hooks/post-receive
--
GNU C Library master sources