diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/m68k/coldfire/bits/atomic.h | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/m68k/init-first.c | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/m68k/m68k-helpers.S | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/m68k/m68k-vdso.c | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/m68k/m68k-vdso.h (renamed from sysdeps/unix/sysv/linux/m68k/bits/m68k-vdso.h) | 0 |
6 files changed, 15 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index ab0031d9db..d583493622 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 6e069edabe..16002f15db 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 c4e345ad14..248fa1ff52 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 7f350c0f7d..0c05fc9f58 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 722566102e..1988ddf0b2 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 index 3863bdf685..3863bdf685 100644 --- a/sysdeps/unix/sysv/linux/m68k/bits/m68k-vdso.h +++ b/sysdeps/unix/sysv/linux/m68k/m68k-vdso.h |