libc-vdso.h place consolidation

This patch moves the libc-vdso.h internal header from bits folder to
default architecture one and also corrects the remaning includes in
the files.
This commit is contained in:
Adhemerval Zanella 2015-04-13 16:38:16 -03:00
parent 03c1e456b0
commit 7bf8fb1042
22 changed files with 45 additions and 17 deletions

View File

@ -1,3 +1,31 @@
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> 2015-04-19 Paul Eggert <eggert@cs.ucla.edu>
* stdlib/setenv.c (__add_to_environ): * stdlib/setenv.c (__add_to_environ):

View File

@ -33,7 +33,7 @@
# undef INLINE_VSYSCALL # undef INLINE_VSYSCALL
# define INLINE_VSYSCALL INLINE_SYSCALL # define INLINE_VSYSCALL INLINE_SYSCALL
#else #else
# include <bits/libc-vdso.h> # include <libc-vdso.h>
#endif #endif
/* Cleanup handler, defined in pthread_cond_wait.c. */ /* Cleanup handler, defined in pthread_cond_wait.c. */

View File

@ -20,7 +20,7 @@
#include <stddef.h> #include <stddef.h>
#include <string.h> #include <string.h>
#include <signal.h> #include <signal.h>
#include <bits/libc-vdso.h> #include <libc-vdso.h>
/* This is the stack layout we see with every stack frame. /* 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 Note that every routine is required by the ABI to lay out the stack

View File

@ -20,7 +20,7 @@
#include <stddef.h> #include <stddef.h>
#include <string.h> #include <string.h>
#include <signal.h> #include <signal.h>
#include <bits/libc-vdso.h> #include <libc-vdso.h>
/* This is the stack layout we see with every stack frame. /* 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 Note that every routine is required by the ABI to lay out the stack

View File

@ -21,7 +21,7 @@
#undef __gettimeofday #undef __gettimeofday
#include <bits/libc-vdso.h> #include <libc-vdso.h>
/* Get the current time of day and timezone information, /* Get the current time of day and timezone information,
putting it into *tv and *tz. If tz is null, *tz is not filled. putting it into *tv and *tz. If tz is null, *tz is not filled.

View File

@ -21,7 +21,7 @@
# undef __gettimeofday # undef __gettimeofday
# undef __clock_gettime # undef __clock_gettime
# undef __clock_getres # undef __clock_getres
# include <bits/libc-vdso.h> # include <libc-vdso.h>
void (*__vdso_gettimeofday) (struct timeval *, void *) attribute_hidden; void (*__vdso_gettimeofday) (struct timeval *, void *) attribute_hidden;
void (*__vdso_clock_gettime) (clockid_t, struct timespec *); void (*__vdso_clock_gettime) (clockid_t, struct timespec *);

View File

@ -27,7 +27,7 @@
# undef INLINE_VSYSCALL # undef INLINE_VSYSCALL
# define INLINE_VSYSCALL INLINE_SYSCALL # define INLINE_VSYSCALL INLINE_SYSCALL
#else #else
# include <bits/libc-vdso.h> # include <libc-vdso.h>
#endif #endif
#define SYSCALL_GETRES \ #define SYSCALL_GETRES \

View File

@ -27,7 +27,7 @@
# undef INLINE_VSYSCALL # undef INLINE_VSYSCALL
# define INLINE_VSYSCALL INLINE_SYSCALL # define INLINE_VSYSCALL INLINE_SYSCALL
#else #else
# include <bits/libc-vdso.h> # include <libc-vdso.h>
#endif #endif
#ifndef SYSCALL_GETTIME #ifndef SYSCALL_GETTIME

View File

@ -23,7 +23,7 @@
#include <unistd.h> #include <unistd.h>
#include <libc-internal.h> #include <libc-internal.h>
#include <sysdep.h> #include <sysdep.h>
#include <bits/libc-vdso.h> #include <libc-vdso.h>
#include <not-cancel.h> #include <not-cancel.h>
hp_timing_t hp_timing_t

View File

@ -21,7 +21,7 @@
#ifdef SHARED #ifdef SHARED
# include <dl-vdso.h> # include <dl-vdso.h>
# include <bits/libc-vdso.h> # include <libc-vdso.h>
# include <dl-machine.h> # include <dl-machine.h>
void *gettimeofday_ifunc (void) __asm__ ("__gettimeofday"); void *gettimeofday_ifunc (void) __asm__ ("__gettimeofday");

View File

@ -21,7 +21,7 @@
# undef __gettimeofday # undef __gettimeofday
# undef __clock_gettime # undef __clock_gettime
# undef __clock_getres # undef __clock_getres
# include <bits/libc-vdso.h> # include <libc-vdso.h>
void *__vdso_gettimeofday attribute_hidden; void *__vdso_gettimeofday attribute_hidden;
void *__vdso_clock_gettime; void *__vdso_clock_gettime;

View File

@ -17,7 +17,7 @@
#include <sched.h> #include <sched.h>
#include <sysdep.h> #include <sysdep.h>
#include <bits/libc-vdso.h> #include <libc-vdso.h>
int int

View File

@ -21,7 +21,7 @@
# include <time.h> # include <time.h>
# include <sysdep.h> # include <sysdep.h>
# include <dl-vdso.h> # include <dl-vdso.h>
# include <bits/libc-vdso.h> # include <libc-vdso.h>
# include <dl-machine.h> # include <dl-machine.h>
void *time_ifunc (void) asm ("time"); void *time_ifunc (void) asm ("time");

View File

@ -21,7 +21,7 @@
#include <time.h> #include <time.h>
#include <hp-timing.h> #include <hp-timing.h>
#include <bits/libc-vdso.h> #include <libc-vdso.h>
/* Get the current time of day and timezone information, /* Get the current time of day and timezone information,
putting it into *TV and *TZ. If TZ is NULL, *TZ is not filled. putting it into *TV and *TZ. If TZ is NULL, *TZ is not filled.

View File

@ -21,7 +21,7 @@
# undef __gettimeofday # undef __gettimeofday
# undef __clock_gettime # undef __clock_gettime
# undef __clock_getres # undef __clock_getres
# include <bits/libc-vdso.h> # include <libc-vdso.h>
long int (*__vdso_gettimeofday) (struct timeval *, void *) attribute_hidden; long int (*__vdso_gettimeofday) (struct timeval *, void *) attribute_hidden;

View File

@ -19,7 +19,7 @@
#include <stddef.h> #include <stddef.h>
#include <sys/time.h> #include <sys/time.h>
#include <time.h> #include <time.h>
#include <bits/libc-vdso.h> #include <libc-vdso.h>
int int
__gettimeofday (struct timeval *tv, struct timezone *tz) __gettimeofday (struct timeval *tv, struct timezone *tz)

View File

@ -17,7 +17,7 @@
#ifdef SHARED #ifdef SHARED
#include <dl-vdso.h> #include <dl-vdso.h>
#include <bits/libc-vdso.h> #include <libc-vdso.h>
struct syscall_return_value (*__vdso_gettimeofday) (struct timeval *, void *) struct syscall_return_value (*__vdso_gettimeofday) (struct timeval *, void *)
attribute_hidden; attribute_hidden;

View File

@ -22,7 +22,7 @@
# undef INTERNAL_VSYSCALL # undef INTERNAL_VSYSCALL
# define INTERNAL_VSYSCALL INTERNAL_SYSCALL # define INTERNAL_VSYSCALL INTERNAL_SYSCALL
#else #else
# include <bits/libc-vdso.h> # include <libc-vdso.h>
#endif #endif
#ifndef INTERNAL_GETTIME #ifndef INTERNAL_GETTIME