diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | bits/libc-lock.h | 1 | ||||
| -rw-r--r-- | nptl/ChangeLog | 6 | ||||
| -rw-r--r-- | nptl/sysdeps/pthread/bits/libc-lockP.h | 12 | ||||
| -rw-r--r-- | sysdeps/mach/bits/libc-lock.h | 1 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/bits/libc-lock.h | 2 |
7 files changed, 16 insertions, 17 deletions
@@ -1,3 +1,12 @@ +2012-09-13 H.J. Lu <hongjiu.lu@intel.com> + + [BZ #14576] + * bits/libc-lock.h (__rtld_lock_init_recursive): Removed. + * sysdeps/mach/bits/libc-lock.h (__rtld_lock_init_recursive): + Likewise. + * sysdeps/mach/hurd/bits/libc-lock.h (__rtld_lock_init_recursive): + Likewise. + 2012-09-13 Joseph Myers <joseph@codesourcery.com> * libio/libio.h [!_G_HAVE_PRINTF_FP] (_IO_USE_DTOA): Remove. @@ -13,7 +13,7 @@ Version 2.17 13542, 13717, 13696, 13939, 13966, 14042, 14090, 14166, 14150, 14151, 14154, 14157, 14166, 14173, 14195, 14237, 14252, 14283, 14298, 14303, 14307, 14328, 14331, 14336, 14337, 14347, 14349, 14459, 14476, 14505, - 14510, 14516, 14518, 14519, 14532, 14538, 14544, 14545. + 14510, 14516, 14518, 14519, 14532, 14538, 14544, 14545, 14576, * Support for STT_GNU_IFUNC symbols added for s390 and s390x. Optimized versions of memcpy, memset, and memcmp added for System z10 and diff --git a/bits/libc-lock.h b/bits/libc-lock.h index 6b215c575f..d372722b95 100644 --- a/bits/libc-lock.h +++ b/bits/libc-lock.h @@ -49,7 +49,6 @@ /* Same as last but this time we initialize a recursive mutex. */ #define __libc_lock_init_recursive(NAME) -#define __rtld_lock_init_recursive(NAME) /* Finalize the named lock variable, which must be locked. It cannot be used again until __libc_lock_init is called again on it. This must be diff --git a/nptl/ChangeLog b/nptl/ChangeLog index b89216e8b7..7745b2edd2 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,9 @@ +2012-09-13 H.J. Lu <hongjiu.lu@intel.com> + + [BZ #14576] + * sysdeps/pthread/bits/libc-lockP.h (__rtld_lock_init_recursive): + Removed. + 2012-09-07 H.J. Lu <hongjiu.lu@intel.com> * Makefile (LDFLAGS-tst-cancel24): Renamed to ... diff --git a/nptl/sysdeps/pthread/bits/libc-lockP.h b/nptl/sysdeps/pthread/bits/libc-lockP.h index 7adaeb4398..0e9268c3bf 100644 --- a/nptl/sysdeps/pthread/bits/libc-lockP.h +++ b/nptl/sysdeps/pthread/bits/libc-lockP.h @@ -146,18 +146,6 @@ typedef pthread_key_t __libc_key_t; __libc_maybe_call (__pthread_rwlock_init, (&(NAME), NULL), 0) #endif -#define __rtld_lock_init_recursive(NAME) \ - do { \ - if (__pthread_mutex_init != NULL) \ - { \ - pthread_mutexattr_t __attr; \ - __pthread_mutexattr_init (&__attr); \ - __pthread_mutexattr_settype (&__attr, PTHREAD_MUTEX_RECURSIVE_NP); \ - __pthread_mutex_init (&(NAME).mutex, &__attr); \ - __pthread_mutexattr_destroy (&__attr); \ - } \ - } while (0) - /* Finalize the named lock variable, which must be locked. It cannot be used again until __libc_lock_init is called again on it. This must be called on a lock variable before the containing storage is reused. */ diff --git a/sysdeps/mach/bits/libc-lock.h b/sysdeps/mach/bits/libc-lock.h index 110e25e965..94877e0ea7 100644 --- a/sysdeps/mach/bits/libc-lock.h +++ b/sysdeps/mach/bits/libc-lock.h @@ -137,7 +137,6 @@ void *__libc_getspecific (__libc_key_t key); #define __libc_lock_lock_recursive __libc_lock_lock #define __rtld_lock_define_initialized_recursive __libc_lock_define_initialized -#define __rtld_lock_init_recursive __libc_lock_init #define __rtld_lock_fini_recursive __libc_lock_fini #define __rtld_lock_trylock_recursive __libc_lock_trylock #define __rtld_lock_unlock_recursive __libc_lock_unlock diff --git a/sysdeps/mach/hurd/bits/libc-lock.h b/sysdeps/mach/hurd/bits/libc-lock.h index d18a10c457..e8cb71bfdd 100644 --- a/sysdeps/mach/hurd/bits/libc-lock.h +++ b/sysdeps/mach/hurd/bits/libc-lock.h @@ -119,8 +119,6 @@ typedef struct __libc_lock_recursive_opaque__ __libc_lock_recursive_t; }) -#define __rtld_lock_init_recursive(NAME) \ - __libc_lock_init_recursive (NAME) #define __rtld_lock_initialize(NAME) \ (void) ((NAME) = (__rtld_lock_recursive_t) _RTLD_LOCK_RECURSIVE_INITIALIZER) #define __rtld_lock_trylock_recursive(NAME) \ |