Rename bits/m68k-vdso.h to m68k-vdso.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/m68k-vdso.h to plain m68k-vdso.h to follow
that convention.

	[BZ #14912]
	* sysdeps/unix/sysv/linux/m68k/bits/m68k-vdso.h: Move to ...
	* sysdeps/unix/sysv/linux/m68k/m68k-vdso.h: ...here.
	* sysdeps/unix/sysv/linux/m68k/coldfire/bits/atomic.h: Include
	<m68k-vdso.h> instead of <bits/m68k-vdso.h>.
	* sysdeps/unix/sysv/linux/m68k/init-first.c: Likewise.
	* sysdeps/unix/sysv/linux/m68k/m68k-helpers.S: Likewise.
	* sysdeps/unix/sysv/linux/m68k/m68k-vdso.c: Likewise.

diff --git a/ChangeLog b/ChangeLog
index ab0031d9dbe2bf1fd17184b022fea7413298bcc5..d583493622642d6c0987f5a78e8df33a4d0eb1c8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2015-09-04  Joseph Myers  <joseph@codesourcery.com>
+
+       [BZ #14912]
+       * sysdeps/unix/sysv/linux/m68k/bits/m68k-vdso.h: Move to ...
+       * sysdeps/unix/sysv/linux/m68k/m68k-vdso.h: ...here.
+       * sysdeps/unix/sysv/linux/m68k/coldfire/bits/atomic.h: Include
+       <m68k-vdso.h> instead of <bits/m68k-vdso.h>.
+       * sysdeps/unix/sysv/linux/m68k/init-first.c: Likewise.
+       * sysdeps/unix/sysv/linux/m68k/m68k-helpers.S: Likewise.
+       * sysdeps/unix/sysv/linux/m68k/m68k-vdso.c: Likewise.
+
 2015-09-03  Roland McGrath  <roland@hack.frob.com>
 
        * elf/Makefile (test-xfail-tst-protected1a): New variable.

diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/bits/atomic.h b/sysdeps/unix/sysv/linux/m68k/coldfire/bits/atomic.h
index 6e069edabe2005f454f2668ba56e1f8474834087..16002f15db5ac88c8aedc919557bb7ed1578c748 100644 (file)
--- a/sysdeps/unix/sysv/linux/m68k/coldfire/bits/atomic.h
+++ b/sysdeps/unix/sysv/linux/m68k/coldfire/bits/atomic.h
@@ -21,7 +21,7 @@
 
 #include <stdint.h>
 #include <sysdep.h>
-#include <bits/m68k-vdso.h>
+#include <m68k-vdso.h>
 
 /* Coldfire has no atomic compare-and-exchange operation, but the
    kernel provides userspace atomicity operations.  Use them.  */

diff --git a/sysdeps/unix/sysv/linux/m68k/init-first.c b/sysdeps/unix/sysv/linux/m68k/init-first.c
index c4e345ad14d853c924d881295bf99c59c35c0d40..248fa1ff524e74c2e7131e8036deb95f84a17c0e 100644 (file)
--- a/sysdeps/unix/sysv/linux/m68k/init-first.c
+++ b/sysdeps/unix/sysv/linux/m68k/init-first.c
@@ -22,7 +22,7 @@
 #ifdef SHARED
 
 #include <dl-vdso.h>
-#include <bits/m68k-vdso.h>
+#include <m68k-vdso.h>
 
 static inline void
 _libc_vdso_platform_setup (void)

diff --git a/sysdeps/unix/sysv/linux/m68k/m68k-helpers.S b/sysdeps/unix/sysv/linux/m68k/m68k-helpers.S
index 7f350c0f7d5ed57a5d5f5667985e9ece870c05a0..0c05fc9f587da523ef9f753a841831d2c7521ce4 100644 (file)
--- a/sysdeps/unix/sysv/linux/m68k/m68k-helpers.S
+++ b/sysdeps/unix/sysv/linux/m68k/m68k-helpers.S
@@ -34,7 +34,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include <bits/m68k-vdso.h>
+#include <m68k-vdso.h>
 
        .text
 

diff --git a/sysdeps/unix/sysv/linux/m68k/m68k-vdso.c b/sysdeps/unix/sysv/linux/m68k/m68k-vdso.c
index 722566102e5214c4724708f25544f8a61d079813..1988ddf0b26744dd287f4bfa90d81e7cb59013bb 100644 (file)
--- a/sysdeps/unix/sysv/linux/m68k/m68k-vdso.c
+++ b/sysdeps/unix/sysv/linux/m68k/m68k-vdso.c
@@ -18,7 +18,7 @@
 
 #ifdef SHARED
 
-#include <bits/m68k-vdso.h>
+#include <m68k-vdso.h>
 
 /* Because these pointers are used from other libraries than libc,
    they are exported at GLIBC_PRIVATE version.

diff --git a/sysdeps/unix/sysv/linux/m68k/bits/m68k-vdso.h b/sysdeps/unix/sysv/linux/m68k/m68k-vdso.h
similarity index 100%
rename from sysdeps/unix/sysv/linux/m68k/bits/m68k-vdso.h
rename to sysdeps/unix/sysv/linux/m68k/m68k-vdso.h