Rename bits/stdio-lock.h to stdio-lock.h (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/stdio-lock.h to plain stdio-lock.h to follow
that convention.

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

	[BZ #14912]
	* bits/stdio-lock.h: Move to ...
	* sysdeps/generic/stdio-lock.h: ...here.
	(_BITS_STDIO_LOCK_H): Rename macro to _STDIO_LOCK_H.
	* sysdeps/nptl/bits/stdio-lock.h: Move to ...
	* sysdeps/nptl/stdio-lock.h: ...here.
	(_BITS_STDIO_LOCK_H): Rename macro to _STDIO_LOCK_H.
	* include/libio.h: Include <stdio-lock.h> instead of
	<bits/stdio-lock.h>.
	* sysdeps/nptl/fork.c: Likewise.
	* sysdeps/pthread/flockfile.c: Likewise.
	* sysdeps/pthread/ftrylockfile.c: Likewise.
	* sysdeps/pthread/funlockfile.c: Likewise.

diff --git a/ChangeLog b/ChangeLog
index d583493622642d6c0987f5a78e8df33a4d0eb1c8..5bab6139f7b8dbe8d79dddaedca81d9a26019ebc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
 2015-09-04  Joseph Myers  <joseph@codesourcery.com>
 
+       [BZ #14912]
+       * bits/stdio-lock.h: Move to ...
+       * sysdeps/generic/stdio-lock.h: ...here.
+       (_BITS_STDIO_LOCK_H): Rename macro to _STDIO_LOCK_H.
+       * sysdeps/nptl/bits/stdio-lock.h: Move to ...
+       * sysdeps/nptl/stdio-lock.h: ...here.
+       (_BITS_STDIO_LOCK_H): Rename macro to _STDIO_LOCK_H.
+       * include/libio.h: Include <stdio-lock.h> instead of
+       <bits/stdio-lock.h>.
+       * sysdeps/nptl/fork.c: Likewise.
+       * sysdeps/pthread/flockfile.c: Likewise.
+       * sysdeps/pthread/ftrylockfile.c: Likewise.
+       * sysdeps/pthread/funlockfile.c: Likewise.
+
        [BZ #14912]
        * sysdeps/unix/sysv/linux/m68k/bits/m68k-vdso.h: Move to ...
        * sysdeps/unix/sysv/linux/m68k/m68k-vdso.h: ...here.

diff --git a/include/libio.h b/include/libio.h
index f8a346a09a64c9ec132f2232589ca11579ad334e..97fc5b548b94e919491381ed54892524791d41b9 100644 (file)
--- a/include/libio.h
+++ b/include/libio.h
@@ -1,5 +1,5 @@
 #if !defined _ISOMAC && defined _IO_MTSAFE_IO
-# include <bits/stdio-lock.h>
+# include <stdio-lock.h>
 #endif
 #include <libio/libio.h>
 

diff --git a/bits/stdio-lock.h b/sysdeps/generic/stdio-lock.h
similarity index 95%
rename from bits/stdio-lock.h
rename to sysdeps/generic/stdio-lock.h
index 0c5bb65c45d30a76bf54bd8888540306af887b3b..620e207f80511fa51c2c2e3df1888aa48f28cc63 100644 (file)
--- a/bits/stdio-lock.h
+++ b/sysdeps/generic/stdio-lock.h
@@ -16,8 +16,8 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#ifndef _BITS_STDIO_LOCK_H
-#define _BITS_STDIO_LOCK_H 1
+#ifndef _STDIO_LOCK_H
+#define _STDIO_LOCK_H 1
 
 #include <bits/libc-lock.h>
 
@@ -54,4 +54,4 @@ __libc_lock_define_recursive (typedef, _IO_lock_t)
   _IO_cleanup_region_end (0)
 #endif
 
-#endif /* bits/stdio-lock.h */
+#endif /* stdio-lock.h */

diff --git a/sysdeps/nptl/fork.c b/sysdeps/nptl/fork.c
index 2b9ae4b571e9fafbfce56d6fbe99020780c40354..1e251bd2d4f5416b6956b25b01beea7809f18c01 100644 (file)
--- a/sysdeps/nptl/fork.c
+++ b/sysdeps/nptl/fork.c
@@ -25,7 +25,7 @@
 #include <tls.h>
 #include <hp-timing.h>
 #include <ldsodefs.h>
-#include <bits/stdio-lock.h>
+#include <stdio-lock.h>
 #include <atomic.h>
 #include <nptl/pthreadP.h>
 #include <fork.h>

diff --git a/sysdeps/nptl/bits/stdio-lock.h b/sysdeps/nptl/stdio-lock.h
similarity index 97%
rename from sysdeps/nptl/bits/stdio-lock.h
rename to sysdeps/nptl/stdio-lock.h
index 8adf0319c45bd9f36799d5d244b98e67a114e013..9406eaa0453c1eadb05ed8e9d266c07084e3e997 100644 (file)
--- a/sysdeps/nptl/bits/stdio-lock.h
+++ b/sysdeps/nptl/stdio-lock.h
@@ -16,8 +16,8 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#ifndef _BITS_STDIO_LOCK_H
-#define _BITS_STDIO_LOCK_H 1
+#ifndef _STDIO_LOCK_H
+#define _STDIO_LOCK_H 1
 
 #include <bits/libc-lock.h>
 #include <lowlevellock.h>
@@ -107,4 +107,4 @@ typedef struct { int lock; int cnt; void *owner; } _IO_lock_t;
 
 #endif
 
-#endif /* bits/stdio-lock.h */
+#endif /* stdio-lock.h */

diff --git a/sysdeps/pthread/flockfile.c b/sysdeps/pthread/flockfile.c
index c5c1ed8754749e15ea9428acf08302752970ad26..3894656747fb8f94b9ecdec50542626cec742d85 100644 (file)
--- a/sysdeps/pthread/flockfile.c
+++ b/sysdeps/pthread/flockfile.c
@@ -19,7 +19,7 @@
 #include <pthread.h>
 #include <stdio.h>
 #include <libio.h>
-#include <bits/stdio-lock.h>
+#include <stdio-lock.h>
 
 
 void

diff --git a/sysdeps/pthread/ftrylockfile.c b/sysdeps/pthread/ftrylockfile.c
index 14dc7640281f96699fba1e630f42a6c4ce1d6a7a..9ee0839882d8d982703e12bf705f9854004e8115 100644 (file)
--- a/sysdeps/pthread/ftrylockfile.c
+++ b/sysdeps/pthread/ftrylockfile.c
@@ -19,7 +19,7 @@
 #include <errno.h>
 #include <pthread.h>
 #include <stdio.h>
-#include <bits/stdio-lock.h>
+#include <stdio-lock.h>
 
 
 int

diff --git a/sysdeps/pthread/funlockfile.c b/sysdeps/pthread/funlockfile.c
index 59172c3bb85f0526f81321a9645c1c6dd04833f7..d33f7b0a567ce9032f439d5fd0558db356296e24 100644 (file)
--- a/sysdeps/pthread/funlockfile.c
+++ b/sysdeps/pthread/funlockfile.c
@@ -19,7 +19,7 @@
 #include <pthread.h>
 #include <stdio.h>
 #include <libio.h>
-#include <bits/stdio-lock.h>
+#include <stdio-lock.h>
 
 
 void