diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | nptl/sysdeps/pthread/bits/libc-lockP.h | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index 1c6b384be2..005b678aaf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2014-03-17 Siddhesh Poyarekar <siddhesh@redhat.com> + + * nptl/sysdeps/pthread/bits/libc-lockP.h [defined NOT_IN_libc + && !defined IS_IN_libpthread && __LT_SPINNOCK_INIT != 0]: + Remove. + 2014-03-17 Joseph Myers <joseph@codesourcery.com> * math/gen-libm-test.pl (parse_args): Handle results specified for diff --git a/nptl/sysdeps/pthread/bits/libc-lockP.h b/nptl/sysdeps/pthread/bits/libc-lockP.h index bacc678abd..ec202713d6 100644 --- a/nptl/sysdeps/pthread/bits/libc-lockP.h +++ b/nptl/sysdeps/pthread/bits/libc-lockP.h @@ -78,13 +78,8 @@ typedef pthread_key_t __libc_key_t; CLASS __libc_lock_t NAME = LLL_LOCK_INITIALIZER; # endif #else -# if __LT_SPINLOCK_INIT == 0 -# define __libc_lock_define_initialized(CLASS,NAME) \ +# define __libc_lock_define_initialized(CLASS,NAME) \ CLASS __libc_lock_t NAME; -# else -# define __libc_lock_define_initialized(CLASS,NAME) \ - CLASS __libc_lock_t NAME = PTHREAD_MUTEX_INITIALIZER; -# endif #endif #define __libc_rwlock_define_initialized(CLASS,NAME) \ |