This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.22-210-g0f4341f
- From: jsm28 at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 4 Sep 2015 14:46:49 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.22-210-g0f4341f
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 0f4341fbec937b26b34e0ee80ab903825c0c76d0 (commit)
from f834e6dc705c80550acf610d507b3e4cdf19693e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=0f4341fbec937b26b34e0ee80ab903825c0c76d0
commit 0f4341fbec937b26b34e0ee80ab903825c0c76d0
Author: Joseph Myers <joseph@codesourcery.com>
Date: Fri Sep 4 14:46:21 2015 +0000
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 ab0031d..d583493 100644
--- 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 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
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 11 +++++++++++
.../unix/sysv/linux/m68k/coldfire/bits/atomic.h | 2 +-
sysdeps/unix/sysv/linux/m68k/init-first.c | 2 +-
sysdeps/unix/sysv/linux/m68k/m68k-helpers.S | 2 +-
sysdeps/unix/sysv/linux/m68k/m68k-vdso.c | 2 +-
.../unix/sysv/linux/m68k/{bits => }/m68k-vdso.h | 0
6 files changed, 15 insertions(+), 4 deletions(-)
rename sysdeps/unix/sysv/linux/m68k/{bits => }/m68k-vdso.h (100%)
hooks/post-receive
--
GNU C Library master sources