+2015-04-20 Adhemerval Zanella <adhemerval.zanella@linaro.org>
+
+ * nptl/pthread_cond_timedwait.c: Change include bits/libc-vdso.h to just
+ libc-vdso.h.
+ * sysdeps/powerpc/powerpc32/backtrace.c: Likewise.
+ * sysdeps/powerpc/powerpc64/backtrace.c: Likewise.
+ * sysdeps/unix/sysv/linux/aarch64/init-first.c: Likewise.
+ * sysdeps/unix/sysv/linux/clock_getres.c: Likewise.
+ * sysdeps/unix/sysv/linux/clock_gettime.c: Likewise.
+ * sysdeps/unix/sysv/linux/gettimeofday.c: Likewise.
+ * sysdeps/unix/sysv/linux/powerpc/get_clockfreq.c: Likewise.
+ * sysdeps/unix/sysv/linux/powerpc/gettimeofday.c: Likewise.
+ * sysdeps/unix/sysv/linux/powerpc/init-first.c: Likewise.
+ * sysdeps/unix/sysv/linux/powerpc/sched_getcpu.c: Likewise.
+ * sysdeps/unix/sysv/linux/powerpc/time.c: Likewise.
+ * sysdeps/unix/sysv/linux/s390/init-first.c: Likewise.
+ * sysdeps/unix/sysv/linux/tile/gettimeofday.c: Likewise.
+ * sysdeps/unix/sysv/linux/tile/init-first.c: Likewise.
+ * sysdeps/unix/sysv/linux/timespec_get.c: Likewise.
+ * sysdeps/unix/sysv/linux/aarch64/bits/libc-vdso.h: Move to ...
+ * sysdeps/unix/sysv/linux/aarch64/libc-vdso.h: ... here.
+ * sysdeps/unix/sysv/linux/powerpc/bits/libc-vdso.h: Move to ...
+ * sysdeps/unix/sysv/linux/powerpc/libc-vdso.h: ... here.
+ * sysdeps/unix/sysv/linux/s390/bits/libc-vdso.h: Move to ...
+ * sysdeps/unix/sysv/linux/s390/libc-vdso.h: ... here.
+ * sysdeps/unix/sysv/linux/tile/bits/libc-vdso.h: Move to ...
+ * sysdeps/unix/sysv/linux/tile/libc-vdso.h: ... here.
+
2015-04-19 Paul Eggert <eggert@cs.ucla.edu>
* stdlib/setenv.c (__add_to_environ):
# undef INLINE_VSYSCALL
# define INLINE_VSYSCALL INLINE_SYSCALL
#else
-# include <bits/libc-vdso.h>
+# include <libc-vdso.h>
#endif
/* Cleanup handler, defined in pthread_cond_wait.c. */
#include <stddef.h>
#include <string.h>
#include <signal.h>
-#include <bits/libc-vdso.h>
+#include <libc-vdso.h>
/* This is the stack layout we see with every stack frame.
Note that every routine is required by the ABI to lay out the stack
#include <stddef.h>
#include <string.h>
#include <signal.h>
-#include <bits/libc-vdso.h>
+#include <libc-vdso.h>
/* This is the stack layout we see with every stack frame.
Note that every routine is required by the ABI to lay out the stack
+++ /dev/null
-/* Copyright (C) 2009-2015 Free Software Foundation, Inc.
-
- This file is part of the GNU C Library.
-
- 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
- <http://www.gnu.org/licenses/>. */
-
-#ifndef _LIBC_VDSO_H
-#define _LIBC_VDSO_H
-
-#ifdef SHARED
-
-extern void (*__vdso_gettimeofday) (struct timeval *, void *)
- attribute_hidden;
-extern void (*__vdso_clock_gettime) (clockid_t, struct timespec *);
-extern void (*__vdso_clock_getres) (clockid_t, struct timespec *);
-
-#endif
-
-#endif /* _LIBC_VDSO_H */
#undef __gettimeofday
-#include <bits/libc-vdso.h>
+#include <libc-vdso.h>
/* Get the current time of day and timezone information,
putting it into *tv and *tz. If tz is null, *tz is not filled.
# undef __gettimeofday
# undef __clock_gettime
# undef __clock_getres
-# include <bits/libc-vdso.h>
+# include <libc-vdso.h>
void (*__vdso_gettimeofday) (struct timeval *, void *) attribute_hidden;
void (*__vdso_clock_gettime) (clockid_t, struct timespec *);
--- /dev/null
+/* Copyright (C) 2009-2015 Free Software Foundation, Inc.
+
+ This file is part of the GNU C Library.
+
+ 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
+ <http://www.gnu.org/licenses/>. */
+
+#ifndef _LIBC_VDSO_H
+#define _LIBC_VDSO_H
+
+#ifdef SHARED
+
+extern void (*__vdso_gettimeofday) (struct timeval *, void *)
+ attribute_hidden;
+extern void (*__vdso_clock_gettime) (clockid_t, struct timespec *);
+extern void (*__vdso_clock_getres) (clockid_t, struct timespec *);
+
+#endif
+
+#endif /* _LIBC_VDSO_H */
# undef INLINE_VSYSCALL
# define INLINE_VSYSCALL INLINE_SYSCALL
#else
-# include <bits/libc-vdso.h>
+# include <libc-vdso.h>
#endif
#define SYSCALL_GETRES \
# undef INLINE_VSYSCALL
# define INLINE_VSYSCALL INLINE_SYSCALL
#else
-# include <bits/libc-vdso.h>
+# include <libc-vdso.h>
#endif
#ifndef SYSCALL_GETTIME
+++ /dev/null
-/* Resolve function pointers to VDSO functions.
- Copyright (C) 2005-2015 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- 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
- <http://www.gnu.org/licenses/>. */
-
-
-#ifndef _LIBC_VDSO_H
-#define _LIBC_VDSO_H
-
-#ifdef SHARED
-
-extern void *__vdso_gettimeofday attribute_hidden;
-
-extern void *__vdso_clock_gettime;
-
-extern void *__vdso_clock_getres;
-
-extern void *__vdso_get_tbfreq;
-
-extern void *__vdso_getcpu;
-
-extern void *__vdso_time;
-
-#if defined(__PPC64__) || defined(__powerpc64__)
-extern void *__vdso_sigtramp_rt64;
-#else
-extern void *__vdso_sigtramp32;
-extern void *__vdso_sigtramp_rt32;
-#endif
-
-#if (defined(__PPC64__) || defined(__powerpc64__)) && _CALL_ELF != 2
-/* The correct solution is for _dl_vdso_vsym to return the address of the OPD
- for the kernel VDSO function. That address would then be stored in the
- __vdso_* variables and returned as the result of the IFUNC resolver function.
- Yet, the kernel does not contain any OPD entries for the VDSO functions
- (incomplete implementation). However, PLT relocations for IFUNCs still expect
- the address of an OPD to be returned from the IFUNC resolver function (since
- PLT entries on PPC64 are just copies of OPDs). The solution for now is to
- create an artificial static OPD for each VDSO function returned by a resolver
- function. The TOC value is set to a non-zero value to avoid triggering lazy
- symbol resolution via .glink0/.plt0 for a zero TOC (requires thread-safe PLT
- sequences) when the dynamic linker isn't prepared for it e.g. RTLD_NOW. None
- of the kernel VDSO routines use the TOC or AUX values so any non-zero value
- will work. Note that function pointer comparisons will not use this artificial
- static OPD since those are resolved via ADDR64 relocations and will point at
- the non-IFUNC default OPD for the symbol. Lastly, because the IFUNC relocations
- are processed immediately at startup the resolver functions and this code need
- not be thread-safe, but if the caller writes to a PLT slot it must do so in a
- thread-safe manner with all the required barriers. */
-#define VDSO_IFUNC_RET(value) \
- ({ \
- static Elf64_FuncDesc vdso_opd = { .fd_toc = ~0x0 }; \
- vdso_opd.fd_func = (Elf64_Addr)value; \
- &vdso_opd; \
- })
-
-#else
-#define VDSO_IFUNC_RET(value) ((void *) (value))
-#endif
-
-#endif
-
-#endif /* _LIBC_VDSO_H */
#include <unistd.h>
#include <libc-internal.h>
#include <sysdep.h>
-#include <bits/libc-vdso.h>
+#include <libc-vdso.h>
#include <not-cancel.h>
hp_timing_t
#ifdef SHARED
# include <dl-vdso.h>
-# include <bits/libc-vdso.h>
+# include <libc-vdso.h>
# include <dl-machine.h>
void *gettimeofday_ifunc (void) __asm__ ("__gettimeofday");
# undef __gettimeofday
# undef __clock_gettime
# undef __clock_getres
-# include <bits/libc-vdso.h>
+# include <libc-vdso.h>
void *__vdso_gettimeofday attribute_hidden;
void *__vdso_clock_gettime;
--- /dev/null
+/* Resolve function pointers to VDSO functions.
+ Copyright (C) 2005-2015 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ 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
+ <http://www.gnu.org/licenses/>. */
+
+
+#ifndef _LIBC_VDSO_H
+#define _LIBC_VDSO_H
+
+#ifdef SHARED
+
+extern void *__vdso_gettimeofday attribute_hidden;
+
+extern void *__vdso_clock_gettime;
+
+extern void *__vdso_clock_getres;
+
+extern void *__vdso_get_tbfreq;
+
+extern void *__vdso_getcpu;
+
+extern void *__vdso_time;
+
+#if defined(__PPC64__) || defined(__powerpc64__)
+extern void *__vdso_sigtramp_rt64;
+#else
+extern void *__vdso_sigtramp32;
+extern void *__vdso_sigtramp_rt32;
+#endif
+
+#if (defined(__PPC64__) || defined(__powerpc64__)) && _CALL_ELF != 2
+/* The correct solution is for _dl_vdso_vsym to return the address of the OPD
+ for the kernel VDSO function. That address would then be stored in the
+ __vdso_* variables and returned as the result of the IFUNC resolver function.
+ Yet, the kernel does not contain any OPD entries for the VDSO functions
+ (incomplete implementation). However, PLT relocations for IFUNCs still expect
+ the address of an OPD to be returned from the IFUNC resolver function (since
+ PLT entries on PPC64 are just copies of OPDs). The solution for now is to
+ create an artificial static OPD for each VDSO function returned by a resolver
+ function. The TOC value is set to a non-zero value to avoid triggering lazy
+ symbol resolution via .glink0/.plt0 for a zero TOC (requires thread-safe PLT
+ sequences) when the dynamic linker isn't prepared for it e.g. RTLD_NOW. None
+ of the kernel VDSO routines use the TOC or AUX values so any non-zero value
+ will work. Note that function pointer comparisons will not use this artificial
+ static OPD since those are resolved via ADDR64 relocations and will point at
+ the non-IFUNC default OPD for the symbol. Lastly, because the IFUNC relocations
+ are processed immediately at startup the resolver functions and this code need
+ not be thread-safe, but if the caller writes to a PLT slot it must do so in a
+ thread-safe manner with all the required barriers. */
+#define VDSO_IFUNC_RET(value) \
+ ({ \
+ static Elf64_FuncDesc vdso_opd = { .fd_toc = ~0x0 }; \
+ vdso_opd.fd_func = (Elf64_Addr)value; \
+ &vdso_opd; \
+ })
+
+#else
+#define VDSO_IFUNC_RET(value) ((void *) (value))
+#endif
+
+#endif
+
+#endif /* _LIBC_VDSO_H */
#include <sched.h>
#include <sysdep.h>
-#include <bits/libc-vdso.h>
+#include <libc-vdso.h>
int
# include <time.h>
# include <sysdep.h>
# include <dl-vdso.h>
-# include <bits/libc-vdso.h>
+# include <libc-vdso.h>
# include <dl-machine.h>
void *time_ifunc (void) asm ("time");
+++ /dev/null
-/* Resolve function pointers to VDSO functions.
- Copyright (C) 2008-2015 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- 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
- <http://www.gnu.org/licenses/>. */
-
-
-#ifndef _LIBC_VDSO_H
-#define _LIBC_VDSO_H
-
-#ifdef SHARED
-
-extern long int (*__vdso_gettimeofday) (struct timeval *, void *)
- attribute_hidden;
-
-extern long int (*__vdso_clock_gettime) (clockid_t, struct timespec *);
-
-extern long int (*__vdso_clock_getres) (clockid_t, struct timespec *);
-
-#endif
-
-#endif /* _LIBC_VDSO_H */
#include <time.h>
#include <hp-timing.h>
-#include <bits/libc-vdso.h>
+#include <libc-vdso.h>
/* Get the current time of day and timezone information,
putting it into *TV and *TZ. If TZ is NULL, *TZ is not filled.
# undef __gettimeofday
# undef __clock_gettime
# undef __clock_getres
-# include <bits/libc-vdso.h>
+# include <libc-vdso.h>
long int (*__vdso_gettimeofday) (struct timeval *, void *) attribute_hidden;
--- /dev/null
+/* Resolve function pointers to VDSO functions.
+ Copyright (C) 2008-2015 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ 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
+ <http://www.gnu.org/licenses/>. */
+
+
+#ifndef _LIBC_VDSO_H
+#define _LIBC_VDSO_H
+
+#ifdef SHARED
+
+extern long int (*__vdso_gettimeofday) (struct timeval *, void *)
+ attribute_hidden;
+
+extern long int (*__vdso_clock_gettime) (clockid_t, struct timespec *);
+
+extern long int (*__vdso_clock_getres) (clockid_t, struct timespec *);
+
+#endif
+
+#endif /* _LIBC_VDSO_H */
+++ /dev/null
-/* Resolve function pointers to VDSO functions.
- Copyright (C) 2012-2015 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- 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
- <http://www.gnu.org/licenses/>. */
-
-
-#ifndef _LIBC_VDSO_H
-#define _LIBC_VDSO_H
-
-#ifdef SHARED
-
-struct syscall_return_value
-{
- long int value;
- long int error;
-};
-
-extern struct syscall_return_value (*__vdso_gettimeofday) (struct timeval *,
- void *)
- attribute_hidden;
-
-extern struct syscall_return_value (*__vdso_clock_gettime) (clockid_t,
- struct timespec *);
-
-#endif
-
-#endif /* _LIBC_VDSO_H */
#include <stddef.h>
#include <sys/time.h>
#include <time.h>
-#include <bits/libc-vdso.h>
+#include <libc-vdso.h>
int
__gettimeofday (struct timeval *tv, struct timezone *tz)
#ifdef SHARED
#include <dl-vdso.h>
-#include <bits/libc-vdso.h>
+#include <libc-vdso.h>
struct syscall_return_value (*__vdso_gettimeofday) (struct timeval *, void *)
attribute_hidden;
--- /dev/null
+/* Resolve function pointers to VDSO functions.
+ Copyright (C) 2012-2015 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ 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
+ <http://www.gnu.org/licenses/>. */
+
+
+#ifndef _LIBC_VDSO_H
+#define _LIBC_VDSO_H
+
+#ifdef SHARED
+
+struct syscall_return_value
+{
+ long int value;
+ long int error;
+};
+
+extern struct syscall_return_value (*__vdso_gettimeofday) (struct timeval *,
+ void *)
+ attribute_hidden;
+
+extern struct syscall_return_value (*__vdso_clock_gettime) (clockid_t,
+ struct timespec *);
+
+#endif
+
+#endif /* _LIBC_VDSO_H */
# undef INTERNAL_VSYSCALL
# define INTERNAL_VSYSCALL INTERNAL_SYSCALL
#else
-# include <bits/libc-vdso.h>
+# include <libc-vdso.h>
#endif
#ifndef INTERNAL_GETTIME
projects / platform / upstream / glibc.git / commitdiff