AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-24 14:00:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename bits/libc-tsd.h to libc-tsd.h (bug 14912).

Browse Source 
It was noted in
<https://sourceware.org/ml/libc-alpha/2012-09/msg00305.html> that the
bits/*.h naming scheme should only be used for installed headers.
This patch renames bits/libc-tsd.h to plain libc-tsd.h to follow that
convention.

Tested for x86_64 (testing, and that installed stripped shared
libraries are unchanged by the patch).

	[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.
This commit is contained in:
Joseph Myers 2015-09-03 20:33:46 +00:00
parent 625cd00f22
commit 02d55fe04e
9 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ChangeLog
View File

@ -1,5 +1,20 @@
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.

2
include/ctype.h
View File

@ -21,7 +21,7 @@ extern int (__isctype) (int __c, int __mask);
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

2
include/rpc/rpc.h
View File

@ -1,6 +1,6 @@
#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);

2
locale/localeinfo.h
View File

@ -223,7 +223,7 @@ extern struct __locale_struct _nl_global_locale attribute_hidden;
/* 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)

2
sunrpc/rpc_thread.c
View File

@ -4,7 +4,7 @@
#include <assert.h>
#include <bits/libc-lock.h>
#include <bits/libc-tsd.h>
#include <libc-tsd.h>
#ifdef _RPC_THREAD_SAFE_

6
bits/libc-tsd.h → sysdeps/generic/libc-tsd.h
View File

@ -16,8 +16,8 @@
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.
@ -57,4 +57,4 @@
#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 */

6
sysdeps/mach/hurd/bits/libc-tsd.h → sysdeps/mach/hurd/libc-tsd.h
View File

@ -16,8 +16,8 @@
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>
@ -31,4 +31,4 @@
#define __libc_tsd_set(TYPE, KEY, VALUE) \
(*__libc_tsd_address (TYPE, KEY) = (VALUE))
#endif /* bits/libc-tsd.h */
#endif /* libc-tsd.h */

2
sysdeps/mach/hurd/malloc-machine.h
View File

@ -54,7 +54,7 @@
/* 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 */

2
sysdeps/nptl/malloc-machine.h
View File

@ -60,7 +60,7 @@ extern void *__dso_handle __attribute__ ((__weak__));
/* 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 */