2015-09-03 Joseph Myers <joseph@codesourcery.com>
+ [BZ #14912]
+ * bits/libc-tsd.h: Move to ...
+ * sysdeps/generic/libc-tsd.h: ...here.
+ (_GENERIC_BITS_LIBC_TSD_H): Rename macro to _GENERIC_LIBC_TSD_H.
+ * sysdeps/mach/hurd/bits/libc-tsd.h: Move to ...
+ * sysdeps/mach/hurd/libc-tsd.h: ...here.
+ (_BITS_LIBC_TSD_H): Rename macro to _LIBC_TSD_H.
+ * include/ctype.h: Include <libc-tsd.h> instead of
+ <bits/libc-tsd.h>.
+ * include/rpc/rpc.h: Likewise.
+ * locale/localeinfo.h: Likewise.
+ * sunrpc/rpc_thread.c: Likewise.
+ * sysdeps/mach/hurd/malloc-machine.h: Likewise.
+ * sysdeps/nptl/malloc-machine.h: Likewise.
+
* Makefile (headers): Remove bits/libc-lock.h.
* libio/Makefile (headers): Remove bits/stdio-lock.h.
NL_CURRENT_INDIRECT. */
# include "../locale/localeinfo.h"
-# include <bits/libc-tsd.h>
+# include <libc-tsd.h>
# ifndef CTYPE_EXTERN_INLINE /* Used by ctype/ctype-info.c, which see. */
# define CTYPE_EXTERN_INLINE extern inline
#ifndef _RPC_RPC_H
#include <sunrpc/rpc/rpc.h>
-#include <bits/libc-tsd.h>
+#include <libc-tsd.h>
/* Now define the internal interfaces. */
extern unsigned long _create_xid (void);
/* This fetches the thread-local locale_t pointer, either one set with
uselocale or &_nl_global_locale. */
#define _NL_CURRENT_LOCALE (__libc_tsd_get (__locale_t, LOCALE))
-#include <bits/libc-tsd.h>
+#include <libc-tsd.h>
__libc_tsd_define (extern, __locale_t, LOCALE)
#include <assert.h>
#include <bits/libc-lock.h>
-#include <bits/libc-tsd.h>
+#include <libc-tsd.h>
#ifdef _RPC_THREAD_SAFE_
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef _GENERIC_BITS_LIBC_TSD_H
-#define _GENERIC_BITS_LIBC_TSD_H 1
+#ifndef _GENERIC_LIBC_TSD_H
+#define _GENERIC_LIBC_TSD_H 1
/* This file defines the following macros for accessing a small fixed
set of thread-specific `void *' data used only internally by libc.
#define __libc_tsd_get(TYPE, KEY) (__libc_tsd_##KEY)
#define __libc_tsd_set(TYPE, KEY, VALUE) (__libc_tsd_##KEY = (VALUE))
-#endif /* bits/libc-tsd.h */
+#endif /* libc-tsd.h */
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef _BITS_LIBC_TSD_H
-#define _BITS_LIBC_TSD_H 1
+#ifndef _LIBC_TSD_H
+#define _LIBC_TSD_H 1
#include <hurd/threadvar.h>
#define __libc_tsd_set(TYPE, KEY, VALUE) \
(*__libc_tsd_address (TYPE, KEY) = (VALUE))
-#endif /* bits/libc-tsd.h */
+#endif /* libc-tsd.h */
/* thread specific data for glibc */
-#include <bits/libc-tsd.h>
+#include <libc-tsd.h>
typedef int tsd_key_t[1]; /* no key data structure, libc magic does it */
__libc_tsd_define (static, void *, MALLOC) /* declaration/common definition */
/* thread specific data for glibc */
-#include <bits/libc-tsd.h>
+#include <libc-tsd.h>
typedef int tsd_key_t[1]; /* no key data structure, libc magic does it */
__libc_tsd_define (static, void *, MALLOC) /* declaration/common definition */