[Glibc-bsd-commits] r5798 - trunk/glibc-ports/fbtl/sysdeps/pthread/bits

[aurel32 at alioth.debian.org]

Author: aurel32
Date: 2015-10-20 14:47:38 +0000 (Tue, 20 Oct 2015)
New Revision: 5798

Modified:
   trunk/glibc-ports/fbtl/sysdeps/pthread/bits/libc-lockP.h
Log:
Merge from upstream:

commit fcd89ebe4f5ea948ff4c796771b918cde8960721
Author: Siddhesh Poyarekar <siddhesh at redhat.com>
Date:   Mon Mar 17 19:31:46 2014 +0530

    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.



Modified: trunk/glibc-ports/fbtl/sysdeps/pthread/bits/libc-lockP.h
===================================================================
--- trunk/glibc-ports/fbtl/sysdeps/pthread/bits/libc-lockP.h	2015-10-20 14:40:34 UTC (rev 5797)
+++ trunk/glibc-ports/fbtl/sysdeps/pthread/bits/libc-lockP.h	2015-10-20 14:47:38 UTC (rev 5798)
@@ -78,13 +78,8 @@
   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) \