about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@suse.de>2019-09-24 12:16:37 +0200
committerAndreas Schwab <schwab@suse.de>2019-09-24 13:40:26 +0200
commiteb502f72cda31fc9ebe37689491a0fdac93f67c8 (patch)
treeed1160c712450d992915464c608e9d1d3832d9c3
parentf2144b7874b23be7c7eb184ec601633ec6fa8fac (diff)
downloadglibc-eb502f72cda31fc9ebe37689491a0fdac93f67c8.tar.gz
glibc-eb502f72cda31fc9ebe37689491a0fdac93f67c8.tar.xz
glibc-eb502f72cda31fc9ebe37689491a0fdac93f67c8.zip
Fix vDSO initialization on arm and mips
-rw-r--r--ChangeLog15
-rw-r--r--sysdeps/unix/sysv/linux/arm/sysdep.h4
-rw-r--r--sysdeps/unix/sysv/linux/mips/sysdep.h4
3 files changed, 18 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index cda7b8cc97..f6f61439f4 100644
--- 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 f9cc9335f5..e9e022e037 100644
--- 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 b2045fcc55..82a3cf9f3d 100644
--- 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__