diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | nptl/sysdeps/pthread/bits/libc-lock.h | 7 |
2 files changed, 9 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index b8988b9445..2539d1e893 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2014-05-01 Roland McGrath <roland@hack.frob.com> + + * nptl/sysdeps/pthread/bits/libc-lock.h + [_LIBC && (!NOT_IN_libc || IS_IN_libpthread)] + (__libc_lock_define_initialized_recursive): Always define using + initializer. Modern compilers treat uninitialized (implicit zero) and + explicit zero initializers the same (i.e. put the datum in bss). + 2014-05-01 Andreas Schwab <schwab@linux-m68k.org> * nscd/nscd-client.h: Include <string.h>. diff --git a/nptl/sysdeps/pthread/bits/libc-lock.h b/nptl/sysdeps/pthread/bits/libc-lock.h index cddf11a382..532cf2c701 100644 --- a/nptl/sysdeps/pthread/bits/libc-lock.h +++ b/nptl/sysdeps/pthread/bits/libc-lock.h @@ -48,13 +48,8 @@ typedef struct __libc_lock_recursive_opaque__ __libc_lock_recursive_t; /* Define an initialized recursive lock variable NAME with storage class CLASS. */ #if defined _LIBC && (!defined NOT_IN_libc || defined IS_IN_libpthread) -# if LLL_LOCK_INITIALIZER == 0 -# define __libc_lock_define_initialized_recursive(CLASS,NAME) \ - CLASS __libc_lock_recursive_t NAME; -# else -# define __libc_lock_define_initialized_recursive(CLASS,NAME) \ +# define __libc_lock_define_initialized_recursive(CLASS, NAME) \ CLASS __libc_lock_recursive_t NAME = _LIBC_LOCK_RECURSIVE_INITIALIZER; -# endif # define _LIBC_LOCK_RECURSIVE_INITIALIZER \ { LLL_LOCK_INITIALIZER, 0, NULL } #else |