Fix vDSO initialization on arm and mips

diff --git a/ChangeLog b/ChangeLog
index cda7b8cc97402cefd8176e88c409b31e2b56c02a..f6f61439f4a4eb78022600ad5c716ccbae98fa6b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
+2019-09-24  Andreas Schwab  <schwab@suse.de>
+
+       * sysdeps/unix/sysv/linux/arm/sysdep.h
+       (HAVE_CLOCK_GETTIME_VSYSCALL): Define to "__vdso_clock_gettime",
+       not "__vdso_gettimeofday".
+       (HAVE_GETTIMEOFDAY_VSYSCALL): Define to "__vdso_gettimeofday", not
+       "__vdso_clock_gettime".
+       * sysdeps/unix/sysv/linux/mips/sysdep.h
+       (HAVE_CLOCK_GETTIME_VSYSCALL): Define to "__vdso_clock_gettime",
+       not "__vdso_gettimeofday".
+       (HAVE_GETTIMEOFDAY_VSYSCALL): Define to "__vdso_gettimeofday", not
+       "__vdso_clock_gettime".
+
 2019-09-19  Paul A. Clarke  <pc@us.ibm.com>
-    
+
        * sysdeps/powerpc/fpu/fenv_libc.h (fegetenv_and_set_rn): New.
        (__fe_mffscrn): New.
        * sysdeps/powerpc/fpu/fenv_private.h (libc_feholdsetround_ppc_ctx):

diff --git a/sysdeps/unix/sysv/linux/arm/sysdep.h b/sysdeps/unix/sysv/linux/arm/sysdep.h
index f9cc9335f513e9e02c1cc237a008129e0f7c2363..e9e022e037259219d9b44b435155f7017534f157 100644 (file)
--- a/sysdeps/unix/sysv/linux/arm/sysdep.h
+++ b/sysdeps/unix/sysv/linux/arm/sysdep.h
@@ -392,8 +392,8 @@ __local_syscall_error:                                              \
 #define VDSO_HASH  61765110
 
 /* List of system calls which are supported as vsyscalls.  */
-#define HAVE_CLOCK_GETTIME_VSYSCALL    "__vdso_gettimeofday"
-#define HAVE_GETTIMEOFDAY_VSYSCALL     "__vdso_clock_gettime"
+#define HAVE_CLOCK_GETTIME_VSYSCALL    "__vdso_clock_gettime"
+#define HAVE_GETTIMEOFDAY_VSYSCALL     "__vdso_gettimeofday"
 
 #define LOAD_ARGS_0()
 #define ASM_ARGS_0

diff --git a/sysdeps/unix/sysv/linux/mips/sysdep.h b/sysdeps/unix/sysv/linux/mips/sysdep.h
index b2045fcc55b9334d57a660232cae99944a82dfa1..82a3cf9f3d998f8da186999088d491e13297f304 100644 (file)
--- a/sysdeps/unix/sysv/linux/mips/sysdep.h
+++ b/sysdeps/unix/sysv/linux/mips/sysdep.h
@@ -20,8 +20,8 @@
 #define VDSO_HASH  61765110
 
 /* List of system calls which are supported as vsyscalls.  */
-#define HAVE_CLOCK_GETTIME_VSYSCALL     "__vdso_gettimeofday"
-#define HAVE_GETTIMEOFDAY_VSYSCALL      "__vdso_clock_gettime"
+#define HAVE_CLOCK_GETTIME_VSYSCALL     "__vdso_clock_gettime"
+#define HAVE_GETTIMEOFDAY_VSYSCALL      "__vdso_gettimeofday"
 
 #ifndef __ASSEMBLER__