[commits] r11028 - in /branches/eglibc-2_12/ports: ChangeLog.eglibc sysdeps/unix/sysv/linux/m68k/nptl/bits/pthreadtypes.h

[maxim@xxxxxxxxxx]

Author: maxim
Date: Thu Jul 22 08:43:10 2010
New Revision: 11028

Log:
	Backport 0df56592854fa25ce091883cb60fc417283383b8 from trunk:

	2010-06-11  Andreas Schwab  <schwab@xxxxxxxxxxxxxx>
	* sysdeps/unix/sysv/linux/m68k/nptl/bits/pthreadtypes.h: Force
	alignment of futex variables.

Modified:
    branches/eglibc-2_12/ports/ChangeLog.eglibc
    branches/eglibc-2_12/ports/sysdeps/unix/sysv/linux/m68k/nptl/bits/pthreadtypes.h

Modified: branches/eglibc-2_12/ports/ChangeLog.eglibc
==============================================================================
--- branches/eglibc-2_12/ports/ChangeLog.eglibc (original)
+++ branches/eglibc-2_12/ports/ChangeLog.eglibc Thu Jul 22 08:43:10 2010
@@ -1,3 +1,11 @@
+2010-07-22  Maxim Kuvyrkov  <maxim@xxxxxxxxxxxxxxxx>
+
+	Backport 0df56592854fa25ce091883cb60fc417283383b8 from trunk:
+
+	2010-06-11  Andreas Schwab  <schwab@xxxxxxxxxxxxxx>
+	* sysdeps/unix/sysv/linux/m68k/nptl/bits/pthreadtypes.h: Force
+	alignment of futex variables.
+
 2009-08-25  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 
 	* sysdeps/powerpc/powerpc32/e500/fpu/__longjmp-common.S: Move

Modified: branches/eglibc-2_12/ports/sysdeps/unix/sysv/linux/m68k/nptl/bits/pthreadtypes.h
==============================================================================
--- branches/eglibc-2_12/ports/sysdeps/unix/sysv/linux/m68k/nptl/bits/pthreadtypes.h (original)
+++ branches/eglibc-2_12/ports/sysdeps/unix/sysv/linux/m68k/nptl/bits/pthreadtypes.h Thu Jul 22 08:43:10 2010
@@ -57,7 +57,7 @@
 {
   struct __pthread_mutex_s
   {
-    int __lock;
+    int __lock __attribute__ ((__aligned__ (4)));
     unsigned int __count;
     int __owner;
     /* KIND must stay at this position in the structure to maintain
@@ -87,7 +87,7 @@
 {
   struct
   {
-    int __lock;
+    int __lock __attribute__ ((__aligned__ (4)));
     unsigned int __futex;
     __extension__ unsigned long long int __total_seq;
     __extension__ unsigned long long int __wakeup_seq;
@@ -112,7 +112,7 @@
 
 
 /* Once-only execution */
-typedef int pthread_once_t;
+typedef int __attribute__ ((__aligned__ (4))) pthread_once_t;
 
 
 #if defined __USE_UNIX98 || defined __USE_XOPEN2K
@@ -122,7 +122,7 @@
 {
   struct
   {
-    int __lock;
+    int __lock __attribute__ ((__aligned__ (4)));
     unsigned int __nr_readers;
     unsigned int __readers_wakeup;
     unsigned int __writer_wakeup;
@@ -158,7 +158,7 @@
 typedef union
 {
   char __size[__SIZEOF_PTHREAD_BARRIER_T];
-  long int __align;
+  long int __align __attribute__ ((__aligned__ (4)));
 } pthread_barrier_t;
 
 typedef union