This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH] Enable VDSO on i386 statically linked programs.
- From: Rafael Avila de Espindola <rafael at espindo dot la>
- To: libc-alpha at sourceware dot org, "H.J. Lu" <hjl dot tools at gmail dot com>, Florian Weimer <fweimer at redhat dot com>, Szabolcs Nagy <szabolcs dot nagy at arm dot com>
- Date: Wed, 10 Oct 2018 04:51:10 +0000
- Subject: [PATCH] Enable VDSO on i386 statically linked programs.
- Reply-to: Rafael Avila de Espindola <rafael at espindo dot la>
Now that the infrastructure is in place this is pretty easy.
---
sysdeps/unix/sysv/linux/i386/init-first.c | 12 +++++-------
sysdeps/unix/sysv/linux/i386/sysdep.h | 5 +++++
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/sysdeps/unix/sysv/linux/i386/init-first.c b/sysdeps/unix/sysv/linux/i386/init-first.c
index 82ac7f5cf2..6e62dd5923 100644
--- a/sysdeps/unix/sysv/linux/i386/init-first.c
+++ b/sysdeps/unix/sysv/linux/i386/init-first.c
@@ -16,11 +16,10 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifdef SHARED
-# include <time.h>
-# include <sysdep.h>
-# include <dl-vdso.h>
-# include <sysdep-vdso.h>
+#include <time.h>
+#include <sysdep.h>
+#include <dl-vdso.h>
+#include <sysdep-vdso.h>
long int (*VDSO_SYMBOL (clock_gettime)) (clockid_t, struct timespec *)
attribute_hidden;
@@ -44,7 +43,6 @@ __vdso_platform_setup (void)
VDSO_SYMBOL (clock_gettime) = p;
}
-# define VDSO_SETUP __vdso_platform_setup
-#endif
+#define VDSO_SETUP __vdso_platform_setup
#include <csu/init-first.c>
diff --git a/sysdeps/unix/sysv/linux/i386/sysdep.h b/sysdeps/unix/sysv/linux/i386/sysdep.h
index 3255cc78b8..cd44727ae6 100644
--- a/sysdeps/unix/sysv/linux/i386/sysdep.h
+++ b/sysdeps/unix/sysv/linux/i386/sysdep.h
@@ -19,6 +19,11 @@
#ifndef _LINUX_I386_SYSDEP_H
#define _LINUX_I386_SYSDEP_H 1
+/* Always enable vsyscalls on i386 */
+#ifndef USE_VSYSCALL
+#define USE_VSYSCALL
+#endif
+
/* There is some commonality. */
#include <sysdeps/unix/sysv/linux/sysdep.h>
#include <sysdeps/unix/i386/sysdep.h>
--
2.17.1