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.

22 files changed, 45 insertions, 17 deletions

diff --git a/ChangeLog b/ChangeLog
index a1d49cb3ec..7c3e625c60 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
 	* stdlib/setenv.c (__add_to_environ):
diff --git a/nptl/pthread_cond_timedwait.c b/nptl/pthread_cond_timedwait.c
index bf80467845..10b0a61a2a 100644
--- a/nptl/pthread_cond_timedwait.c
+++ b/nptl/pthread_cond_timedwait.c
@@ -33,7 +33,7 @@
 # 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.  */
diff --git a/sysdeps/powerpc/powerpc32/backtrace.c b/sysdeps/powerpc/powerpc32/backtrace.c
index fc296bd5fb..06886c70a6 100644
--- a/sysdeps/powerpc/powerpc32/backtrace.c
+++ b/sysdeps/powerpc/powerpc32/backtrace.c
@@ -20,7 +20,7 @@
 #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
diff --git a/sysdeps/powerpc/powerpc64/backtrace.c b/sysdeps/powerpc/powerpc64/backtrace.c
index 89b1ce0e10..3105badf41 100644
--- a/sysdeps/powerpc/powerpc64/backtrace.c
+++ b/sysdeps/powerpc/powerpc64/backtrace.c
@@ -20,7 +20,7 @@
 #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
diff --git a/sysdeps/unix/sysv/linux/aarch64/gettimeofday.c b/sysdeps/unix/sysv/linux/aarch64/gettimeofday.c
index 950666fda7..67b7f6d566 100644
--- a/sysdeps/unix/sysv/linux/aarch64/gettimeofday.c
+++ b/sysdeps/unix/sysv/linux/aarch64/gettimeofday.c
@@ -21,7 +21,7 @@
 
 #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.
diff --git a/sysdeps/unix/sysv/linux/aarch64/init-first.c b/sysdeps/unix/sysv/linux/aarch64/init-first.c
index 01241aa340..d99c821f6d 100644
--- a/sysdeps/unix/sysv/linux/aarch64/init-first.c
+++ b/sysdeps/unix/sysv/linux/aarch64/init-first.c
@@ -21,7 +21,7 @@
 # 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 *);
diff --git a/sysdeps/unix/sysv/linux/aarch64/bits/libc-vdso.h b/sysdeps/unix/sysv/linux/aarch64/libc-vdso.h
index 1f6bb36c3b..1f6bb36c3b 100644
--- a/sysdeps/unix/sysv/linux/aarch64/bits/libc-vdso.h
+++ b/sysdeps/unix/sysv/linux/aarch64/libc-vdso.h
diff --git a/sysdeps/unix/sysv/linux/clock_getres.c b/sysdeps/unix/sysv/linux/clock_getres.c
index 60fbde6100..9b31d8c925 100644
--- a/sysdeps/unix/sysv/linux/clock_getres.c
+++ b/sysdeps/unix/sysv/linux/clock_getres.c
@@ -27,7 +27,7 @@
 # undef INLINE_VSYSCALL
 # define INLINE_VSYSCALL INLINE_SYSCALL
 #else
-# include <bits/libc-vdso.h>
+# include <libc-vdso.h>
 #endif
 
 #define SYSCALL_GETRES \
diff --git a/sysdeps/unix/sysv/linux/clock_gettime.c b/sysdeps/unix/sysv/linux/clock_gettime.c
index 57db8ee4d5..93aa0951d7 100644
--- a/sysdeps/unix/sysv/linux/clock_gettime.c
+++ b/sysdeps/unix/sysv/linux/clock_gettime.c
@@ -27,7 +27,7 @@
 # undef INLINE_VSYSCALL
 # define INLINE_VSYSCALL INLINE_SYSCALL
 #else
-# include <bits/libc-vdso.h>
+# include <libc-vdso.h>
 #endif
 
 #ifndef SYSCALL_GETTIME
diff --git a/sysdeps/unix/sysv/linux/powerpc/get_clockfreq.c b/sysdeps/unix/sysv/linux/powerpc/get_clockfreq.c
index fe8c5a15b3..5b6bb51ab5 100644
--- a/sysdeps/unix/sysv/linux/powerpc/get_clockfreq.c
+++ b/sysdeps/unix/sysv/linux/powerpc/get_clockfreq.c
@@ -23,7 +23,7 @@
 #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
diff --git a/sysdeps/unix/sysv/linux/powerpc/gettimeofday.c b/sysdeps/unix/sysv/linux/powerpc/gettimeofday.c
index f50cf7e136..f561ac7d15 100644
--- a/sysdeps/unix/sysv/linux/powerpc/gettimeofday.c
+++ b/sysdeps/unix/sysv/linux/powerpc/gettimeofday.c
@@ -21,7 +21,7 @@
 #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");
