diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2012-05-11 10:12:42 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2012-05-11 10:12:42 -0700 |
| commit | c0d2c8538a89c7a3de158ab60fe35fe1f9960803 (patch) | |
| tree | d37b6842bd1ef732f05620ccb53ff026d20a43b4 /nptl | |
| parent | 1f59b0b121e1fe9df13560096c55d8ad6c6e8c46 (diff) | |
| download | glibc-c0d2c8538a89c7a3de158ab60fe35fe1f9960803.tar.gz glibc-c0d2c8538a89c7a3de158ab60fe35fe1f9960803.tar.xz glibc-c0d2c8538a89c7a3de158ab60fe35fe1f9960803.zip | |
Check __x86_64__ for __cleanup_fct_attribute
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/ChangeLog | 6 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/x86_64/bits/pthreadtypes.h | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 1f6bfed19b..a135ce02cb 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 32be0b6421..e05b8f5c36 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 |