r4009 - in glibc-package/trunk/debian: . patches/hppa
Author: aurel32
Date: 2009-11-23 15:42:21 +0000 (Mon, 23 Nov 2009)
New Revision: 4009
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/hppa/cvs-nptl-compat.diff
Log:
[ Carlos O'Donell]
* debian/patches/hppa/cvs-nptl-compat.diff: new version to fix
pthread structures alignment on hppa.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2009-11-23 12:06:49 UTC (rev 4008)
+++ glibc-package/trunk/debian/changelog 2009-11-23 15:42:21 UTC (rev 4009)
@@ -1,3 +1,11 @@
+eglibc (2.10.2-2) UNRELEASED; urgency=low
+
+ [ Carlos O'Donell]
+ * debian/patches/hppa/cvs-nptl-compat.diff: new version to fix
+ pthread structures alignment on hppa.
+
+ -- Aurelien Jarno <aurel32@debian.org> Mon, 23 Nov 2009 16:41:54 +0100
+
eglibc (2.10.2-1) unstable; urgency=low
[ Aurelien Jarno ]
Modified: glibc-package/trunk/debian/patches/hppa/cvs-nptl-compat.diff
===================================================================
--- glibc-package/trunk/debian/patches/hppa/cvs-nptl-compat.diff 2009-11-23 12:06:49 UTC (rev 4008)
+++ glibc-package/trunk/debian/patches/hppa/cvs-nptl-compat.diff 2009-11-23 15:42:21 UTC (rev 4009)
@@ -93,7 +93,17 @@
#define __SIZEOF_PTHREAD_CONDATTR_T 4
#define __SIZEOF_PTHREAD_MUTEX_T 48
#define __SIZEOF_PTHREAD_MUTEXATTR_T 4
-@@ -70,12 +70,22 @@
+@@ -64,18 +64,31 @@
+ {
+ struct __pthread_mutex_s
+ {
+- int __lock;
++ /* Ensure that the entire structure when embedded in another
++ structure retains the same alignment requirements as it
++ did in LinuxThreads, thus add aligned 16 here. */
++ int __lock __attribute__ ((aligned(16)));
+ unsigned int __count;
+ int __owner;
/* KIND must stay at this position in the structure to maintain
binary compatibility. */
int __kind;
@@ -116,7 +126,7 @@
} __data;
char __size[__SIZEOF_PTHREAD_MUTEX_T];
long int __align;
-@@ -89,19 +99,37 @@
+@@ -89,19 +102,37 @@
/* Data structure for conditional variable handling. The structure of
@@ -131,11 +141,12 @@
{
struct
{
+- int __lock;
+ /* In the old Linuxthreads pthread_cond_t, this is the
+ start of the 4-word lock structure, the next four words
+ are set all to 1 by the Linuxthreads
+ PTHREAD_COND_INITIALIZER. */
- int __lock;
++ 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.
@@ -156,7 +167,7 @@
} __data;
char __size[__SIZEOF_PTHREAD_COND_T];
__extension__ long long int __align;
-@@ -129,19 +157,34 @@
+@@ -129,19 +160,34 @@
{
struct
{
@@ -164,7 +175,7 @@
+ start of the 4-word 16-byte algned 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];
++ int __compat_padding[4] __attribute__ ((aligned(16)));
int __lock;
unsigned int __nr_readers;
unsigned int __readers_wakeup;
Reply to: