Check __x86_64__ for __cleanup_fct_attribute

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 1f6bfed19b18f867fee917586fb2c8a1ccd94a7d..a135ce02cb1d63295db11308742ca5efbef23113 100644 (file)
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-11  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * sysdeps/unix/sysv/linux/x86_64/bits/pthreadtypes.h
+       (__cleanup_fct_attribute): Check __x86_64__ instead of
+       __x86_64__.
+
 2012-05-11  H.J. Lu  <hongjiu.lu@intel.com>
 
        * sysdeps/pthread/pthread.h (PTHREAD_MUTEX_INITIALIZER): Check

diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/bits/pthreadtypes.h b/nptl/sysdeps/unix/sysv/linux/x86_64/bits/pthreadtypes.h
index 32be0b6421aab629d97832ae4f4c717d81da403f..e05b8f5c36b223180cd1f5663da2a34ee5493ebd 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/bits/pthreadtypes.h
+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/bits/pthreadtypes.h
@@ -219,7 +219,7 @@ typedef union
 #endif
 
 
-#if __WORDSIZE == 32
+#ifndef __x86_64__
 /* Extra attributes for the cleanup functions.  */
 # define __cleanup_fct_attribute __attribute__ ((__regparm__ (1)))
 #endif