Move bits/libc-lock.h and bits/libc-lockP.h out of bits/ (bug 14912).

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-lock.h to plain libc-lock.h and
bits/libc-lockP.h to plain libc-lockP.h to follow that convention.

Note that I don't know where libc-lockP.h comes from for Hurd (the
Hurd libc-lock.h includes libc-lockP.h, but the only libc-lockP.h in
the glibc source tree is for NPTL) - some unmerged patch? - but I
updated the #include in the Hurd libc-lock.h anyway.

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

	[BZ #14912]
	* bits/libc-lock.h: Move to ...
	* sysdeps/generic/libc-lock.h: ...here.
	(_BITS_LIBC_LOCK_H): Rename macro to _LIBC_LOCK_H.
	* sysdeps/mach/hurd/bits/libc-lock.h: Move to ...
	* sysdeps/mach/hurd/libc-lock.h: ...here.
	(_BITS_LIBC_LOCK_H): Rename macro to _LIBC_LOCK_H.
	[_LIBC]: Include <libc-lockP.h> instead of <bits/libc-lockP.h>.
	* sysdeps/mach/bits/libc-lock.h: Move to ...
	* sysdeps/mach/libc-lock.h: ...here.
	(_BITS_LIBC_LOCK_H): Rename macro to _LIBC_LOCK_H.
	* sysdeps/nptl/bits/libc-lock.h: Move to ...
	* sysdeps/nptl/libc-lock.h: ...here.
	(_BITS_LIBC_LOCK_H): Rename macro to _LIBC_LOCK_H.
	* sysdeps/nptl/bits/libc-lockP.h: Move to ...
	* sysdeps/nptl/libc-lockP.h: ...here.
	(_BITS_LIBC_LOCKP_H): Rename macro to _LIBC_LOCKP_H.
	* crypt/crypt_util.c: Include <libc-lock.h> instead of
	<bits/libc-lock.h>.
	* dirent/scandir-tail.c: Likewise.
	* dlfcn/dlerror.c: Likewise.
	* elf/dl-close.c: Likewise.
	* elf/dl-iteratephdr.c: Likewise.
	* elf/dl-lookup.c: Likewise.
	* elf/dl-open.c: Likewise.
	* elf/dl-support.c: Likewise.
	* elf/dl-writev.h: Likewise.
	* elf/rtld.c: Likewise.
	* grp/fgetgrent.c: Likewise.
	* gshadow/fgetsgent.c: Likewise.
	* gshadow/sgetsgent.c: Likewise.
	* iconv/gconv_conf.c: Likewise.
	* iconv/gconv_db.c: Likewise.
	* iconv/gconv_dl.c: Likewise.
	* iconv/gconv_int.h: Likewise.
	* iconv/gconv_trans.c: Likewise.
	* include/link.h: Likewise.
	* inet/getnameinfo.c: Likewise.
	* inet/getnetgrent.c: Likewise.
	* inet/getnetgrent_r.c: Likewise.
	* intl/bindtextdom.c: Likewise.
	* intl/dcigettext.c: Likewise.
	* intl/finddomain.c: Likewise.
	* intl/gettextP.h: Likewise.
	* intl/loadmsgcat.c: Likewise.
	* intl/localealias.c: Likewise.
	* intl/textdomain.c: Likewise.
	* libidn/idn-stub.c: Likewise.
	* libio/libioP.h: Likewise.
	* locale/duplocale.c: Likewise.
	* locale/freelocale.c: Likewise.
	* locale/newlocale.c: Likewise.
	* locale/setlocale.c: Likewise.
	* login/getutent_r.c: Likewise.
	* login/getutid_r.c: Likewise.
	* login/getutline_r.c: Likewise.
	* login/utmp-private.h: Likewise.
	* login/utmpname.c: Likewise.
	* malloc/mtrace.c: Likewise.
	* misc/efgcvt.c: Likewise.
	* misc/error.c: Likewise.
	* misc/fstab.c: Likewise.
	* misc/getpass.c: Likewise.
	* misc/mntent.c: Likewise.
	* misc/syslog.c: Likewise.
	* nis/nis_call.c: Likewise.
	* nis/nis_callback.c: Likewise.
	* nis/nss-default.c: Likewise.
	* nis/nss_compat/compat-grp.c: Likewise.
	* nis/nss_compat/compat-initgroups.c: Likewise.
	* nis/nss_compat/compat-pwd.c: Likewise.
	* nis/nss_compat/compat-spwd.c: Likewise.
	* nis/nss_nis/nis-alias.c: Likewise.
	* nis/nss_nis/nis-ethers.c: Likewise.
	* nis/nss_nis/nis-grp.c: Likewise.
	* nis/nss_nis/nis-hosts.c: Likewise.
	* nis/nss_nis/nis-network.c: Likewise.
	* nis/nss_nis/nis-proto.c: Likewise.
	* nis/nss_nis/nis-pwd.c: Likewise.
	* nis/nss_nis/nis-rpc.c: Likewise.
	* nis/nss_nis/nis-service.c: Likewise.
	* nis/nss_nis/nis-spwd.c: Likewise.
	* nis/nss_nisplus/nisplus-alias.c: Likewise.
	* nis/nss_nisplus/nisplus-ethers.c: Likewise.
	* nis/nss_nisplus/nisplus-grp.c: Likewise.
	* nis/nss_nisplus/nisplus-hosts.c: Likewise.
	* nis/nss_nisplus/nisplus-initgroups.c: Likewise.
	* nis/nss_nisplus/nisplus-network.c: Likewise.
	* nis/nss_nisplus/nisplus-proto.c: Likewise.
	* nis/nss_nisplus/nisplus-pwd.c: Likewise.
	* nis/nss_nisplus/nisplus-rpc.c: Likewise.
	* nis/nss_nisplus/nisplus-service.c: Likewise.
	* nis/nss_nisplus/nisplus-spwd.c: Likewise.
	* nis/ypclnt.c: Likewise.
	* nptl/libc_pthread_init.c: Likewise.
	* nss/getXXbyYY.c: Likewise.
	* nss/getXXent.c: Likewise.
	* nss/getXXent_r.c: Likewise.
	* nss/nss_db/db-XXX.c: Likewise.
	* nss/nss_db/db-netgrp.c: Likewise.
	* nss/nss_db/nss_db.h: Likewise.
	* nss/nss_files/files-XXX.c: Likewise.
	* nss/nss_files/files-alias.c: Likewise.
	* nss/nsswitch.c: Likewise.
	* posix/regex_internal.h: Likewise.
	* posix/wordexp.c: Likewise.
	* pwd/fgetpwent.c: Likewise.
	* resolv/res_hconf.c: Likewise.
	* resolv/res_libc.c: Likewise.
	* shadow/fgetspent.c: Likewise.
	* shadow/lckpwdf.c: Likewise.
	* shadow/sgetspent.c: Likewise.
	* socket/opensock.c: Likewise.
	* stdio-common/reg-modifier.c: Likewise.
	* stdio-common/reg-printf.c: Likewise.
	* stdio-common/reg-type.c: Likewise.
	* stdio-common/vfprintf.c: Likewise.
	* stdio-common/vfscanf.c: Likewise.
	* stdlib/abort.c: Likewise.
	* stdlib/cxa_atexit.c: Likewise.
	* stdlib/fmtmsg.c: Likewise.
	* stdlib/random.c: Likewise.
	* stdlib/setenv.c: Likewise.
	* string/strsignal.c: Likewise.
	* sunrpc/auth_none.c: Likewise.
	* sunrpc/bindrsvprt.c: Likewise.
	* sunrpc/create_xid.c: Likewise.
	* sunrpc/key_call.c: Likewise.
	* sunrpc/rpc_thread.c: Likewise.
	* sysdeps/arm/backtrace.c: Likewise.
	* sysdeps/generic/ldsodefs.h: Likewise.
	* sysdeps/generic/stdio-lock.h: Likewise.
	* sysdeps/generic/unwind-dw2-fde.c: Likewise.
	* sysdeps/i386/backtrace.c: Likewise.
	* sysdeps/ieee754/ldbl-opt/nldbl-compat.c: Likewise.
	* sysdeps/m68k/backtrace.c: Likewise.
	* sysdeps/mach/hurd/cthreads.c: Likewise.
	* sysdeps/mach/hurd/dirstream.h: Likewise.
	* sysdeps/mach/hurd/malloc-machine.h: Likewise.
	* sysdeps/nptl/malloc-machine.h: Likewise.
	* sysdeps/nptl/stdio-lock.h: Likewise.
	* sysdeps/posix/dirstream.h: Likewise.
	* sysdeps/posix/getaddrinfo.c: Likewise.
	* sysdeps/posix/system.c: Likewise.
	* sysdeps/pthread/aio_suspend.c: Likewise.
	* sysdeps/s390/s390-32/backtrace.c: Likewise.
	* sysdeps/s390/s390-64/backtrace.c: Likewise.
	* sysdeps/unix/sysv/linux/check_pf.c: Likewise.
	* sysdeps/unix/sysv/linux/if_index.c: Likewise.
	* sysdeps/unix/sysv/linux/s390/s390-32/getutent_r.c: Likewise.
	* sysdeps/unix/sysv/linux/s390/s390-32/getutid_r.c: Likewise.
	* sysdeps/unix/sysv/linux/s390/s390-32/getutline_r.c: Likewise.
	* sysdeps/unix/sysv/linux/shm-directory.c: Likewise.
	* sysdeps/unix/sysv/linux/system.c: Likewise.
	* sysdeps/x86_64/backtrace.c: Likewise.
	* time/alt_digit.c: Likewise.
	* time/era.c: Likewise.
	* time/tzset.c: Likewise.
	* wcsmbs/wcsmbsload.c: Likewise.
	* nptl/tst-initializers1.c (do_test): Refer to <libc-lock.h>
	instead of <bits/libc-lock.h> in comment.

diff --git a/ChangeLog b/ChangeLog
index f36e17460dc83dadcf14297c1aea1bc5ee04f03a..5f009a806d3f27f2c75f4f415569bf31fe17265b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,167 @@
+2015-09-08  Joseph Myers  <joseph@codesourcery.com>
+
+       [BZ #14912]
+       * bits/libc-lock.h: Move to ...
+       * sysdeps/generic/libc-lock.h: ...here.
+       (_BITS_LIBC_LOCK_H): Rename macro to _LIBC_LOCK_H.
+       * sysdeps/mach/hurd/bits/libc-lock.h: Move to ...
+       * sysdeps/mach/hurd/libc-lock.h: ...here.
+       (_BITS_LIBC_LOCK_H): Rename macro to _LIBC_LOCK_H.
+       [_LIBC]: Include <libc-lockP.h> instead of <bits/libc-lockP.h>.
+       * sysdeps/mach/bits/libc-lock.h: Move to ...
+       * sysdeps/mach/libc-lock.h: ...here.
+       (_BITS_LIBC_LOCK_H): Rename macro to _LIBC_LOCK_H.
+       * sysdeps/nptl/bits/libc-lock.h: Move to ...
+       * sysdeps/nptl/libc-lock.h: ...here.
+       (_BITS_LIBC_LOCK_H): Rename macro to _LIBC_LOCK_H.
+       * sysdeps/nptl/bits/libc-lockP.h: Move to ...
+       * sysdeps/nptl/libc-lockP.h: ...here.
+       (_BITS_LIBC_LOCKP_H): Rename macro to _LIBC_LOCKP_H.
+       * crypt/crypt_util.c: Include <libc-lock.h> instead of
+       <bits/libc-lock.h>.
+       * dirent/scandir-tail.c: Likewise.
+       * dlfcn/dlerror.c: Likewise.
+       * elf/dl-close.c: Likewise.
+       * elf/dl-iteratephdr.c: Likewise.
+       * elf/dl-lookup.c: Likewise.
+       * elf/dl-open.c: Likewise.
+       * elf/dl-support.c: Likewise.
+       * elf/dl-writev.h: Likewise.
+       * elf/rtld.c: Likewise.
+       * grp/fgetgrent.c: Likewise.
+       * gshadow/fgetsgent.c: Likewise.
+       * gshadow/sgetsgent.c: Likewise.
+       * iconv/gconv_conf.c: Likewise.
+       * iconv/gconv_db.c: Likewise.
+       * iconv/gconv_dl.c: Likewise.
+       * iconv/gconv_int.h: Likewise.
+       * iconv/gconv_trans.c: Likewise.
+       * include/link.h: Likewise.
+       * inet/getnameinfo.c: Likewise.
+       * inet/getnetgrent.c: Likewise.
+       * inet/getnetgrent_r.c: Likewise.
+       * intl/bindtextdom.c: Likewise.
+       * intl/dcigettext.c: Likewise.
+       * intl/finddomain.c: Likewise.
+       * intl/gettextP.h: Likewise.
+       * intl/loadmsgcat.c: Likewise.
+       * intl/localealias.c: Likewise.
+       * intl/textdomain.c: Likewise.
+       * libidn/idn-stub.c: Likewise.
+       * libio/libioP.h: Likewise.
+       * locale/duplocale.c: Likewise.
+       * locale/freelocale.c: Likewise.
+       * locale/newlocale.c: Likewise.
+       * locale/setlocale.c: Likewise.
+       * login/getutent_r.c: Likewise.
+       * login/getutid_r.c: Likewise.
+       * login/getutline_r.c: Likewise.
+       * login/utmp-private.h: Likewise.
+       * login/utmpname.c: Likewise.
+       * malloc/mtrace.c: Likewise.
+       * misc/efgcvt.c: Likewise.
+       * misc/error.c: Likewise.
+       * misc/fstab.c: Likewise.
+       * misc/getpass.c: Likewise.
+       * misc/mntent.c: Likewise.
+       * misc/syslog.c: Likewise.
+       * nis/nis_call.c: Likewise.
+       * nis/nis_callback.c: Likewise.
+       * nis/nss-default.c: Likewise.
+       * nis/nss_compat/compat-grp.c: Likewise.
+       * nis/nss_compat/compat-initgroups.c: Likewise.
+       * nis/nss_compat/compat-pwd.c: Likewise.
+       * nis/nss_compat/compat-spwd.c: Likewise.
+       * nis/nss_nis/nis-alias.c: Likewise.
+       * nis/nss_nis/nis-ethers.c: Likewise.
+       * nis/nss_nis/nis-grp.c: Likewise.
+       * nis/nss_nis/nis-hosts.c: Likewise.
+       * nis/nss_nis/nis-network.c: Likewise.
+       * nis/nss_nis/nis-proto.c: Likewise.
+       * nis/nss_nis/nis-pwd.c: Likewise.
+       * nis/nss_nis/nis-rpc.c: Likewise.
+       * nis/nss_nis/nis-service.c: Likewise.
+       * nis/nss_nis/nis-spwd.c: Likewise.
+       * nis/nss_nisplus/nisplus-alias.c: Likewise.
+       * nis/nss_nisplus/nisplus-ethers.c: Likewise.
+       * nis/nss_nisplus/nisplus-grp.c: Likewise.
+       * nis/nss_nisplus/nisplus-hosts.c: Likewise.
+       * nis/nss_nisplus/nisplus-initgroups.c: Likewise.
+       * nis/nss_nisplus/nisplus-network.c: Likewise.
+       * nis/nss_nisplus/nisplus-proto.c: Likewise.
+       * nis/nss_nisplus/nisplus-pwd.c: Likewise.
+       * nis/nss_nisplus/nisplus-rpc.c: Likewise.
+       * nis/nss_nisplus/nisplus-service.c: Likewise.
+       * nis/nss_nisplus/nisplus-spwd.c: Likewise.
+       * nis/ypclnt.c: Likewise.
+       * nptl/libc_pthread_init.c: Likewise.
+       * nss/getXXbyYY.c: Likewise.
+       * nss/getXXent.c: Likewise.
+       * nss/getXXent_r.c: Likewise.
+       * nss/nss_db/db-XXX.c: Likewise.
+       * nss/nss_db/db-netgrp.c: Likewise.
+       * nss/nss_db/nss_db.h: Likewise.
+       * nss/nss_files/files-XXX.c: Likewise.
+       * nss/nss_files/files-alias.c: Likewise.
+       * nss/nsswitch.c: Likewise.
+       * posix/regex_internal.h: Likewise.
+       * posix/wordexp.c: Likewise.
+       * pwd/fgetpwent.c: Likewise.
+       * resolv/res_hconf.c: Likewise.
+       * resolv/res_libc.c: Likewise.
+       * shadow/fgetspent.c: Likewise.
+       * shadow/lckpwdf.c: Likewise.
+       * shadow/sgetspent.c: Likewise.
+       * socket/opensock.c: Likewise.
+       * stdio-common/reg-modifier.c: Likewise.
+       * stdio-common/reg-printf.c: Likewise.
+       * stdio-common/reg-type.c: Likewise.
+       * stdio-common/vfprintf.c: Likewise.
+       * stdio-common/vfscanf.c: Likewise.
+       * stdlib/abort.c: Likewise.
+       * stdlib/cxa_atexit.c: Likewise.
+       * stdlib/fmtmsg.c: Likewise.
+       * stdlib/random.c: Likewise.
+       * stdlib/setenv.c: Likewise.
+       * string/strsignal.c: Likewise.
+       * sunrpc/auth_none.c: Likewise.
+       * sunrpc/bindrsvprt.c: Likewise.
+       * sunrpc/create_xid.c: Likewise.
+       * sunrpc/key_call.c: Likewise.
+       * sunrpc/rpc_thread.c: Likewise.
+       * sysdeps/arm/backtrace.c: Likewise.
+       * sysdeps/generic/ldsodefs.h: Likewise.
+       * sysdeps/generic/stdio-lock.h: Likewise.
+       * sysdeps/generic/unwind-dw2-fde.c: Likewise.
+       * sysdeps/i386/backtrace.c: Likewise.
+       * sysdeps/ieee754/ldbl-opt/nldbl-compat.c: Likewise.
+       * sysdeps/m68k/backtrace.c: Likewise.
+       * sysdeps/mach/hurd/cthreads.c: Likewise.
+       * sysdeps/mach/hurd/dirstream.h: Likewise.
+       * sysdeps/mach/hurd/malloc-machine.h: Likewise.
+       * sysdeps/nptl/malloc-machine.h: Likewise.
+       * sysdeps/nptl/stdio-lock.h: Likewise.
+       * sysdeps/posix/dirstream.h: Likewise.
+       * sysdeps/posix/getaddrinfo.c: Likewise.
+       * sysdeps/posix/system.c: Likewise.
+       * sysdeps/pthread/aio_suspend.c: Likewise.
+       * sysdeps/s390/s390-32/backtrace.c: Likewise.
+       * sysdeps/s390/s390-64/backtrace.c: Likewise.
+       * sysdeps/unix/sysv/linux/check_pf.c: Likewise.
+       * sysdeps/unix/sysv/linux/if_index.c: Likewise.
+       * sysdeps/unix/sysv/linux/s390/s390-32/getutent_r.c: Likewise.
+       * sysdeps/unix/sysv/linux/s390/s390-32/getutid_r.c: Likewise.
+       * sysdeps/unix/sysv/linux/s390/s390-32/getutline_r.c: Likewise.
+       * sysdeps/unix/sysv/linux/shm-directory.c: Likewise.
+       * sysdeps/unix/sysv/linux/system.c: Likewise.
+       * sysdeps/x86_64/backtrace.c: Likewise.
+       * time/alt_digit.c: Likewise.
+       * time/era.c: Likewise.
+       * time/tzset.c: Likewise.
+       * wcsmbs/wcsmbsload.c: Likewise.
+       * nptl/tst-initializers1.c (do_test): Refer to <libc-lock.h>
+       instead of <bits/libc-lock.h> in comment.
+
 2015-09-08  Andrew Bennett  <andrew.bennett@imgtec.com>
 
        * sysdeps/mips/bits/atomic.h [_MIPS_SIM == _ABIO32] (MIPS_PUSH_MIPS2):

diff --git a/crypt/crypt_util.c b/crypt/crypt_util.c
index 1597885ed6a0e16a7498af9dca193bcc234e5060..b96ecc8b6c46889471f36154e8643014fff7af94 100644 (file)
--- a/crypt/crypt_util.c
+++ b/crypt/crypt_util.c
@@ -253,7 +253,7 @@ static const char b64t[64] =
 struct crypt_data _ufc_foobar;
 
 #ifdef __GNU_LIBRARY__
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 
 __libc_lock_define_initialized (static, _ufc_tables_lock)
 #endif

diff --git a/dirent/scandir-tail.c b/dirent/scandir-tail.c
index 4560834af5cd30191f7b79c4aafd7c186d73c2ec..6b9d4e28d406aadbb395dd8fec7ad6a8814b77ef 100644 (file)
--- a/dirent/scandir-tail.c
+++ b/dirent/scandir-tail.c
@@ -20,7 +20,7 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 
 #ifndef SCANDIR_TAIL
 # define SCANDIR_TAIL  __scandir_tail

diff --git a/dlfcn/dlerror.c b/dlfcn/dlerror.c
index 5d3bd030375143d12414185ad1d9a588b795e04e..107736ce4d003ce7aea8b6db08e129f10a3152d8 100644 (file)
--- a/dlfcn/dlerror.c
+++ b/dlfcn/dlerror.c
@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <ldsodefs.h>
 
 #if !defined SHARED && IS_IN (libdl)

diff --git a/elf/dl-close.c b/elf/dl-close.c
index c8972471eeba5cae6a208142c9f23e233ce080f1..b05a40341250c3e5f3e3297c9b4db083a77aa764 100644 (file)
--- a/elf/dl-close.c
+++ b/elf/dl-close.c
@@ -25,7 +25,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <ldsodefs.h>
 #include <sys/types.h>
 #include <sys/mman.h>

diff --git a/elf/dl-iteratephdr.c b/elf/dl-iteratephdr.c
index 906c9ce6f543707a497edfc53148618605347098..8871c261dce7030fe727f990909415ba94ae113d 100644 (file)
--- a/elf/dl-iteratephdr.c
+++ b/elf/dl-iteratephdr.c
@@ -20,7 +20,7 @@
 #include <errno.h>
 #include <ldsodefs.h>
 #include <stddef.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 
 static void
 cancel_handler (void *arg __attribute__((unused)))

diff --git a/elf/dl-lookup.c b/elf/dl-lookup.c
index 11cb44b451730a4085a395ee8e8ac9bbb458b79c..581fb20e601f184e8fee2d04582de52487bd03c2 100644 (file)
--- a/elf/dl-lookup.c
+++ b/elf/dl-lookup.c
@@ -25,7 +25,7 @@
 #include <dl-hash.h>
 #include <dl-machine.h>
 #include <sysdep-cancel.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <tls.h>
 #include <atomic.h>
 

diff --git a/elf/dl-open.c b/elf/dl-open.c
index 2db1c021485763fbdc49cb7fb2e07e2ac87b0c29..5429d181cbb61bbab7825795a86717509d49344e 100644 (file)
--- a/elf/dl-open.c
+++ b/elf/dl-open.c
@@ -26,7 +26,7 @@
 #include <unistd.h>
 #include <sys/mman.h>          /* Check whether MAP_COPY is defined.  */
 #include <sys/param.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <ldsodefs.h>
 #include <caller.h>
 #include <sysdep-cancel.h>

diff --git a/elf/dl-support.c b/elf/dl-support.c
index 4d036f12dd3684de0a62e728baf6c3c383ac5b55..e7b5110b5935359961b37307886b90d91bdba16d 100644 (file)
--- a/elf/dl-support.c
+++ b/elf/dl-support.c
@@ -27,7 +27,7 @@
 #include <stdint.h>
 #include <ldsodefs.h>
 #include <dl-machine.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <dl-cache.h>
 #include <dl-librecon.h>
 #include <dl-procinfo.h>

diff --git a/elf/dl-writev.h b/elf/dl-writev.h
index 3e6d2f4975ea323e18b2e189af1fd45b2f375f71..4ff2e64c4825171c3d5d3f1260d71a6d06ea229b 100644 (file)
--- a/elf/dl-writev.h
+++ b/elf/dl-writev.h
@@ -18,7 +18,7 @@
 
 #include <sys/uio.h>
 #include <ldsodefs.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 
 /* This is used from only one place: dl-misc.c:_dl_debug_vdprintf.
    Hence it's in a header with the expectation it will be inlined.

diff --git a/elf/rtld.c b/elf/rtld.c
index 69873c23682d2f55ad00a0330b734e1bc60d67a1..1474c72cde2ab313c354f6567346115fa06da27f 100644 (file)
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -31,7 +31,7 @@
 #include <entry.h>
 #include <fpu_control.h>
 #include <hp-timing.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include "dynamic-link.h"
 #include <dl-librecon.h>
 #include <unsecvars.h>

diff --git a/grp/fgetgrent.c b/grp/fgetgrent.c
index 5a2fa8867172018f12a1b97705035906b57a199e..4123155a70c09b622ed6c57231355b965dd3a2ca 100644 (file)
--- a/grp/fgetgrent.c
+++ b/grp/fgetgrent.c
@@ -17,7 +17,7 @@
 
 #include <errno.h>
 #include <grp.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <stdio.h>
 #include <stdlib.h>
 

diff --git a/gshadow/fgetsgent.c b/gshadow/fgetsgent.c
index 23aea9e68082957eb97148fb876050559ee8dad8..02e0285ae84293f49c8afd40c9bfd2ee1979cb15 100644 (file)
--- a/gshadow/fgetsgent.c
+++ b/gshadow/fgetsgent.c
@@ -16,7 +16,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <gshadow.h>
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/gshadow/sgetsgent.c b/gshadow/sgetsgent.c
index dc643de337393b6bf397298126c3e172a0fdc19e..5d2d269054f613a3331ce569098210968c937084 100644 (file)
--- a/gshadow/sgetsgent.c
+++ b/gshadow/sgetsgent.c
@@ -16,7 +16,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <gshadow.h>
 #include <stdlib.h>
 

diff --git a/iconv/gconv_conf.c b/iconv/gconv_conf.c
index 0ba4739c410baed08f2261e78df99b81d61e8638..eadbb6b5c01fc71576bb3f056bd7cac6e44ccb90 100644 (file)
--- a/iconv/gconv_conf.c
+++ b/iconv/gconv_conf.c
@@ -31,7 +31,7 @@
 #include <unistd.h>
 #include <sys/param.h>
 
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <gconv_int.h>
 
 

diff --git a/iconv/gconv_db.c b/iconv/gconv_db.c
index ce46216c2bb276c420c9b84ab20bc45fb9d2899c..4e6ec657e2a7307858c85ca55aad707170ef031c 100644 (file)
--- a/iconv/gconv_db.c
+++ b/iconv/gconv_db.c
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/param.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <locale/localeinfo.h>
 
 #include <dlfcn.h>

diff --git a/iconv/gconv_dl.c b/iconv/gconv_dl.c
index 77c9b26bd7b1aee44b28852f141f0da1f29be5c5..f8621c887259192ab70a353c9bc2f7984b90a414 100644 (file)
--- a/iconv/gconv_dl.c
+++ b/iconv/gconv_dl.c
@@ -23,7 +23,7 @@
 #include <search.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <sys/param.h>
 
 #include <gconv_int.h>

diff --git a/iconv/gconv_int.h b/iconv/gconv_int.h
index 162c4844a3a8529298de2c24c2a37c2b978b1c68..46a140ef4f018ce707850a3250c8e024e2de205b 100644 (file)
--- a/iconv/gconv_int.h
+++ b/iconv/gconv_int.h
@@ -23,7 +23,7 @@
 #include <stdlib.h>            /* For alloca used in macro below.  */
 #include <ctype.h>             /* For __toupper_l used in macro below.  */
 #include <string.h>            /* For strlen et al used in macro below.  */
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 
 __BEGIN_DECLS
 

diff --git a/iconv/gconv_trans.c b/iconv/gconv_trans.c
index 5d5d4d75a4360f521e41f1e4c28d4f0272df0575..ea8081b125686d2047ccd7c790dd706f9aae78c0 100644 (file)
--- a/iconv/gconv_trans.c
+++ b/iconv/gconv_trans.c
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include "gconv_int.h"
 #include "../locale/localeinfo.h"
 

diff --git a/include/link.h b/include/link.h
index e44110c843369467b83b2acf80f1250678374fc9..96a1771ce3efd15984cd24be620a6bbc34a2752e 100644 (file)
--- a/include/link.h
+++ b/include/link.h
@@ -43,7 +43,7 @@ extern unsigned int la_objopen (struct link_map *__map, Lmid_t __lmid,
 #include <dl-fileid.h>
 #include <dl-lookupcfg.h>
 #include <tls.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 
 
 /* Some internal data structures of the dynamic linker used in the

diff --git a/inet/getnameinfo.c b/inet/getnameinfo.c
index 0126f2032655e5bb4d610c9eddf22ae10ee54cf3..40f67f082fd6a7518240528bf586d49fad4ae0cb 100644 (file)
--- a/inet/getnameinfo.c
+++ b/inet/getnameinfo.c
@@ -51,7 +51,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <sys/types.h>
 #include <sys/un.h>
 #include <sys/utsname.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <scratch_buffer.h>
 
 #ifdef HAVE_LIBIDN

diff --git a/inet/getnetgrent.c b/inet/getnetgrent.c
index 094f34f0fdb9eaac24d0a39ec9048336ee81d1ba..e4e3214bd17cfac6dec594201ced5aee6ab7a4de 100644 (file)
--- a/inet/getnetgrent.c
+++ b/inet/getnetgrent.c
@@ -18,7 +18,7 @@
 #include <errno.h>
 #include <netdb.h>
 #include <stdlib.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 
 /* Static buffer for return value.  We allocate it when needed.  */
 libc_freeres_ptr (static char *buffer);

diff --git a/inet/getnetgrent_r.c b/inet/getnetgrent_r.c
index 53ae648ceddd782762a59bfbbd3c78b8f099efe6..00fb73fd741e5c8e00bcf5d1b20ca21d72df9a0b 100644 (file)
--- a/inet/getnetgrent_r.c
+++ b/inet/getnetgrent_r.c
@@ -17,7 +17,7 @@
 
 #include <assert.h>
 #include <atomic.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <errno.h>
 #include <netdb.h>
 #include <stdbool.h>

diff --git a/intl/bindtextdom.c b/intl/bindtextdom.c
index 887393c47868b983d5a63ec36783126ce03c592e..c98434be5ce089d1e79a44924b620126fd6397ba 100644 (file)
--- a/intl/bindtextdom.c
+++ b/intl/bindtextdom.c
@@ -31,7 +31,7 @@
 
 /* Handle multi-threaded applications.  */
 #ifdef _LIBC
-# include <bits/libc-lock.h>
+# include <libc-lock.h>
 # define gl_rwlock_define __libc_rwlock_define
 # define gl_rwlock_wrlock __libc_rwlock_wrlock
 # define gl_rwlock_unlock __libc_rwlock_unlock

diff --git a/intl/dcigettext.c b/intl/dcigettext.c
index 8a3f091497ad2eaebb23d77d8186b46d1460d32f..8d2269fca352a3b3eb4a3131116e13d2873bc939 100644 (file)
--- a/intl/dcigettext.c
+++ b/intl/dcigettext.c
@@ -103,7 +103,7 @@ extern int errno;
 
 /* Handle multi-threaded applications.  */
 #ifdef _LIBC
-# include <bits/libc-lock.h>
+# include <libc-lock.h>
 # define gl_rwlock_define_initialized __libc_rwlock_define_initialized
 # define gl_rwlock_rdlock __libc_rwlock_rdlock
 # define gl_rwlock_wrlock __libc_rwlock_wrlock

diff --git a/intl/finddomain.c b/intl/finddomain.c
index a5c157f340b1be5b86080dd1580759a406a5b724..6ef664eb1f5d233faf39a1096b73b659d4ecf9a2 100644 (file)
--- a/intl/finddomain.c
+++ b/intl/finddomain.c
@@ -37,7 +37,7 @@
 
 /* Handle multi-threaded applications.  */
 #ifdef _LIBC
-# include <bits/libc-lock.h>
+# include <libc-lock.h>
 # define gl_rwlock_define_initialized __libc_rwlock_define_initialized
 # define gl_rwlock_rdlock __libc_rwlock_rdlock
 # define gl_rwlock_wrlock __libc_rwlock_wrlock

diff --git a/intl/gettextP.h b/intl/gettextP.h
index bbd213988b92661ee170a54323edc94e113adc8e..a61e00f428a467f6b4159bffee4f17c11d674478 100644 (file)
--- a/intl/gettextP.h
+++ b/intl/gettextP.h
@@ -30,7 +30,7 @@
 
 /* Handle multi-threaded applications.  */
 #ifdef _LIBC
-# include <bits/libc-lock.h>
+# include <libc-lock.h>
 # define gl_rwlock_define __libc_rwlock_define
 #else
 # include "lock.h"

diff --git a/intl/loadmsgcat.c b/intl/loadmsgcat.c
index 8eb77d8fe9cdc69b68fff45da01b7971c6a873ce..bcdf73d0de823161763c6a0cccad3adf4b71817e 100644 (file)
--- a/intl/loadmsgcat.c
+++ b/intl/loadmsgcat.c
@@ -95,7 +95,7 @@ char *alloca ();
 
 /* Handle multi-threaded applications.  */
 #ifdef _LIBC
-# include <bits/libc-lock.h>
+# include <libc-lock.h>
 #else
 # include "lock.h"
 #endif

diff --git a/intl/localealias.c b/intl/localealias.c
index 687b9002adab327eb7a725bf60caf55ebd25260b..d6a4c97b8c12f0f3f77946a6b49b38181b92e8e2 100644 (file)
--- a/intl/localealias.c
+++ b/intl/localealias.c
@@ -83,7 +83,7 @@ char *alloca ();
 
 /* Handle multi-threaded applications.  */
 #ifdef _LIBC
-# include <bits/libc-lock.h>
+# include <libc-lock.h>
 #else
 # include "lock.h"
 #endif

diff --git a/intl/textdomain.c b/intl/textdomain.c
index 7ccf68ee0b85e0f053a012ab744a0a9e3930a163..eaa0cd366a1194b6545adf05861f9baa3a83c3ca 100644 (file)
--- a/intl/textdomain.c
+++ b/intl/textdomain.c
@@ -30,7 +30,7 @@
 
 /* Handle multi-threaded applications.  */
 #ifdef _LIBC
-# include <bits/libc-lock.h>
+# include <libc-lock.h>
 # define gl_rwlock_define __libc_rwlock_define
 # define gl_rwlock_wrlock __libc_rwlock_wrlock
 # define gl_rwlock_unlock __libc_rwlock_unlock

diff --git a/libidn/idn-stub.c b/libidn/idn-stub.c
index afd93caed878598d710a7c9670f702dc1b91b64a..fb67f74b8deb98bfa56fa284c050c7e05f7d35a3 100644 (file)
--- a/libidn/idn-stub.c
+++ b/libidn/idn-stub.c
@@ -22,7 +22,7 @@
 #include <string.h>
 #include <dlfcn.h>
 #include <gnu/lib-names.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 
 /* Get specification for idna_to_ascii_lz. */
 #include "idna.h"

diff --git a/libio/libioP.h b/libio/libioP.h
index 36170ea6195bb88dbbc44447b6322465be7b95e0..b1ca774be5aa827984017314a03b7f8291244cde 100644 (file)
--- a/libio/libioP.h
+++ b/libio/libioP.h
@@ -39,7 +39,7 @@
 # define __set_errno(Val) errno = (Val)
 #endif
 #if defined __GLIBC__ && __GLIBC__ >= 2
-# include <bits/libc-lock.h>
+# include <libc-lock.h>
 #else
 /*# include <comthread.h>*/
 #endif

diff --git a/locale/duplocale.c b/locale/duplocale.c
index dd048405f861496ef56f752d733e860d0820926b..8ee07788f1f10a00ac1bf42b9b9213ce4a39e1e0 100644 (file)
--- a/locale/duplocale.c
+++ b/locale/duplocale.c
@@ -18,7 +18,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <locale.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/locale/freelocale.c b/locale/freelocale.c
index 51f723ec40c62a0c00685857c64418b0a8012fd4..cd5289b4cb6f8a82a8730b3266f50b880aea63a4 100644 (file)
--- a/locale/freelocale.c
+++ b/locale/freelocale.c
@@ -19,7 +19,7 @@
 
 #include <locale.h>
 #include <stdlib.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 
 #include "localeinfo.h"
 

diff --git a/locale/newlocale.c b/locale/newlocale.c
index b495659e633fb2f6121174544c710880b291d673..f9134cd0eb8978ab93ef3149cf1a7245e23d6846 100644 (file)
--- a/locale/newlocale.c
+++ b/locale/newlocale.c
@@ -18,7 +18,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <argz.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <errno.h>
 #include <locale.h>
 #include <stdlib.h>

diff --git a/locale/setlocale.c b/locale/setlocale.c
index fa9cb3a1d64f212dad77fd51a3342eff77e571c5..ead030dc0948a7f1106800628318c383cd0338ba 100644 (file)
--- a/locale/setlocale.c
+++ b/locale/setlocale.c
@@ -18,7 +18,7 @@
 #include <alloca.h>
 #include <argz.h>
 #include <errno.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <locale.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/login/getutent_r.c b/login/getutent_r.c
index 876cc518b650c0d0678c4d6453af6a4ff308855e..b929402a2e971d9eb235c99b503ed803f645d422 100644 (file)
--- a/login/getutent_r.c
+++ b/login/getutent_r.c
@@ -17,7 +17,7 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <stdlib.h>
 #include <utmp.h>
 

diff --git a/login/getutid_r.c b/login/getutid_r.c
index 8eb555903cd49329cb81a8f7089bdc2061ffb4e5..42ddb4daea9a337342fd689c2d1dfbe800017d25 100644 (file)
--- a/login/getutid_r.c
+++ b/login/getutid_r.c
@@ -17,7 +17,7 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <utmp.h>

diff --git a/login/getutline_r.c b/login/getutline_r.c
index 55fc16fc57045912ea21ecaa4868cdce70a9e226..c51e18c9c78fe600b167e9e8c4d616046b2db44f 100644 (file)
--- a/login/getutline_r.c
+++ b/login/getutline_r.c
@@ -18,7 +18,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <utmp.h>
 
 #include "utmp-private.h"

diff --git a/login/utmp-private.h b/login/utmp-private.h
index ae2cdc1a4501ed024308364bfe3a339459172714..96356676aac89c3d5bfc96643c47b659f784031d 100644 (file)
--- a/login/utmp-private.h
+++ b/login/utmp-private.h
@@ -22,7 +22,7 @@
 #define _UTMP_PRIVATE_H        1
 
 #include <utmp.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 
 /* The structure describing the functions in a backend.  */
 struct utfuncs

diff --git a/login/utmpname.c b/login/utmpname.c
index b387edb1da0a84f7bc48858e445aa82d7827b6aa..ec5c2844cbcee7e318c283aec47decdaab0ee732 100644 (file)
--- a/login/utmpname.c
+++ b/login/utmpname.c
@@ -16,7 +16,7 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <stdlib.h>
 #include <string.h>
 #include <utmp.h>

diff --git a/malloc/mtrace.c b/malloc/mtrace.c
index df10128b872b4adc4086cf74e5d965c1c11d35d2..9c92c12f8b97410d0cdb19b82e5db010ab454dae 100644 (file)
--- a/malloc/mtrace.c
+++ b/malloc/mtrace.c
@@ -22,7 +22,7 @@
 # define _MALLOC_INTERNAL
 # include <malloc.h>
 # include <mcheck.h>
-# include <bits/libc-lock.h>
+# include <libc-lock.h>
 #endif
 
 #include <dlfcn.h>

diff --git a/misc/efgcvt.c b/misc/efgcvt.c
index 7c7939192bf7de7ee915cd17b973e60f2d85638b..05a4253ac2040b1c7d79fb610c15dfa802b16513 100644 (file)
--- a/misc/efgcvt.c
+++ b/misc/efgcvt.c
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include <sys/param.h>
 #include <float.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <math_ldbl_opt.h>
 
 #ifndef FLOAT_TYPE

diff --git a/misc/error.c b/misc/error.c
index aaa120d5abd716af134cf6bea514168ae17fe34d..aa3054d9ee5fb066df41b539d4653151bf95f764 100644 (file)
--- a/misc/error.c
+++ b/misc/error.c
@@ -85,7 +85,7 @@ extern void __error_at_line (int status, int errnum, const char *file_name,
 # undef putc
 # define putc(c, fp) _IO_putc (c, fp)
 
-# include <bits/libc-lock.h>
+# include <libc-lock.h>
 
 #else /* not _LIBC */
 

diff --git a/misc/fstab.c b/misc/fstab.c
index 2d2e93216e065a177cabe5591623996da76ad00f..97c62feb5deba90f1bf637ab355b67c74c8a73db 100644 (file)
--- a/misc/fstab.c
+++ b/misc/fstab.c
@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 
 #define BUFFER_SIZE 0x1fc0
 

diff --git a/misc/getpass.c b/misc/getpass.c
index dcaff3855c4e82c1e674c31ef0f811c9a1f4afd1..78fe8f2b53f525e1ecb5e92538864465f5920af1 100644 (file)
--- a/misc/getpass.c
+++ b/misc/getpass.c
@@ -24,7 +24,7 @@
 #include <wchar.h>
 #define flockfile(s) _IO_flockfile (s)
 #define funlockfile(s) _IO_funlockfile (s)
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 
 /* It is desirable to use this bit on systems that have it.
    The only bit of terminal state we want to twiddle is echoing, which is

diff --git a/misc/mntent.c b/misc/mntent.c
index 7dedc62387a602d42b6acdbb91739b44a6f87656..e372b9fa58e2bc147fe0fb6751ca2d2a843b5268 100644 (file)
--- a/misc/mntent.c
+++ b/misc/mntent.c
@@ -18,7 +18,7 @@
 
 #include <mntent.h>
 #include <stdlib.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 
 /* We don't want to allocate the static buffer all the time since it
    is not always used (in fact, rather infrequently).  Accept the

diff --git a/misc/syslog.c b/misc/syslog.c
index 9dd4cde18ce138b57d879102cfb726dc2a169e0a..034e2c86f3ff81b9a1bcfa39d17541b8f045f642 100644 (file)
--- a/misc/syslog.c
+++ b/misc/syslog.c
@@ -47,7 +47,7 @@ static char sccsid[] = "@(#)syslog.c  8.4 (Berkeley) 3/18/94";
 #include <time.h>
 #include <unistd.h>
 #include <stdlib.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <signal.h>
 #include <locale.h>
 

diff --git a/nis/nis_call.c b/nis/nis_call.c
index 970415b505663fceb14cf4cd6eeb198be88518ed..6bd4b411d5de54d93b41a3472aef995b5227498b 100644 (file)
--- a/nis/nis_call.c
+++ b/nis/nis_call.c
@@ -28,7 +28,7 @@
 #include <unistd.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 
 #include "nis_xdr.h"
 #include "nis_intern.h"

diff --git a/nis/nis_callback.c b/nis/nis_callback.c
index 602ce2ff2620c9d2defe94ca013e51208eae6f37..ef9db4b7b8297a050073ac2ee15343c00501625e 100644 (file)
--- a/nis/nis_callback.c
+++ b/nis/nis_callback.c
@@ -33,7 +33,7 @@
 #include <rpc/key_prot.h>
 #include <rpcsvc/nis.h>
 #include <rpcsvc/nis_callback.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 
 #include "nis_xdr.h"
 #include "nis_intern.h"

diff --git a/nis/nss-default.c b/nis/nss-default.c
index bffac5a13327ffcef04915dd2dace59abe7cfd44..cf9e28395a87cfde7ecaff81fe81eb875b336a80 100644 (file)
--- a/nis/nss-default.c
+++ b/nis/nss-default.c
@@ -21,7 +21,7 @@
 #include <stdio_ext.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 
 #include <libnsl.h>
 

diff --git a/nis/nss_compat/compat-grp.c b/nis/nss_compat/compat-grp.c
index d8ef4be63be421840f07a60da23d711cc3b2a004..dfd6e6aad8f53ff78fc4e70a39e7b46aa451c34b 100644 (file)
--- a/nis/nss_compat/compat-grp.c
+++ b/nis/nss_compat/compat-grp.c
@@ -25,7 +25,7 @@
 #include <stdio_ext.h>
 #include <string.h>
 #include <rpc/types.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <kernel-features.h>
 
 static service_user *ni;

diff --git a/nis/nss_compat/compat-initgroups.c b/nis/nss_compat/compat-initgroups.c
index eaff0f676cac3aa658f19d7b6dc19cb1f60d96a3..c7d273b03c42dca4acc0017c39095f94b0c87235 100644 (file)
--- a/nis/nss_compat/compat-initgroups.c
+++ b/nis/nss_compat/compat-initgroups.c
@@ -27,7 +27,7 @@
 #include <rpc/types.h>
 #include <sys/param.h>
 #include <nsswitch.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <kernel-features.h>
 #include <scratch_buffer.h>
 

diff --git a/nis/nss_compat/compat-pwd.c b/nis/nss_compat/compat-pwd.c
index 9b1d671d17a077e420aad88c8d381c8a246f27ab..82f86e22536f9569cb07ee1af4d770723d2bacf7 100644 (file)
--- a/nis/nss_compat/compat-pwd.c
+++ b/nis/nss_compat/compat-pwd.c
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <rpc/types.h>
 #include <rpcsvc/ypclnt.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <kernel-features.h>
 
 #include "netgroup.h"

diff --git a/nis/nss_compat/compat-spwd.c b/nis/nss_compat/compat-spwd.c
index 5e4bf78e4792d4d1987f5e9ec5e003099ca60f59..49032352a3ab0aa4de85546e3a73bcc364298615 100644 (file)
--- a/nis/nss_compat/compat-spwd.c
+++ b/nis/nss_compat/compat-spwd.c
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <rpc/types.h>
 #include <rpcsvc/ypclnt.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <kernel-features.h>
 
 #include "netgroup.h"

diff --git a/nis/nss_nis/nis-alias.c b/nis/nss_nis/nis-alias.c
index 4f2311818366218ede96b574808d64f02305253c..fe66e1317bfbaf7907364df067db69d8d30f87e8 100644 (file)
--- a/nis/nss_nis/nis-alias.c
+++ b/nis/nss_nis/nis-alias.c
@@ -21,7 +21,7 @@
 #include <errno.h>
 #include <string.h>
 #include <aliases.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <rpcsvc/yp.h>
 #include <rpcsvc/ypclnt.h>
 

diff --git a/nis/nss_nis/nis-ethers.c b/nis/nss_nis/nis-ethers.c
index 1c18d0f79db21c07d10ff44523bb9b7c8db914df..ec621e1d135e740d5a2fdd5fc767de98305bdd26 100644 (file)
--- a/nis/nss_nis/nis-ethers.c
+++ b/nis/nss_nis/nis-ethers.c
@@ -20,7 +20,7 @@
 #include <ctype.h>
 #include <errno.h>
 #include <string.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <rpcsvc/yp.h>
 #include <rpcsvc/ypclnt.h>
 #include <netinet/ether.h>

diff --git a/nis/nss_nis/nis-grp.c b/nis/nss_nis/nis-grp.c
index 19fe8cfc44e92549ba4e00694ecb0603ad07542c..ed0bf022911f040389f8d4b5274e01ea5c862ce6 100644 (file)
--- a/nis/nss_nis/nis-grp.c
+++ b/nis/nss_nis/nis-grp.c
@@ -21,7 +21,7 @@
 #include <grp.h>
 #include <nss.h>
 #include <string.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <rpcsvc/yp.h>
 #include <rpcsvc/ypclnt.h>
 

diff --git a/nis/nss_nis/nis-hosts.c b/nis/nss_nis/nis-hosts.c
index 6a9e8e8c3170334be06b882aa202194a951f3830..9cf2bc53a3786e881cee909ebc62ff8b88accf87 100644 (file)
--- a/nis/nss_nis/nis-hosts.c
+++ b/nis/nss_nis/nis-hosts.c
@@ -28,7 +28,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <resolv.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <rpcsvc/yp.h>
 #include <rpcsvc/ypclnt.h>
 

diff --git a/nis/nss_nis/nis-network.c b/nis/nss_nis/nis-network.c
index 2679f955e67ce0ddb8568a85168bfae9fc16b149..c5aea6a9794ef9a40219a1679f3d500cfa6350ca 100644 (file)
--- a/nis/nss_nis/nis-network.c
+++ b/nis/nss_nis/nis-network.c
@@ -28,7 +28,7 @@
 #include <string.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <rpcsvc/yp.h>
 #include <rpcsvc/ypclnt.h>
 

diff --git a/nis/nss_nis/nis-proto.c b/nis/nss_nis/nis-proto.c
index f525c6e34a1a426e35cbef860da6247b2636c76b..d80cea8cda70d2921abfa0472323996a624f9bae 100644 (file)
--- a/nis/nss_nis/nis-proto.c
+++ b/nis/nss_nis/nis-proto.c
@@ -21,7 +21,7 @@
 #include <ctype.h>
 #include <errno.h>
 #include <string.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <rpcsvc/yp.h>
 #include <rpcsvc/ypclnt.h>
 

diff --git a/nis/nss_nis/nis-pwd.c b/nis/nss_nis/nis-pwd.c
index 9c5d39c4501cabbfbb3e8ecd3c6f7f635ab2f079..63daada254fead911fcc9131834dbef915bca282 100644 (file)
--- a/nis/nss_nis/nis-pwd.c
+++ b/nis/nss_nis/nis-pwd.c
@@ -22,7 +22,7 @@
 #include <nss.h>
 #include <pwd.h>
 #include <string.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <rpcsvc/yp.h>
 #include <rpcsvc/ypclnt.h>
 

diff --git a/nis/nss_nis/nis-rpc.c b/nis/nss_nis/nis-rpc.c
index 28cf1333c7b3fa1fa08e9062ac4c0cf468fba3cd..24692f7b612e43a38072fd5494b9b2fb2585b353 100644 (file)
--- a/nis/nss_nis/nis-rpc.c
+++ b/nis/nss_nis/nis-rpc.c
@@ -21,7 +21,7 @@
 #include <ctype.h>
 #include <errno.h>
 #include <string.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <rpcsvc/yp.h>
 #include <rpcsvc/ypclnt.h>
 

diff --git a/nis/nss_nis/nis-service.c b/nis/nss_nis/nis-service.c
index 20925889773a568e215c36f65907d55474e604f5..7660ae0782a602d2b5cf0c187c2c1ee17f70fcb8 100644 (file)
--- a/nis/nss_nis/nis-service.c
+++ b/nis/nss_nis/nis-service.c
@@ -21,7 +21,7 @@
 #include <ctype.h>
 #include <errno.h>
 #include <string.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <rpcsvc/yp.h>
 #include <rpcsvc/ypclnt.h>
 

diff --git a/nis/nss_nis/nis-spwd.c b/nis/nss_nis/nis-spwd.c
index 7a70dbe543f4341a504ec1892c290e015eba5922..089edd7e6e27f9271a17f686e0e5690d37773189 100644 (file)
--- a/nis/nss_nis/nis-spwd.c
+++ b/nis/nss_nis/nis-spwd.c
@@ -25,7 +25,7 @@
 #define _nss_nis_endspent _nss_nis_endspent_XXX
 #include <shadow.h>
 #undef _nss_nis_endspent
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <rpcsvc/yp.h>
 #include <rpcsvc/ypclnt.h>
 

diff --git a/nis/nss_nisplus/nisplus-alias.c b/nis/nss_nisplus/nisplus-alias.c
index 4b9f2ffae1b21b4813611e52d186f549e92995e7..1871869e466e93a2e410c4ca19589be9f80f2f18 100644 (file)
--- a/nis/nss_nisplus/nisplus-alias.c
+++ b/nis/nss_nisplus/nisplus-alias.c
@@ -22,7 +22,7 @@
 #include <ctype.h>
 #include <string.h>
 #include <aliases.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <rpcsvc/nis.h>
 
 #include "nss-nisplus.h"

diff --git a/nis/nss_nisplus/nisplus-ethers.c b/nis/nss_nisplus/nisplus-ethers.c
index b874ea826880b936f3a6ab2b2183d2ff753b82a4..c2a1f531878451e240324dc2339875fb98586212 100644 (file)
--- a/nis/nss_nisplus/nisplus-ethers.c
+++ b/nis/nss_nisplus/nisplus-ethers.c
@@ -26,7 +26,7 @@
 #include <netinet/ether.h>
 #include <netinet/if_ether.h>
 #include <rpcsvc/nis.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 
 #include "nss-nisplus.h"
 

diff --git a/nis/nss_nisplus/nisplus-grp.c b/nis/nss_nisplus/nisplus-grp.c
index 49f9a3435575e105890b74fbd2027b7032763b10..5a370ec2df520ff57800c7e38c689efa175f6c9b 100644 (file)
--- a/nis/nss_nisplus/nisplus-grp.c
+++ b/nis/nss_nisplus/nisplus-grp.c
@@ -22,7 +22,7 @@
 #include <ctype.h>
 #include <errno.h>
 #include <string.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <rpcsvc/nis.h>
 
 #include "nss-nisplus.h"

diff --git a/nis/nss_nisplus/nisplus-hosts.c b/nis/nss_nisplus/nisplus-hosts.c
index d86e06d4bc8a0c3b86b6491bc27371dfaca6aa3d..98b30e28ab68d1c8fe0d23551bfa2bb9038d4d10 100644 (file)
--- a/nis/nss_nisplus/nisplus-hosts.c
+++ b/nis/nss_nisplus/nisplus-hosts.c
@@ -26,7 +26,7 @@
 #include <arpa/inet.h>
 #include <netinet/in.h>
 #include <rpcsvc/nis.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 
 #include "nss-nisplus.h"
 

diff --git a/nis/nss_nisplus/nisplus-initgroups.c b/nis/nss_nisplus/nisplus-initgroups.c
index 0fc9b7e358d8c43dd7e9935ad92a9329d16e50ad..d9634402065b1c8fb511fbe61105e99077090a72 100644 (file)
--- a/nis/nss_nisplus/nisplus-initgroups.c
+++ b/nis/nss_nisplus/nisplus-initgroups.c
@@ -21,7 +21,7 @@
 #include <ctype.h>
 #include <errno.h>
 #include <string.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <rpcsvc/nis.h>
 
 #include "nss-nisplus.h"

diff --git a/nis/nss_nisplus/nisplus-network.c b/nis/nss_nisplus/nisplus-network.c
index e3218cd683f79a54c09c7c3cd22fec35a74316a9..1635fb2b569d5f7b33bdc5faefef3108a0765316 100644 (file)
--- a/nis/nss_nisplus/nisplus-network.c
+++ b/nis/nss_nisplus/nisplus-network.c
@@ -25,7 +25,7 @@
 #include <string.h>
 #include <arpa/inet.h>
 #include <rpcsvc/nis.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 
 #include "nss-nisplus.h"
 

diff --git a/nis/nss_nisplus/nisplus-proto.c b/nis/nss_nisplus/nisplus-proto.c
index 85997cd15ef88d718e5edab417ed5387fe798132..ca07cdb7c05efe689e14237a2f2ab3b44ec5d889 100644 (file)
--- a/nis/nss_nisplus/nisplus-proto.c
+++ b/nis/nss_nisplus/nisplus-proto.c
@@ -23,7 +23,7 @@
 #include <nss.h>
 #include <string.h>
 #include <rpcsvc/nis.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 
 #include "nss-nisplus.h"
 

diff --git a/nis/nss_nisplus/nisplus-pwd.c b/nis/nss_nisplus/nisplus-pwd.c
index b8eaa10ffe3ec6fc56177ff226ceb1628c32d040..4ed491433457646bf0c5da02a554f0a7cf690a74 100644 (file)
--- a/nis/nss_nisplus/nisplus-pwd.c
+++ b/nis/nss_nisplus/nisplus-pwd.c
@@ -21,7 +21,7 @@
 #include <errno.h>
 #include <pwd.h>
 #include <string.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <rpcsvc/nis.h>
 
 #include "nss-nisplus.h"

diff --git a/nis/nss_nisplus/nisplus-rpc.c b/nis/nss_nisplus/nisplus-rpc.c
index 3273cf858af959f78df7668f6c8372c2f170f90c..67fc4cb45c5f3afbbf212ff94b7f58dcd72f56d2 100644 (file)
--- a/nis/nss_nisplus/nisplus-rpc.c
+++ b/nis/nss_nisplus/nisplus-rpc.c
@@ -23,7 +23,7 @@
 #include <string.h>
 #include <rpc/netdb.h>
 #include <rpcsvc/nis.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 
 #include "nss-nisplus.h"
 

diff --git a/nis/nss_nisplus/nisplus-service.c b/nis/nss_nisplus/nisplus-service.c
index 05055e57354c1eb32126cbfa85e14414cc4fd898..2baef0ed561b0b846930f6b7a3a3191da1e64162 100644 (file)
--- a/nis/nss_nisplus/nisplus-service.c
+++ b/nis/nss_nisplus/nisplus-service.c
@@ -23,7 +23,7 @@
 #include <nss.h>
 #include <string.h>
 #include <rpcsvc/nis.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 
 #include "nss-nisplus.h"
 

diff --git a/nis/nss_nisplus/nisplus-spwd.c b/nis/nss_nisplus/nisplus-spwd.c
index 91e539b5c0a370b7decd77dc71adcbc8e5f87403..e87a61f690a20a09728f74680b54d45e177c33f9 100644 (file)
--- a/nis/nss_nisplus/nisplus-spwd.c
+++ b/nis/nss_nisplus/nisplus-spwd.c
@@ -20,7 +20,7 @@
 #include <errno.h>
 #include <shadow.h>
 #include <string.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <rpcsvc/nis.h>
 
 #include "nss-nisplus.h"

diff --git a/nis/ypclnt.c b/nis/ypclnt.c
index de8c1ffbaa8308ed8ef7403e7c8af2801680bd82..3a738726b427f4e18e5085b4fc667c20c725d136 100644 (file)
--- a/nis/ypclnt.c
+++ b/nis/ypclnt.c
@@ -28,7 +28,7 @@
 #include <rpcsvc/ypupd.h>
 #include <sys/socket.h>
 #include <sys/uio.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 
 /* This should only be defined on systems with a BSD compatible ypbind */
 #ifndef BINDINGDIR

diff --git a/nptl/libc_pthread_init.c b/nptl/libc_pthread_init.c
index 18844ad72bda5f457adc2f7f34066411990a3a3e..d7f4eb0b898aadf804bcd51d6eae67cb0d7413f3 100644 (file)
--- a/nptl/libc_pthread_init.c
+++ b/nptl/libc_pthread_init.c
@@ -23,7 +23,7 @@
 #include <tls.h>
 #include <string.h>
 #include <pthreadP.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <sysdep.h>
 #include <ldsodefs.h>
 

diff --git a/nptl/tst-initializers1.c b/nptl/tst-initializers1.c
index 5119ebfcb51a9a779b10c87aa65956c0b8ada7ea..e8175f9e5323d6968de5113faf4244cf4600bce3 100644 (file)
--- a/nptl/tst-initializers1.c
+++ b/nptl/tst-initializers1.c
@@ -46,9 +46,9 @@ do_test (void)
   if (rwl_writer.__data.__flags
       != PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP)
     return 6;
-  /* <bits/libc-lock.h> __libc_rwlock_init definition for libc.so
+  /* <libc-lock.h> __libc_rwlock_init definition for libc.so
      relies on PTHREAD_RWLOCK_INITIALIZER being all zeros.  If
-     that ever changes, <bits/libc-lock.h> needs updating.  */
+     that ever changes, <libc-lock.h> needs updating.  */
   size_t i;
   for (i = 0; i < sizeof (rwl_normal); i++)
     if (((char *) &rwl_normal)[i] != '\0')

diff --git a/nss/getXXbyYY.c b/nss/getXXbyYY.c
index 15fecf84910694797afa4e0ccb300a79b072cbf0..181f45c1009fca43e518c477bc051bb4d138b793 100644 (file)
--- a/nss/getXXbyYY.c
+++ b/nss/getXXbyYY.c
@@ -17,7 +17,7 @@
 
 #include <assert.h>
 #include <errno.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <stdlib.h>
 #include <resolv.h>
 

diff --git a/nss/getXXent.c b/nss/getXXent.c
index e1c796da01ca0589391691a1417b2983e606f5a0..84bc071e4f9df8901e2b70fdc21ef8197357987d 100644 (file)
--- a/nss/getXXent.c
+++ b/nss/getXXent.c
@@ -16,7 +16,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <stdlib.h>
 
 #include "nsswitch.h"

diff --git a/nss/getXXent_r.c b/nss/getXXent_r.c
index 16334581c2dbad692f36987fce5eca669fdaaf7f..36fb5a059bf86c071d04c59a2cc78189a72f16ea 100644 (file)
--- a/nss/getXXent_r.c
+++ b/nss/getXXent_r.c
@@ -17,7 +17,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 
 #include "nsswitch.h"
 

diff --git a/nss/nss_db/db-XXX.c b/nss/nss_db/db-XXX.c
index 4a0766ab527569e42379b3882fe6953d8acb624a..314edc9431a3d4fda0f8c1392680e60ba8a73f44 100644 (file)
--- a/nss/nss_db/db-XXX.c
+++ b/nss/nss_db/db-XXX.c
@@ -20,7 +20,7 @@
 #include <fcntl.h>
 #include <stdint.h>
 #include <sys/mman.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include "nsswitch.h"
 #include "nss_db.h"
 

diff --git a/nss/nss_db/db-netgrp.c b/nss/nss_db/db-netgrp.c
index 94d6adac68adc2dfc1954e9c6ae17550eb7cfec8..6ee13d7d6686e6741d8255db19d01475305817ed 100644 (file)
--- a/nss/nss_db/db-netgrp.c
+++ b/nss/nss_db/db-netgrp.c
@@ -24,7 +24,7 @@
 #include <netgroup.h>
 #include <string.h>
 #include <stdint.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <paths.h>
 #include <stdlib.h>
 

diff --git a/nss/nss_db/nss_db.h b/nss/nss_db/nss_db.h
index 4af2229ac15b63a93289112fa1a6620c787414e5..8e45685a1988464ef8a7561196525d5595b2e913 100644 (file)
--- a/nss/nss_db/nss_db.h
+++ b/nss/nss_db/nss_db.h
@@ -21,7 +21,7 @@
 
 #include <nss.h>
 #include <stdint.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 
 
 /* String table index type.  */

diff --git a/nss/nss_files/files-XXX.c b/nss/nss_files/files-XXX.c
index f002f431e58af686a4afe1f07e98cb2008b09f17..cca4322c93eabe8853c7dbaaaeac9aabc5df7583 100644 (file)
--- a/nss/nss_files/files-XXX.c
+++ b/nss/nss_files/files-XXX.c
@@ -20,7 +20,7 @@
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include "nsswitch.h"
 
 #include <kernel-features.h>

diff --git a/nss/nss_files/files-alias.c b/nss/nss_files/files-alias.c
index 071c01d158984b2b6ba705ed92a5e1eb2f61c135..c883ebe9ecd5e9c6428be4e53e87629154e1d9fa 100644 (file)
--- a/nss/nss_files/files-alias.c
+++ b/nss/nss_files/files-alias.c
@@ -21,7 +21,7 @@
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>

diff --git a/nss/nsswitch.c b/nss/nsswitch.c
index 9712623157b260e0e7243d2b7507875bcca897b9..faf9d1a0d5680aa79e88b2dfeea18da371c336fb 100644 (file)
--- a/nss/nsswitch.c
+++ b/nss/nsswitch.c
@@ -20,7 +20,7 @@
 #include <dlfcn.h>
 #include <errno.h>
 #include <netdb.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <search.h>
 #include <stdio.h>
 #include <stdio_ext.h>

diff --git a/posix/regex_internal.h b/posix/regex_internal.h
index 154e96999dd7f788adbdd192bf12608d7bd3509a..1e155e350db37e2337426e2c78929e0b5a0b5701 100644 (file)
--- a/posix/regex_internal.h
+++ b/posix/regex_internal.h
@@ -45,7 +45,7 @@
 # include <stdint.h>
 #endif /* HAVE_STDINT_H || _LIBC */
 #if defined _LIBC
-# include <bits/libc-lock.h>
+# include <libc-lock.h>
 #else
 # define __libc_lock_define(CLASS,NAME)
 # define __libc_lock_init(NAME) do { } while (0)

diff --git a/posix/wordexp.c b/posix/wordexp.c
index e711d4335521fbb24076386d39862f0842c1a502..49ab71d6c28b9ef8e7c27fbad722e515d43c8f04 100644 (file)
--- a/posix/wordexp.c
+++ b/posix/wordexp.c
@@ -42,7 +42,7 @@
 #include <wordexp.h>
 #include <kernel-features.h>
 
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <_itoa.h>
 
 /* Undefine the following line for the production version.  */

diff --git a/pwd/fgetpwent.c b/pwd/fgetpwent.c
index d869ee25b1c2290df0e2c46497f5066a0bf8f26f..009cb1271485f2e0caf3f177a642f2ea5397c66a 100644 (file)
--- a/pwd/fgetpwent.c
+++ b/pwd/fgetpwent.c
@@ -16,7 +16,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <pwd.h>
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/resolv/res_hconf.c b/resolv/res_hconf.c
index 0d4f3f45bc9f7845c61d919cc8bc8bf90de6a9e2..692d948308441cce5a97292588393431d600d342 100644 (file)
--- a/resolv/res_hconf.c
+++ b/resolv/res_hconf.c
@@ -41,7 +41,7 @@
 #include <sys/ioctl.h>
 #include <unistd.h>
 #include <netinet/in.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include "ifreq.h"
 #include "res_hconf.h"
 #include <wchar.h>

diff --git a/resolv/res_libc.c b/resolv/res_libc.c
index ee3fa2114b7051b86f6f9676f1151d1435dedb9d..a8394e0e7bc73dcf4cc4fb8973ef8c6c64303a2a 100644 (file)
--- a/resolv/res_libc.c
+++ b/resolv/res_libc.c
@@ -21,7 +21,7 @@
 #include <netinet/in.h>
 #include <arpa/nameser.h>
 #include <resolv.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 
 
 /* The following bit is copied from res_data.c (where it is #ifdef'ed

diff --git a/shadow/fgetspent.c b/shadow/fgetspent.c
index 38977ea85341f340948846792d7a18220e7c85c1..b4390249095bc6e1ecb2d0f5bc0b1445f570fd47 100644 (file)
--- a/shadow/fgetspent.c
+++ b/shadow/fgetspent.c
@@ -16,7 +16,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <shadow.h>
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/shadow/lckpwdf.c b/shadow/lckpwdf.c
index e435471564a4a9c636811765e1c8e81c2440a371..90d48bd100d87a05d5eced67579be826df3ed4b2 100644 (file)
--- a/shadow/lckpwdf.c
+++ b/shadow/lckpwdf.c
@@ -18,7 +18,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <fcntl.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <shadow.h>
 #include <signal.h>
 #include <string.h>

diff --git a/shadow/sgetspent.c b/shadow/sgetspent.c
index f16ff19a59cde74ef918fa81d3935ccf6d0fbaf7..762dcb595933e947ae285179ed5f61c2a4b46a4f 100644 (file)
--- a/shadow/sgetspent.c
+++ b/shadow/sgetspent.c
@@ -16,7 +16,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <shadow.h>
 #include <stdlib.h>
 

diff --git a/socket/opensock.c b/socket/opensock.c
index 31f247eb40eef046043bfda20dbadeec967101d5..dddba8e82f4ebb96318d81d1a34d2df4b8b03740 100644 (file)
--- a/socket/opensock.c
+++ b/socket/opensock.c
@@ -17,7 +17,7 @@
 
 #include <stdio.h>
 #include <sys/socket.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 
 /* Return a socket of any type.  The socket can be used in subsequent
    ioctl calls to talk to the kernel.  */

diff --git a/stdio-common/reg-modifier.c b/stdio-common/reg-modifier.c
index 0bb04b3b4b3d413ae35410b1af8e8597283bfcc9..039023921b5e65622a2a60e75921eabeca6f1b5f 100644 (file)
--- a/stdio-common/reg-modifier.c
+++ b/stdio-common/reg-modifier.c
@@ -20,7 +20,7 @@
 #include <printf.h>
 #include <stdlib.h>
 #include <wchar.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 
 
 struct printf_modifier_record

diff --git a/stdio-common/reg-printf.c b/stdio-common/reg-printf.c
index b7226f4d9c7cc5bd80851c6b7a4bf5373f23d1d8..ed326e2c3b052031a9ddf2761cebbe596e52b040 100644 (file)
--- a/stdio-common/reg-printf.c
+++ b/stdio-common/reg-printf.c
@@ -20,7 +20,7 @@
 #include <printf.h>
 #include <stddef.h>
 #include <stdlib.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 
 
 /* Array of functions indexed by format character.  */

diff --git a/stdio-common/reg-type.c b/stdio-common/reg-type.c
index d02b5a2e75811232e42f9adf0429d9de56382403..65c17053720d5e49fec172cc7233c63da0530755 100644 (file)
--- a/stdio-common/reg-type.c
+++ b/stdio-common/reg-type.c
@@ -18,7 +18,7 @@
 #include <errno.h>
 #include <printf.h>
 #include <stdlib.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 
 
 /* Array of functions indexed by format character.  */

diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c
index 0592e706037a8d205e6a006cb70862f702bfb6d6..4b1bb8feb5ecfebac308b07c0fbe6a91baa904b5 100644 (file)
--- a/stdio-common/vfprintf.c
+++ b/stdio-common/vfprintf.c
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <errno.h>
 #include <wchar.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <sys/param.h>
 #include <_itoa.h>
 #include <locale/localeinfo.h>

diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c
index 0e204e7b326d848716222f40b5b82b8256ed1b77..9d9ff2094c2f3c3b2901606ce7b38a37ed2b5e85 100644 (file)
--- a/stdio-common/vfscanf.c
+++ b/stdio-common/vfscanf.c
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <wchar.h>
 #include <wctype.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <locale/localeinfo.h>
 
 #ifdef __GNUC__

diff --git a/stdlib/abort.c b/stdlib/abort.c
index ffde8145dbeaf3a289a75f73f806fdfafa8bb633..3b4bdba3f29c67b3c459bf75968ab5b0b96b2532 100644 (file)
--- a/stdlib/abort.c
+++ b/stdlib/abort.c
@@ -15,7 +15,7 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/stdlib/cxa_atexit.c b/stdlib/cxa_atexit.c
index 6e38c64fbe11283b593ff5eb0d334002cafc1aab..c2937628b176a784cc9d682fade599ab42da906c 100644 (file)
--- a/stdlib/cxa_atexit.c
+++ b/stdlib/cxa_atexit.c
@@ -19,7 +19,7 @@
 #include <stdlib.h>
 #include <stdint.h>
 
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include "exit.h"
 #include <atomic.h>
 #include <sysdep.h>

diff --git a/stdlib/fmtmsg.c b/stdlib/fmtmsg.c
index b8133dca4d359586392c917f48cc8960ff3d2518..a7abcbba8c2505ed59600393d40997ce32439aa7 100644 (file)
--- a/stdlib/fmtmsg.c
+++ b/stdlib/fmtmsg.c
@@ -17,7 +17,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <fmtmsg.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>

diff --git a/stdlib/random.c b/stdlib/random.c
index 7c033df9aa5d62be3a7bd6f2d1ac43cf9f4478c4..0c9e02e3b7cc5b4f27b43655de79a737d427d16f 100644 (file)
--- a/stdlib/random.c
+++ b/stdlib/random.c
@@ -50,7 +50,7 @@
    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
    SUCH DAMAGE.*/
 
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <limits.h>
 #include <stddef.h>
 #include <stdlib.h>

diff --git a/stdlib/setenv.c b/stdlib/setenv.c
index b9e0ba808df053444cbaac645bee72677e8e6000..dad7e71620ec09bc29b3f7307450b03967d769d5 100644 (file)
--- a/stdlib/setenv.c
+++ b/stdlib/setenv.c
@@ -57,7 +57,7 @@ extern char **environ;
 
 #if _LIBC
 /* This lock protects against simultaneous modifications of `environ'.  */
-# include <bits/libc-lock.h>
+# include <libc-lock.h>
 __libc_lock_define_initialized (static, envlock)
 # define LOCK  __libc_lock_lock (envlock)
 # define UNLOCK        __libc_lock_unlock (envlock)

diff --git a/string/strsignal.c b/string/strsignal.c
index 01c01e2dc7f8651995f3f45292ecfaca19866627..1b0d164c7eb04d8238ebf5954348af810bf08a33 100644 (file)
--- a/string/strsignal.c
+++ b/string/strsignal.c
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <libintl.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 
 static __libc_key_t key;
 

diff --git a/sunrpc/auth_none.c b/sunrpc/auth_none.c
index 3af5966794ef5bb254e16ad8624cfe3d932a86ee..3f8d52bafbf5caff1729c9197705e724b5158426 100644 (file)
--- a/sunrpc/auth_none.c
+++ b/sunrpc/auth_none.c
@@ -35,7 +35,7 @@
  */
 
 #include <rpc/rpc.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 
 #define MAX_MARSHAL_SIZE 20
 

diff --git a/sunrpc/bindrsvprt.c b/sunrpc/bindrsvprt.c
index e6a1b0b0b35e301b3cbe5a68edcc536b0105d05a..13bcb27d4d5fdf26de7e95c3d4d4023b3af3d270 100644 (file)
--- a/sunrpc/bindrsvprt.c
+++ b/sunrpc/bindrsvprt.c
@@ -35,7 +35,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 
 /*
  * Locks the static variables in this file.

diff --git a/sunrpc/create_xid.c b/sunrpc/create_xid.c
index 65182eec8848fa90a9123a1fc0aa4660112234fb..2f784824dac0196b291606acd5e06254a33a2206 100644 (file)
--- a/sunrpc/create_xid.c
+++ b/sunrpc/create_xid.c
@@ -19,7 +19,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <sys/time.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <rpc/rpc.h>
 
 /* The RPC code is not threadsafe, but new code should be threadsafe. */

diff --git a/sunrpc/key_call.c b/sunrpc/key_call.c
index e0a076b47f72d8e6110d6211a9349cc3fb4aafc8..7ecf6fbaa1d969b3602c7c2f54cfc1f1754ae9ca 100644 (file)
--- a/sunrpc/key_call.c
+++ b/sunrpc/key_call.c
@@ -48,7 +48,7 @@
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <rpc/key_prot.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 
 #define KEY_TIMEOUT    5       /* per-try timeout in seconds */
 #define KEY_NRETRY     12      /* number of retries */

diff --git a/sunrpc/rpc_thread.c b/sunrpc/rpc_thread.c
index 5910ea7710b85dbbdb9cd0184ae9cfe459bb9493..2b93db40fc6cc48b8036be795987c5c03570dda8 100644 (file)
--- a/sunrpc/rpc_thread.c
+++ b/sunrpc/rpc_thread.c
@@ -1,9 +1,9 @@
 #include <stdio.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <rpc/rpc.h>
 #include <assert.h>
 
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <libc-tsd.h>
 
 #ifdef _RPC_THREAD_SAFE_

diff --git a/sysdeps/arm/backtrace.c b/sysdeps/arm/backtrace.c
index 5a30c209ffe765ac53444e7943cf0bd187ee6220..b19def6e0b6d0e80af9892b52b6dcc8902bab4fa 100644 (file)
--- a/sysdeps/arm/backtrace.c
+++ b/sysdeps/arm/backtrace.c
@@ -17,7 +17,7 @@
    License along with the GNU C Library.  If not, see
    <http://www.gnu.org/licenses/>.  */
 
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <dlfcn.h>
 #include <execinfo.h>
 #include <stdlib.h>

diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h
index 7a0fe8dbe40f85cd682e698ba8401954275dbd11..7f7ff72f889066dbfd1d8541ac825bb315f8b74a 100644 (file)
--- a/sysdeps/generic/ldsodefs.h
+++ b/sysdeps/generic/ldsodefs.h
@@ -35,7 +35,7 @@
 #include <link.h>
 #include <dl-lookupcfg.h>
 #include <dl-sysdep.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <hp-timing.h>
 #include <tls.h>
 

diff --git a/bits/libc-lock.h b/sysdeps/generic/libc-lock.h
similarity index 98%
rename from bits/libc-lock.h
rename to sysdeps/generic/libc-lock.h
index 4e7636b082ddc8545c22b96be6d52c98118062b7..f05f88878a71a152f91cfe21e233237e034e2f41 100644 (file)
--- a/bits/libc-lock.h
+++ b/sysdeps/generic/libc-lock.h
@@ -16,8 +16,8 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#ifndef _BITS_LIBC_LOCK_H
-#define _BITS_LIBC_LOCK_H 1
+#ifndef _LIBC_LOCK_H
+#define _LIBC_LOCK_H 1
 
 
 /* Define a lock variable NAME with storage class CLASS.  The lock must be
@@ -137,4 +137,4 @@ typedef int __libc_key_t;
 /* Get thread-specific data associated with KEY.  */
 #define __libc_getspecific(KEY)                ((void) (KEY), (void *) 0)
 
-#endif /* bits/libc-lock.h */
+#endif /* libc-lock.h */

diff --git a/sysdeps/generic/stdio-lock.h b/sysdeps/generic/stdio-lock.h
index 620e207f80511fa51c2c2e3df1888aa48f28cc63..38f93efce9cd2f41d18c1aec00b3e203793b591d 100644 (file)
--- a/sysdeps/generic/stdio-lock.h
+++ b/sysdeps/generic/stdio-lock.h
@@ -19,7 +19,7 @@
 #ifndef _STDIO_LOCK_H
 #define _STDIO_LOCK_H 1
 
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 
 __libc_lock_define_recursive (typedef, _IO_lock_t)
 

diff --git a/sysdeps/generic/unwind-dw2-fde.c b/sysdeps/generic/unwind-dw2-fde.c
index 1da37ab50829a6ec1c6369f7bada06b51b301a79..6db9aeaffcfdfa9096891bdd45f01bb6a8dd12f7 100644 (file)
--- a/sysdeps/generic/unwind-dw2-fde.c
+++ b/sysdeps/generic/unwind-dw2-fde.c
@@ -27,7 +27,7 @@
 #ifdef _LIBC
 #include <stdlib.h>
 #include <string.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <dwarf2.h>
 #include <unwind.h>
 #define NO_BASE_OF_ENCODED_VALUE

diff --git a/sysdeps/i386/backtrace.c b/sysdeps/i386/backtrace.c
index f10ed566dc20acab6931449e521d0235d6a84404..a1b4d333220d4e589a5a92ee247593c733b9e1cb 100644 (file)
--- a/sysdeps/i386/backtrace.c
+++ b/sysdeps/i386/backtrace.c
@@ -17,7 +17,7 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <dlfcn.h>
 #include <execinfo.h>
 #include <stdlib.h>

diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-compat.c b/sysdeps/ieee754/ldbl-opt/nldbl-compat.c
index 0198886758d16454f89ba786892dc650e9228d47..0f0e20bf1178368c59eec1cd44c89b4fdcefcca4 100644 (file)
--- a/sysdeps/ieee754/ldbl-opt/nldbl-compat.c
+++ b/sysdeps/ieee754/ldbl-opt/nldbl-compat.c
@@ -25,7 +25,7 @@
 #include <monetary.h>
 #include <locale/localeinfo.h>
 #include <sys/syslog.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 
 #include "nldbl-compat.h"
 

diff --git a/sysdeps/m68k/backtrace.c b/sysdeps/m68k/backtrace.c
index ca7d25929efee98e507ca2d6b54052d2a361e8d2..982b4b82dfd49760e53473e97396c3d456d5477d 100644 (file)
--- a/sysdeps/m68k/backtrace.c
+++ b/sysdeps/m68k/backtrace.c
@@ -16,7 +16,7 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <dlfcn.h>
 #include <execinfo.h>
 #include <stdlib.h>

diff --git a/sysdeps/mach/hurd/cthreads.c b/sysdeps/mach/hurd/cthreads.c
index e213819a5a9c40d486e060b7601d9bdce574b823..695a243395f7ce8da34291ea91ae633b86415610 100644 (file)
--- a/sysdeps/mach/hurd/cthreads.c
+++ b/sysdeps/mach/hurd/cthreads.c
@@ -15,7 +15,7 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <errno.h>
 #include <stdlib.h>
 

diff --git a/sysdeps/mach/hurd/dirstream.h b/sysdeps/mach/hurd/dirstream.h
index 7edd23afd09feb91acb39618f1c6d348f828c9a7..81220ad076220a9e6b7734ebdf7b275fd074cfac 100644 (file)
--- a/sysdeps/mach/hurd/dirstream.h
+++ b/sysdeps/mach/hurd/dirstream.h
@@ -19,7 +19,7 @@
 
 #define        _DIRSTREAM_H    1
 
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 
 /* Directory stream type.
 

diff --git a/sysdeps/mach/hurd/bits/libc-lock.h b/sysdeps/mach/hurd/libc-lock.h
similarity index 98%
rename from sysdeps/mach/hurd/bits/libc-lock.h
rename to sysdeps/mach/hurd/libc-lock.h
index 63d3e8179a67a25d60fcfc7d737660246ff1d6d3..b67a049bca6c1d2fe5e5ea3ffc2140101a704d0f 100644 (file)
--- a/sysdeps/mach/hurd/bits/libc-lock.h
+++ b/sysdeps/mach/hurd/libc-lock.h
@@ -16,8 +16,8 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#ifndef _BITS_LIBC_LOCK_H
-#define _BITS_LIBC_LOCK_H 1
+#ifndef _LIBC_LOCK_H
+#define _LIBC_LOCK_H 1
 
 #if (_LIBC - 0) || (_CTHREADS_ - 0)
 #include <cthreads.h>
@@ -206,7 +206,7 @@ void *__libc_getspecific (__libc_key_t key);
 /* Hide the definitions which are only supposed to be used inside libc in
    a separate file.  This file is not present in the installation!  */
 #ifdef _LIBC
-# include <bits/libc-lockP.h>
+# include <libc-lockP.h>
 #endif
 
-#endif /* bits/libc-lock.h */
+#endif /* libc-lock.h */

diff --git a/sysdeps/mach/hurd/malloc-machine.h b/sysdeps/mach/hurd/malloc-machine.h
index ba8b60dee86fbb0434a76036e073d2b69a092135..1fdbd3de935d3c0d6c0e5fbda5c56129ea87d241 100644 (file)
--- a/sysdeps/mach/hurd/malloc-machine.h
+++ b/sysdeps/mach/hurd/malloc-machine.h
@@ -23,7 +23,7 @@
 #undef thread_atfork_static
 
 #include <atomic.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 
 /* Assume hurd, with cthreads */
 

diff --git a/sysdeps/mach/bits/libc-lock.h b/sysdeps/mach/libc-lock.h
similarity index 98%
rename from sysdeps/mach/bits/libc-lock.h
rename to sysdeps/mach/libc-lock.h
index 9fad433c86f86929ba07ee2380cf500f34c7f33a..e1fc4596cd8f1866c339de7dcc540a08b330f6ac 100644 (file)
--- a/sysdeps/mach/bits/libc-lock.h
+++ b/sysdeps/mach/libc-lock.h
@@ -16,8 +16,8 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#ifndef _BITS_LIBC_LOCK_H
-#define _BITS_LIBC_LOCK_H 1
+#ifndef _LIBC_LOCK_H
+#define _LIBC_LOCK_H 1
 
 #ifdef _LIBC
 #include <cthreads.h>
@@ -142,4 +142,4 @@ void *__libc_getspecific (__libc_key_t key);
 #define __rtld_lock_unlock_recursive __libc_lock_unlock
 #define __rtld_lock_lock_recursive __libc_lock_lock
 
-#endif /* bits/libc-lock.h */
+#endif /* libc-lock.h */

diff --git a/sysdeps/nptl/bits/libc-lock.h b/sysdeps/nptl/libc-lock.h
similarity index 98%
rename from sysdeps/nptl/bits/libc-lock.h
rename to sysdeps/nptl/libc-lock.h
index 5599cf1734bd0a34f6cbb7cbcac4176e12c50146..4db5f1b41dc1a09f19ef1433a3e04fab9e3c3764 100644 (file)
--- a/sysdeps/nptl/bits/libc-lock.h
+++ b/sysdeps/nptl/libc-lock.h
@@ -16,8 +16,8 @@
    License along with the GNU C Library; see the file COPYING.LIB.  If
    not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef _BITS_LIBC_LOCK_H
-#define _BITS_LIBC_LOCK_H 1
+#ifndef _LIBC_LOCK_H
+#define _LIBC_LOCK_H 1
 
 #include <pthread.h>
 #define __need_NULL
@@ -184,4 +184,4 @@ extern void _pthread_cleanup_pop_restore (struct _pthread_cleanup_buffer *buffer
 # include "libc-lockP.h"
 #endif
 
-#endif /* bits/libc-lock.h */
+#endif /* libc-lock.h */

diff --git a/sysdeps/nptl/bits/libc-lockP.h b/sysdeps/nptl/libc-lockP.h
similarity index 99%
rename from sysdeps/nptl/bits/libc-lockP.h
rename to sysdeps/nptl/libc-lockP.h
index f55f6212ec8dbc64b14b6bbecacbb3a2486246f9..a64daca008596ef95385877a8e0cfab65ee13748 100644 (file)
--- a/sysdeps/nptl/bits/libc-lockP.h
+++ b/sysdeps/nptl/libc-lockP.h
@@ -16,8 +16,8 @@
    License along with the GNU C Library; see the file COPYING.LIB.  If
    not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef _BITS_LIBC_LOCKP_H
-#define _BITS_LIBC_LOCKP_H 1
+#ifndef _LIBC_LOCKP_H
+#define _LIBC_LOCKP_H 1
 
 #include <pthread.h>
 #define __need_NULL
@@ -433,4 +433,4 @@ weak_extern (pthread_setcancelstate)
 # endif
 #endif
 
-#endif /* bits/libc-lockP.h */
+#endif /* libc-lockP.h */

diff --git a/sysdeps/nptl/malloc-machine.h b/sysdeps/nptl/malloc-machine.h
index a3d10892bfcc52dd8b3ef4b62811e881f3f2e504..c0ec49ee5661a06e1449932a5d92fccd967d7ac0 100644 (file)
--- a/sysdeps/nptl/malloc-machine.h
+++ b/sysdeps/nptl/malloc-machine.h
@@ -23,7 +23,7 @@
 #undef thread_atfork_static
 
 #include <atomic.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 
 __libc_lock_define (typedef, mutex_t)
 

diff --git a/sysdeps/nptl/stdio-lock.h b/sysdeps/nptl/stdio-lock.h
index 9406eaa0453c1eadb05ed8e9d266c07084e3e997..51d123a1fc7418affc17cf1e550d529de1c08d04 100644 (file)
--- a/sysdeps/nptl/stdio-lock.h
+++ b/sysdeps/nptl/stdio-lock.h
@@ -19,7 +19,7 @@
 #ifndef _STDIO_LOCK_H
 #define _STDIO_LOCK_H 1
 
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <lowlevellock.h>
 
 

diff --git a/sysdeps/posix/dirstream.h b/sysdeps/posix/dirstream.h
index c7e1a5af5c79816f63cb7b6de411d06749c53d57..70cc77dd9c6c2d458a614afe7e18541282b8a2e6 100644 (file)
--- a/sysdeps/posix/dirstream.h
+++ b/sysdeps/posix/dirstream.h
@@ -20,7 +20,7 @@
 
 #include <sys/types.h>
 
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 
 /* Directory stream type.
 

diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
index 31bb7e66dcbe1868b8e5e34185e048fe5bde15ab..1ef3f20d987bb14e9b6d22e9092304f858298c23 100644 (file)
--- a/sysdeps/posix/getaddrinfo.c
+++ b/sysdeps/posix/getaddrinfo.c
@@ -58,7 +58,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <sys/utsname.h>
 #include <unistd.h>
 #include <nsswitch.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <not-cancel.h>
 #include <nscd/nscd-client.h>
 #include <nscd/nscd_proto.h>

diff --git a/sysdeps/posix/system.c b/sysdeps/posix/system.c
index 95b91abec419bf76699d3715b8c08aaa662d34f1..84401a07d4ec2a9184711c0f323c7cda9b5e9f9c 100644 (file)
--- a/sysdeps/posix/system.c
+++ b/sysdeps/posix/system.c
@@ -22,7 +22,7 @@
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/wait.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <sysdep-cancel.h>
 
 

diff --git a/sysdeps/pthread/aio_suspend.c b/sysdeps/pthread/aio_suspend.c
index 641eafb1bd9f234dd5e72952d2804362dcb270d4..bfca6627f164faa0ff3cce125d48aa5bb16f86e7 100644 (file)
--- a/sysdeps/pthread/aio_suspend.c
+++ b/sysdeps/pthread/aio_suspend.c
@@ -34,7 +34,7 @@
 #include <stdlib.h>
 #include <sys/time.h>
 
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <aio_misc.h>
 
 

diff --git a/sysdeps/s390/s390-32/backtrace.c b/sysdeps/s390/s390-32/backtrace.c
index 4e5e1feee699f48a00fefe41f4aa7b575299cc25..5b5738cae74d7855a1b946dbdfb9010edea7682d 100644 (file)
--- a/sysdeps/s390/s390-32/backtrace.c
+++ b/sysdeps/s390/s390-32/backtrace.c
@@ -17,7 +17,7 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <dlfcn.h>
 #include <execinfo.h>
 #include <stddef.h>

diff --git a/sysdeps/s390/s390-64/backtrace.c b/sysdeps/s390/s390-64/backtrace.c
index 184a73741b08219c131d1747a9239ba3a8bdfd3c..e4d7efe2a38feed283a7f03b615b8b288fdfe95a 100644 (file)
--- a/sysdeps/s390/s390-64/backtrace.c
+++ b/sysdeps/s390/s390-64/backtrace.c
@@ -17,7 +17,7 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <dlfcn.h>
 #include <execinfo.h>
 #include <stddef.h>

diff --git a/sysdeps/unix/sysv/linux/check_pf.c b/sysdeps/unix/sysv/linux/check_pf.c
index 162606d7ab95a0bec30e1744d0e55f401e41838b..f072fb3de7ad18de0fef69264267aa4933d68055 100644 (file)
--- a/sysdeps/unix/sysv/linux/check_pf.c
+++ b/sysdeps/unix/sysv/linux/check_pf.c
@@ -32,7 +32,7 @@
 #include <linux/rtnetlink.h>
 
 #include <not-cancel.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <atomic.h>
 #include <nscd/nscd-client.h>
 

diff --git a/sysdeps/unix/sysv/linux/if_index.c b/sysdeps/unix/sysv/linux/if_index.c
index 04bf54e5ad9430fb4f57c39abe747457acfdc12b..8ee55d9450708708c05d87565b89075a2a22dd99 100644 (file)
--- a/sysdeps/unix/sysv/linux/if_index.c
+++ b/sysdeps/unix/sysv/linux/if_index.c
@@ -24,7 +24,7 @@
 #include <net/if.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <not-cancel.h>
 
 #include "netlinkaccess.h"

diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/getutent_r.c b/sysdeps/unix/sysv/linux/s390/s390-32/getutent_r.c
index c00583ed0b676e107e2ecd35e64f64fe0eddc75a..70b2a2d95200abcc6ba4daaed00c7c45f573f323 100644 (file)
--- a/sysdeps/unix/sysv/linux/s390/s390-32/getutent_r.c
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/getutent_r.c
@@ -16,7 +16,7 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <stdlib.h>
 #include <utmp.h>
 

diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/getutid_r.c b/sysdeps/unix/sysv/linux/s390/s390-32/getutid_r.c
index 20f09cdef268d29101c96c6526b106a6853bf28b..c8da99cea93c4f80eb9db2f3ac9bcc159ead59f4 100644 (file)
--- a/sysdeps/unix/sysv/linux/s390/s390-32/getutid_r.c
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/getutid_r.c
@@ -16,7 +16,7 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <utmp.h>

diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/getutline_r.c b/sysdeps/unix/sysv/linux/s390/s390-32/getutline_r.c
index e9b215e5e5c9fe232294331a170b41269741d2a5..c640239d207b305450ca38b1adf491a4ec5f1ac4 100644 (file)
--- a/sysdeps/unix/sysv/linux/s390/s390-32/getutline_r.c
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/getutline_r.c
@@ -17,7 +17,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <utmp.h>
 
 #include "utmp-compat.h"

diff --git a/sysdeps/unix/sysv/linux/shm-directory.c b/sysdeps/unix/sysv/linux/shm-directory.c
index c1ef38a9ea2b571d79d41e76a5c18894de6f847b..9c32051979aad2a2241a40f42360ddb716a45c63 100644 (file)
--- a/sysdeps/unix/sysv/linux/shm-directory.c
+++ b/sysdeps/unix/sysv/linux/shm-directory.c
@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <sys/statfs.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include "linux_fsinfo.h"
 
 

diff --git a/sysdeps/unix/sysv/linux/system.c b/sysdeps/unix/sysv/linux/system.c
index 12d6d191d8af70c83f5b4f3e3c224e08397cd877..73833e6e1311cd4d8985f34b1f323f7850273a62 100644 (file)
--- a/sysdeps/unix/sysv/linux/system.c
+++ b/sysdeps/unix/sysv/linux/system.c
@@ -21,7 +21,7 @@
 #include <sysdep.h>
 #include <unistd.h>
 #include <sys/wait.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 
 /* We have to and actually can handle cancelable system().  The big
    problem: we have to kill the child process if necessary.  To do

diff --git a/sysdeps/x86_64/backtrace.c b/sysdeps/x86_64/backtrace.c
index 21448c8f1cfda3fae564b3f2967e36e76fc6938e..04a4e82436844fefaafceaa7ab5f496b734bf26c 100644 (file)
--- a/sysdeps/x86_64/backtrace.c
+++ b/sysdeps/x86_64/backtrace.c
@@ -17,7 +17,7 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <dlfcn.h>
 #include <execinfo.h>
 #include <stdlib.h>

diff --git a/time/alt_digit.c b/time/alt_digit.c
index 81fb77b9cf6cb480f44a5417228cdccdf4d76fde..bbd1ee4ccb29ea57dc3a18ae72973e2c32b2bdf9 100644 (file)
--- a/time/alt_digit.c
+++ b/time/alt_digit.c
@@ -17,7 +17,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include "../locale/localeinfo.h"
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <stdlib.h>
 #include <wchar.h>
 #include <string.h>

diff --git a/time/era.c b/time/era.c
index d6dc489d6900a2ec655c78abb8a5da90520d5404..ec4b7687b01a998e456171f469e394abfe0f74fb 100644 (file)
--- a/time/era.c
+++ b/time/era.c
@@ -17,7 +17,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include "../locale/localeinfo.h"
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <stdlib.h>
 #include <wchar.h>
 #include <string.h>

diff --git a/time/tzset.c b/time/tzset.c
index 160f5ad460e4f62477ec0ed27fcace2a3dedfc3e..01b76b47deb12998be23bf58a22a10557e63c969 100644 (file)
--- a/time/tzset.c
+++ b/time/tzset.c
@@ -17,7 +17,7 @@
 
 #include <ctype.h>
 #include <errno.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdio.h>

diff --git a/wcsmbs/wcsmbsload.c b/wcsmbs/wcsmbsload.c
index 6bb49bc99626c41dbb5a02d88732df28a68d689d..5c3df012be7e303dee344aad48d9815425a66d34 100644 (file)
--- a/wcsmbs/wcsmbsload.c
+++ b/wcsmbs/wcsmbsload.c
@@ -24,7 +24,7 @@
 
 #include <locale/localeinfo.h>
 #include <wcsmbsload.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 
 
 /* These are the descriptions for the default conversion functions.  */