[Glibc-bsd-commits] r5950 - trunk/glibc-ports-2.23/fbtl/sysdeps/pthread
aurel32 at alioth.debian.org
aurel32 at alioth.debian.org
Sat Mar 19 23:45:02 UTC 2016
Author: aurel32
Date: 2016-03-19 23:45:02 +0000 (Sat, 19 Mar 2016)
New Revision: 5950
Modified:
trunk/glibc-ports-2.23/fbtl/sysdeps/pthread/libc-lockP.h
trunk/glibc-ports-2.23/fbtl/sysdeps/pthread/malloc-machine.h
Log:
Merge from upstream:
commit 400e12265d99964f8445bb6d717321eb73152cc5
Author: Florian Weimer <fweimer at redhat.com>
Date: Tue Nov 24 16:37:15 2015 +0100
Replace MUTEX_INITIALIZER with _LIBC_LOCK_INITIALIZER in generic code
Modified: trunk/glibc-ports-2.23/fbtl/sysdeps/pthread/libc-lockP.h
===================================================================
--- trunk/glibc-ports-2.23/fbtl/sysdeps/pthread/libc-lockP.h 2016-03-19 23:42:00 UTC (rev 5949)
+++ trunk/glibc-ports-2.23/fbtl/sysdeps/pthread/libc-lockP.h 2016-03-19 23:45:02 UTC (rev 5950)
@@ -75,6 +75,7 @@
initialized locks must be set to one due to the lack of normal
atomic operations.) */
+#define _LIBC_LOCK_INITIALIZER LLL_LOCK_INITIALIZER
#if IS_IN (libc) || IS_IN (libpthread)
# if LLL_LOCK_INITIALIZER == 0
# define __libc_lock_define_initialized(CLASS,NAME) \
Modified: trunk/glibc-ports-2.23/fbtl/sysdeps/pthread/malloc-machine.h
===================================================================
--- trunk/glibc-ports-2.23/fbtl/sysdeps/pthread/malloc-machine.h 2016-03-19 23:42:00 UTC (rev 5949)
+++ trunk/glibc-ports-2.23/fbtl/sysdeps/pthread/malloc-machine.h 2016-03-19 23:45:02 UTC (rev 5950)
@@ -31,7 +31,6 @@
#define mutex_lock(m) __libc_lock_lock (*(m))
#define mutex_trylock(m) __libc_lock_trylock (*(m))
#define mutex_unlock(m) __libc_lock_unlock (*(m))
-#define MUTEX_INITIALIZER LLL_LOCK_INITIALIZER
/* This is defined by newer gcc version unique for each module. */
extern void *__dso_handle __attribute__ ((__weak__));
More information about the Glibc-bsd-commits
mailing list