From: H.J. Lu <hjl.tools@gmail.com>
Date: Fri, 11 May 2012 17:12:42 +0000 (-0700)
Subject: Check __x86_64__ for __cleanup_fct_attribute
X-Git-Tag: glibc-2.16-tps~375
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c0d2c8538a89c7a3de158ab60fe35fe1f9960803;p=platform%2Fupstream%2Fglibc.git

Check __x86_64__ for __cleanup_fct_attribute
---

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 1f6bfed..a135ce0 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,5 +1,11 @@
 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
 	__PTHREAD_MUTEX_HAVE_PREV instead of __WORDSIZE.
 	(PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP): Likewise.
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 32be0b6..e05b8f5 100644
--- 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