GNU C Library master sources branch master updated. glibc-2.28.9000-349-g6af956e

jsm28@sourceware.org jsm28@sourceware.org
Mon Dec 3 21:00:00 GMT 2018


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  6af956e5c019637051ba8cfb46cfff9bbe574500 (commit)
      from  f5ec0ea9eaf9753188a0bfa391b101ea8d5efc2b (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=6af956e5c019637051ba8cfb46cfff9bbe574500

commit 6af956e5c019637051ba8cfb46cfff9bbe574500
Author: Rafael Ávila de Espíndola <rafael@espindo.la>
Date:   Mon Dec 3 20:59:22 2018 +0000

    Enable VDSO for static linking on arm
    
    I have tested that this builds and the resulting program still work.
    The kernel in gcc117 (which I ussed for testing) seems to be missing
    https://patchwork.kernel.org/patch/10060431/, so the vdso is never used.
    
    	[BZ #19767]
    	* sysdeps/unix/sysv/linux/arm/init-first.c: Remove #ifdef SHARED.
    	* sysdeps/unix/sysv/linux/arm/libc-vdso.h: Remove #ifdef SHARED.
    	* sysdeps/unix/sysv/linux/arm/sysdep.h: Define
    	ALWAYS_USE_VSYSCALL.

diff --git a/ChangeLog b/ChangeLog
index c094c90..a534c4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2018-12-03  Rafael Ávila de Espíndola  <rafael@espindo.la>
+
+	[BZ #19767]
+	* sysdeps/unix/sysv/linux/arm/init-first.c: Remove #ifdef SHARED.
+	* sysdeps/unix/sysv/linux/arm/libc-vdso.h: Remove #ifdef SHARED.
+	* sysdeps/unix/sysv/linux/arm/sysdep.h: Define
+	ALWAYS_USE_VSYSCALL.
+
 2018-12-03  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
 
 	[BZ #23913]
diff --git a/sysdeps/unix/sysv/linux/arm/init-first.c b/sysdeps/unix/sysv/linux/arm/init-first.c
index f4293b1..7fbdc27 100644
--- a/sysdeps/unix/sysv/linux/arm/init-first.c
+++ b/sysdeps/unix/sysv/linux/arm/init-first.c
@@ -17,9 +17,9 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#ifdef SHARED
-# include <dl-vdso.h>
-# include <libc-vdso.h>
+#include <dl-vdso.h>
+#include <libc-vdso.h>
+#include <sysdep-vdso.h>
 
 int (*VDSO_SYMBOL(gettimeofday)) (struct timeval *, void *) attribute_hidden;
 int (*VDSO_SYMBOL(clock_gettime)) (clockid_t, struct timespec *);
@@ -38,7 +38,6 @@ _libc_vdso_platform_setup (void)
   VDSO_SYMBOL (clock_gettime) = p;
 }
 
-# define VDSO_SETUP _libc_vdso_platform_setup
-#endif
+#define VDSO_SETUP _libc_vdso_platform_setup
 
 #include <csu/init-first.c>
diff --git a/sysdeps/unix/sysv/linux/arm/libc-vdso.h b/sysdeps/unix/sysv/linux/arm/libc-vdso.h
index 52dd355..2a8979d 100644
--- a/sysdeps/unix/sysv/linux/arm/libc-vdso.h
+++ b/sysdeps/unix/sysv/linux/arm/libc-vdso.h
@@ -20,14 +20,10 @@
 #ifndef _LIBC_VDSO_H
 #define _LIBC_VDSO_H
 
-#ifdef SHARED
-
-# include <sysdep-vdso.h>
+#include <sysdep-vdso.h>
 
 extern int (*VDSO_SYMBOL(gettimeofday)) (struct timeval *, void *)
    attribute_hidden;
 extern int (*VDSO_SYMBOL(clock_gettime)) (clockid_t, struct timespec *);
 
-#endif
-
 #endif /* _LIBC_VDSO_H */
diff --git a/sysdeps/unix/sysv/linux/arm/sysdep.h b/sysdeps/unix/sysv/linux/arm/sysdep.h
index 174c530..3902d46 100644
--- a/sysdeps/unix/sysv/linux/arm/sysdep.h
+++ b/sysdeps/unix/sysv/linux/arm/sysdep.h
@@ -20,6 +20,9 @@
 #ifndef _LINUX_ARM_SYSDEP_H
 #define _LINUX_ARM_SYSDEP_H 1
 
+/* Always enable vsyscalls on arm */
+#define ALWAYS_USE_VSYSCALL 1
+
 /* There is some commonality.  */
 #include <sysdeps/unix/sysv/linux/sysdep.h>
 #include <sysdeps/unix/arm/sysdep.h>

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

Summary of changes:
 ChangeLog                                |    8 ++++++++
 sysdeps/unix/sysv/linux/arm/init-first.c |    9 ++++-----
 sysdeps/unix/sysv/linux/arm/libc-vdso.h  |    6 +-----
 sysdeps/unix/sysv/linux/arm/sysdep.h     |    3 +++
 4 files changed, 16 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources



More information about the Glibc-cvs mailing list