From 0f4341fbec937b26b34e0ee80ab903825c0c76d0 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Fri, 4 Sep 2015 14:46:21 +0000 Subject: Rename bits/m68k-vdso.h to m68k-vdso.h (bug 14912). It was noted in 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 instead of . * 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. --- ChangeLog | 11 ++++ sysdeps/unix/sysv/linux/m68k/bits/m68k-vdso.h | 60 ---------------------- .../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 +- sysdeps/unix/sysv/linux/m68k/m68k-vdso.h | 60 ++++++++++++++++++++++ 7 files changed, 75 insertions(+), 64 deletions(-) delete mode 100644 sysdeps/unix/sysv/linux/m68k/bits/m68k-vdso.h create mode 100644 sysdeps/unix/sysv/linux/m68k/m68k-vdso.h diff --git a/ChangeLog b/ChangeLog index ab0031d..d583493 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2015-09-04 Joseph Myers + + [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 + instead of . + * 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 * elf/Makefile (test-xfail-tst-protected1a): New variable. diff --git a/sysdeps/unix/sysv/linux/m68k/bits/m68k-vdso.h b/sysdeps/unix/sysv/linux/m68k/bits/m68k-vdso.h deleted file mode 100644 index 3863bdf..0000000 --- a/sysdeps/unix/sysv/linux/m68k/bits/m68k-vdso.h +++ /dev/null @@ -1,60 +0,0 @@ -/* Resolve function pointers to VDSO functions. - Copyright (C) 2010-2015 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Maxim Kuvyrkov , 2010. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library. If not, see - . */ - - -#ifndef _M68K_VDSO_H -#define _M68K_VDSO_H - -#ifdef SHARED - -# if IS_IN (rtld) -# define M68K_VDSO_SYMBOL(name) __rtld_##name -# define STR_M68K_VDSO_SYMBOL(name) "__rtld_" #name -# else -# define M68K_VDSO_SYMBOL(name) name -# define STR_M68K_VDSO_SYMBOL(name) #name -# endif - -# ifndef __ASSEMBLER__ - -/* We define __rtld_* copies for rtld. - We need them visible in libc to initialize. */ -# if IS_IN (rtld) || IS_IN (libc) -extern void *__rtld___vdso_read_tp; -extern void *__rtld___vdso_atomic_cmpxchg_32; -extern void *__rtld___vdso_atomic_barrier; - -/* These stubs are meant to be invoked only from the assembly. */ -extern void __vdso_read_tp_stub (void); -extern void __vdso_atomic_cmpxchg_32_stub (void); -extern void __vdso_atomic_barrier_stub (void); -# endif /* IS_IN (rtld) || IS_IN (libc) */ - -/* RTLD should only use its own copies. */ -# if !IS_IN (rtld) -extern void *__vdso_read_tp; -extern void *__vdso_atomic_cmpxchg_32; -extern void *__vdso_atomic_barrier; -# endif /* !IS_IN (rtld) */ - -# endif /* !__ASSEMBLER__ */ - -#endif /* SHARED */ - -#endif /* _M68K_VDSO_H */ 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 #include -#include +#include /* 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 -#include +#include 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 @@ . */ #include -#include +#include .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 +#include /* 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/m68k-vdso.h b/sysdeps/unix/sysv/linux/m68k/m68k-vdso.h new file mode 100644 index 0000000..3863bdf --- /dev/null +++ b/sysdeps/unix/sysv/linux/m68k/m68k-vdso.h @@ -0,0 +1,60 @@ +/* Resolve function pointers to VDSO functions. + Copyright (C) 2010-2015 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Maxim Kuvyrkov , 2010. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library. If not, see + . */ + + +#ifndef _M68K_VDSO_H +#define _M68K_VDSO_H + +#ifdef SHARED + +# if IS_IN (rtld) +# define M68K_VDSO_SYMBOL(name) __rtld_##name +# define STR_M68K_VDSO_SYMBOL(name) "__rtld_" #name +# else +# define M68K_VDSO_SYMBOL(name) name +# define STR_M68K_VDSO_SYMBOL(name) #name +# endif + +# ifndef __ASSEMBLER__ + +/* We define __rtld_* copies for rtld. + We need them visible in libc to initialize. */ +# if IS_IN (rtld) || IS_IN (libc) +extern void *__rtld___vdso_read_tp; +extern void *__rtld___vdso_atomic_cmpxchg_32; +extern void *__rtld___vdso_atomic_barrier; + +/* These stubs are meant to be invoked only from the assembly. */ +extern void __vdso_read_tp_stub (void); +extern void __vdso_atomic_cmpxchg_32_stub (void); +extern void __vdso_atomic_barrier_stub (void); +# endif /* IS_IN (rtld) || IS_IN (libc) */ + +/* RTLD should only use its own copies. */ +# if !IS_IN (rtld) +extern void *__vdso_read_tp; +extern void *__vdso_atomic_cmpxchg_32; +extern void *__vdso_atomic_barrier; +# endif /* !IS_IN (rtld) */ + +# endif /* !__ASSEMBLER__ */ + +#endif /* SHARED */ + +#endif /* _M68K_VDSO_H */ -- cgit v1.1