From fcd89ebe4f5ea948ff4c796771b918cde8960721 Mon Sep 17 00:00:00 2001 From: Siddhesh Poyarekar Date: Mon, 17 Mar 2014 19:31:46 +0530 Subject: [PATCH] Get rid of __LT_SPINLOCK_INIT We got rid of LinuxThreads in 2005, but we didn't remove __LT_SPINLOCK_INIT back then. Do it now. * nptl/sysdeps/pthread/bits/libc-lockP.h [defined NOT_IN_libc && !defined IS_IN_libpthread && __LT_SPINNOCK_INIT != 0]: Remove. --- ChangeLog | 6 ++++++ nptl/sysdeps/pthread/bits/libc-lockP.h | 7 +------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1c6b384..005b678 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2014-03-17 Siddhesh Poyarekar + + * 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 * 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 bacc678..ec20271 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) \ -- 2.7.4