This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Rename bits/m68k-vdso.h to m68k-vdso.h (bug 14912)
- From: Joseph Myers <joseph at codesourcery dot com>
- To: <libc-alpha at sourceware dot org>, <schwab at linux-m68k dot org>
- Date: Fri, 4 Sep 2015 13:27:54 +0000
- Subject: Rename bits/m68k-vdso.h to m68k-vdso.h (bug 14912)
- Authentication-results: sourceware.org; auth=none
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.
Untested.
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.
diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/bits/atomic.h b/sysdeps/unix/sysv/linux/m68k/coldfire/bits/atomic.h
index 6e069ed..16002f1 100644
--- 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 c4e345a..248fa1f 100644
--- 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 7f350c0..0c05fc9 100644
--- 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 7225661..1988ddf 100644
--- 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
--
Joseph S. Myers
joseph@codesourcery.com