diff --git a/sysdeps/unix/sysv/linux/powerpc/init-first.c b/sysdeps/unix/sysv/linux/powerpc/init-first.c
index c1903ca778..b4917d12a5 100644
--- a/sysdeps/unix/sysv/linux/powerpc/init-first.c
+++ b/sysdeps/unix/sysv/linux/powerpc/init-first.c
@@ -21,7 +21,7 @@
 # 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;
diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/libc-vdso.h b/sysdeps/unix/sysv/linux/powerpc/libc-vdso.h
index 63a7a9bf52..63a7a9bf52 100644
--- a/sysdeps/unix/sysv/linux/powerpc/bits/libc-vdso.h
+++ b/sysdeps/unix/sysv/linux/powerpc/libc-vdso.h
diff --git a/sysdeps/unix/sysv/linux/powerpc/sched_getcpu.c b/sysdeps/unix/sysv/linux/powerpc/sched_getcpu.c
index 11d3d6b60e..5bf540c19a 100644
--- a/sysdeps/unix/sysv/linux/powerpc/sched_getcpu.c
+++ b/sysdeps/unix/sysv/linux/powerpc/sched_getcpu.c
@@ -17,7 +17,7 @@
 
 #include <sched.h>
 #include <sysdep.h>
-#include <bits/libc-vdso.h>
+#include <libc-vdso.h>
 
 
 int
diff --git a/sysdeps/unix/sysv/linux/powerpc/time.c b/sysdeps/unix/sysv/linux/powerpc/time.c
index d72e651eb3..0c26508f43 100644
--- a/sysdeps/unix/sysv/linux/powerpc/time.c
+++ b/sysdeps/unix/sysv/linux/powerpc/time.c
@@ -21,7 +21,7 @@
 # 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");
diff --git a/sysdeps/unix/sysv/linux/s390/gettimeofday.c b/sysdeps/unix/sysv/linux/s390/gettimeofday.c
index 68acca4c9a..e8dee26842 100644
--- a/sysdeps/unix/sysv/linux/s390/gettimeofday.c
+++ b/sysdeps/unix/sysv/linux/s390/gettimeofday.c
@@ -21,7 +21,7 @@
 #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.
diff --git a/sysdeps/unix/sysv/linux/s390/init-first.c b/sysdeps/unix/sysv/linux/s390/init-first.c
index 3f167a7de2..2e00a99866 100644
--- a/sysdeps/unix/sysv/linux/s390/init-first.c
+++ b/sysdeps/unix/sysv/linux/s390/init-first.c
@@ -21,7 +21,7 @@
 # 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;
 
diff --git a/sysdeps/unix/sysv/linux/s390/bits/libc-vdso.h b/sysdeps/unix/sysv/linux/s390/libc-vdso.h
index 3fd3d06b79..3fd3d06b79 100644
--- a/sysdeps/unix/sysv/linux/s390/bits/libc-vdso.h
+++ b/sysdeps/unix/sysv/linux/s390/libc-vdso.h
diff --git a/sysdeps/unix/sysv/linux/tile/gettimeofday.c b/sysdeps/unix/sysv/linux/tile/gettimeofday.c
index 05c6298712..8d34b403a2 100644
--- a/sysdeps/unix/sysv/linux/tile/gettimeofday.c
+++ b/sysdeps/unix/sysv/linux/tile/gettimeofday.c
@@ -19,7 +19,7 @@
 #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)
diff --git a/sysdeps/unix/sysv/linux/tile/init-first.c b/sysdeps/unix/sysv/linux/tile/init-first.c
index 75dbfd79b9..6b0e26a35e 100644
--- a/sysdeps/unix/sysv/linux/tile/init-first.c
+++ b/sysdeps/unix/sysv/linux/tile/init-first.c
@@ -17,7 +17,7 @@
 
 #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;
diff --git a/sysdeps/unix/sysv/linux/tile/bits/libc-vdso.h b/sysdeps/unix/sysv/linux/tile/libc-vdso.h
index 44f828630f..44f828630f 100644
--- a/sysdeps/unix/sysv/linux/tile/bits/libc-vdso.h
+++ b/sysdeps/unix/sysv/linux/tile/libc-vdso.h
diff --git a/sysdeps/unix/sysv/linux/timespec_get.c b/sysdeps/unix/sysv/linux/timespec_get.c
index c1626952c1..25616493cd 100644
--- a/sysdeps/unix/sysv/linux/timespec_get.c
+++ b/sysdeps/unix/sysv/linux/timespec_get.c
@@ -22,7 +22,7 @@
 # undef INTERNAL_VSYSCALL
 # define INTERNAL_VSYSCALL INTERNAL_SYSCALL
 #else
-# include <bits/libc-vdso.h>
+# include <libc-vdso.h>
 #endif
 
 #ifndef INTERNAL_GETTIME