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.

diff --git a/ChangeLog b/ChangeLog
index a1d49cb3ec913815531efb77f059bcf942d28426..7c3e625c609948358287f8f6b165fcfbd4378763 100644 (file)
--- 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 bf804678456a9c0d5f772b5be207a3d67e20d9b9..10b0a61a2a680ed86cbacf5d132fe7759ee9f042 100644 (file)
--- 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 fc296bd5fbcf15932554cf373c96eabadabcc328..06886c70a616e539bbbab7ac1bb4970cac4ed715 100644 (file)
--- 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 89b1ce0e10d3f14bcf4c8719c0b7132a89e8a3ad..3105badf412a269772c5be4ddfeb0e51ce83d5b0 100644 (file)
--- 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 950666fda7dc4859e7f3cfcabf7b218cb7caa1eb..67b7f6d566f16afac0da50228a0431ae75665ffd 100644 (file)
--- 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 01241aa3404ce62ad836efc1facb5078c0bd3ead..d99c821f6d1c272e9961cedc893bf0acca54e7fb 100644 (file)
--- 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
similarity index 100%
rename from sysdeps/unix/sysv/linux/aarch64/bits/libc-vdso.h
rename to 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 60fbde61003bf253df14ab1efbda1e3b846baf5e..9b31d8c9254b48b5ada39b6b3380a225140a5744 100644 (file)
--- 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 57db8ee4d53cd437b3f121b7896f7eb8da0d32dd..93aa0951d7d5022d3d585220b99004dda8b82e78 100644 (file)
--- 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 fe8c5a15b30205e8b9a063fbb77f1a1c983181a4..5b6bb51ab531541e4be9fb57cdde3fb66e1a362d 100644 (file)
--- 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 f50cf7e136d6a1f5187d3830573c00c2946418f0..f561ac7d1534a328b61e426639526c1304959a99 100644 (file)
--- 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 c1903ca778e1a27ac17292bca2cb22b0b638b7fa..b4917d12a5e081e190eb50114cbe82c78ad8f5ea 100644 (file)
--- 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
similarity index 100%
rename from sysdeps/unix/sysv/linux/powerpc/bits/libc-vdso.h
rename to 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 11d3d6b60ee1b0c1a0fd6342bbe31f286100c76a..5bf540c19a1e15af9a9c3df830eaeeb8333cf694 100644 (file)
--- 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 d72e651eb3a30adc49d014fa678dd545a01d10e4..0c26508f43c719cce2a9a9745a77828f6f464820 100644 (file)
--- 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 68acca4c9a98b7b24ce0e5680d288ff273b4fa0d..e8dee26842eb0494e8e40979f197494ad830cc6a 100644 (file)
--- 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 3f167a7de2863db7976d3ac968f533a818b5ce14..2e00a99866ca1eb7fa861076c7d267df48d4fe2c 100644 (file)
--- 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
similarity index 100%
rename from sysdeps/unix/sysv/linux/s390/bits/libc-vdso.h
rename to 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 05c62987122537725bb4e89527cf04fc60899ee1..8d34b403a2a031f3113338acabe53bfd38b11a86 100644 (file)
--- 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 75dbfd79b906bc95fe01e05a9fc12ffa270f9198..6b0e26a35ebfdc113ceb9b3ebbd52d7a30634bfd 100644 (file)
--- 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
similarity index 100%
rename from sysdeps/unix/sysv/linux/tile/bits/libc-vdso.h
rename to 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 c1626952c1f621f012bac1b3ccb15e9c57470532..25616493cdd04b6b6adabfc711128176c3e8a0a5 100644 (file)
--- 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