From 979cfed05d0ee5a9d81d310ea1eb2d590739e36b Mon Sep 17 00:00:00 2001
From: Rafael Ávila de Espíndola <rafael@espindo.la>
Date: Tue, 27 Nov 2018 12:27:39 +0000
Subject: Enable VDSO for static linking on aarch64

	[BZ #19767]
	* sysdeps/unix/sysv/linux/aarch64/init-first.c: Remove #ifdef SHARED.
	* sysdeps/unix/sysv/linux/aarch64/libc-vdso.h: Remove #ifdef SHARED.
	* sysdeps/unix/sysv/linux/aarch64/sysdep.h (ALWAYS_USE_VSYSCALL):
	Define.
---
 sysdeps/unix/sysv/linux/aarch64/init-first.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'sysdeps/unix/sysv/linux/aarch64/init-first.c')

diff --git a/sysdeps/unix/sysv/linux/aarch64/init-first.c b/sysdeps/unix/sysv/linux/aarch64/init-first.c
index 4c1895a1b9..cdc34bd1c1 100644
--- a/sysdeps/unix/sysv/linux/aarch64/init-first.c
+++ b/sysdeps/unix/sysv/linux/aarch64/init-first.c
@@ -16,9 +16,8 @@
    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>
 
 int (*VDSO_SYMBOL(gettimeofday)) (struct timeval *, void *) attribute_hidden;
 int (*VDSO_SYMBOL(clock_gettime)) (clockid_t, struct timespec *);
@@ -46,7 +45,6 @@ _libc_vdso_platform_setup (void)
   VDSO_SYMBOL(clock_getres) = p;
 }
 
-# define VDSO_SETUP _libc_vdso_platform_setup
-#endif
+#define VDSO_SETUP _libc_vdso_platform_setup
 
 #include <csu/init-first.c>
-- 
cgit 1.4.1