[commits] r9344 - in /fsf/trunk/ports: ./ sysdeps/unix/sysv/linux/hppa/bits/ sysdeps/unix/sysv/linux/hppa/nptl/bits/

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Thu Nov 26 00:04:51 2009
New Revision: 9344

Log:
Import glibc-ports-mainline for 2009-11-26

Modified:
    fsf/trunk/ports/ChangeLog.hppa
    fsf/trunk/ports/sysdeps/unix/sysv/linux/hppa/bits/atomic.h
    fsf/trunk/ports/sysdeps/unix/sysv/linux/hppa/nptl/bits/pthreadtypes.h

Modified: fsf/trunk/ports/ChangeLog.hppa
==============================================================================
--- fsf/trunk/ports/ChangeLog.hppa (original)
+++ fsf/trunk/ports/ChangeLog.hppa Thu Nov 26 00:04:51 2009
@@ -1,3 +1,14 @@
+2009-11-25  Carlos O'Donell  <carlos@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/hppa/nptl/bits/pthreadtypes.h:
+	Use correct alignment for pthread_mutex_t, pthread_cond_t,
+	and pthread_rwlock_t.  
+
+2009-11-22  Carlos O'Donell  <carlos@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/hppa/bits/atomic.h: Avoid warnings
+	by casting oldval to int.
+
 2009-11-15  Carlos O'Donell  <carlos@xxxxxxxxxxxxxxxx>
 
 	[BZ #6676]

Modified: fsf/trunk/ports/sysdeps/unix/sysv/linux/hppa/bits/atomic.h
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/hppa/bits/atomic.h (original)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/hppa/bits/atomic.h Thu Nov 26 00:04:51 2009
@@ -98,7 +98,7 @@
      int ret;								\
      ret = atomic_compare_and_exchange_val_acq(mem, newval, oldval);	\
      /* Return 1 if it was already acquired.  */			\
-     (ret != oldval);							\
+     (ret != (int)oldval);						\
    })
 #else
 # error __ASSUME_LWS_CAS is required to build glibc.

Modified: fsf/trunk/ports/sysdeps/unix/sysv/linux/hppa/nptl/bits/pthreadtypes.h
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/hppa/nptl/bits/pthreadtypes.h (original)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/hppa/nptl/bits/pthreadtypes.h Thu Nov 26 00:04:51 2009
@@ -64,7 +64,7 @@
 {
   struct __pthread_mutex_s
   {
-    int __lock;
+    int __lock __attribute__ ((aligned(16)));
     unsigned int __count;
     int __owner;
     /* KIND must stay at this position in the structure to maintain
@@ -113,7 +113,7 @@
        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.
@@ -161,7 +161,7 @@
        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];
+    int __compat_padding[4] __attribute__ ((aligned(16)));
     int __lock;
     unsigned int __nr_readers;
     unsigned int __readers_wakeup;