This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]
GNU C Library master sources branch master updated. glibc-2.21-277-g7bf8fb1

From: azanella at sourceware dot org
To: glibc-cvs at sourceware dot org
Date: 20 Apr 2015 12:54:20 -0000
Subject: GNU C Library master sources branch master updated. glibc-2.21-277-g7bf8fb1
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  7bf8fb104226407b75103b95525364c4667c869f (commit)
      from  03c1e456b079929a8290aeb4aadb05c0df73bfd2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=7bf8fb104226407b75103b95525364c4667c869f

commit 7bf8fb104226407b75103b95525364c4667c869f
Author: Adhemerval Zanella <adhemerval.zanella@linaro.com>
Date:   Mon Apr 13 16:38:16 2015 -0300

    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 a1d49cb..7c3e625 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 bf80467..10b0a61 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 fc296bd..06886c7 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 89b1ce0..3105bad 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 950666f..67b7f6d 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 01241aa..d99c821 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
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 60fbde6..9b31d8c 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 57db8ee..93aa095 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 fe8c5a1..5b6bb51 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 f50cf7e..f561ac7 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 c1903ca..b4917d1 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
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 11d3d6b..5bf540c 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 d72e651..0c26508 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 68acca4..e8dee26 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 3f167a7..2e00a99 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
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 05c6298..8d34b40 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 75dbfd7..6b0e26a 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
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 c162695..2561649 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

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                                          |   28 ++++++++++++++++++++
 nptl/pthread_cond_timedwait.c                      |    2 +-
 sysdeps/powerpc/powerpc32/backtrace.c              |    2 +-
 sysdeps/powerpc/powerpc64/backtrace.c              |    2 +-
 sysdeps/unix/sysv/linux/aarch64/gettimeofday.c     |    2 +-
 sysdeps/unix/sysv/linux/aarch64/init-first.c       |    2 +-
 .../unix/sysv/linux/aarch64/{bits => }/libc-vdso.h |    0
 sysdeps/unix/sysv/linux/clock_getres.c             |    2 +-
 sysdeps/unix/sysv/linux/clock_gettime.c            |    2 +-
 sysdeps/unix/sysv/linux/powerpc/get_clockfreq.c    |    2 +-
 sysdeps/unix/sysv/linux/powerpc/gettimeofday.c     |    2 +-
 sysdeps/unix/sysv/linux/powerpc/init-first.c       |    2 +-
 .../unix/sysv/linux/powerpc/{bits => }/libc-vdso.h |    0
 sysdeps/unix/sysv/linux/powerpc/sched_getcpu.c     |    2 +-
 sysdeps/unix/sysv/linux/powerpc/time.c             |    2 +-
 sysdeps/unix/sysv/linux/s390/gettimeofday.c        |    2 +-
 sysdeps/unix/sysv/linux/s390/init-first.c          |    2 +-
 .../unix/sysv/linux/s390/{bits => }/libc-vdso.h    |    0
 sysdeps/unix/sysv/linux/tile/gettimeofday.c        |    2 +-
 sysdeps/unix/sysv/linux/tile/init-first.c          |    2 +-
 .../unix/sysv/linux/tile/{bits => }/libc-vdso.h    |    0
 sysdeps/unix/sysv/linux/timespec_get.c             |    2 +-
 22 files changed, 45 insertions(+), 17 deletions(-)
 rename sysdeps/unix/sysv/linux/aarch64/{bits => }/libc-vdso.h (100%)
 rename sysdeps/unix/sysv/linux/powerpc/{bits => }/libc-vdso.h (100%)
 rename sysdeps/unix/sysv/linux/s390/{bits => }/libc-vdso.h (100%)
 rename sysdeps/unix/sysv/linux/tile/{bits => }/libc-vdso.h (100%)


hooks/post-receive
-- 
GNU C Library master sources
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]