about summary refs log tree commit diff
path: root/sysdeps
diff options
context:
space:
mode:
authorRafael Ávila de Espíndola <rafael@espindo.la>2018-11-27 12:27:39 +0000
committerSzabolcs Nagy <szabolcs.nagy@arm.com>2018-11-27 12:27:39 +0000
commit979cfed05d0ee5a9d81d310ea1eb2d590739e36b (patch)
tree2c6c4a5824882495057ee269607aa6869ae29343 /sysdeps
parentce035c6e909ad20ef2fe13c92eab4e69f6495b61 (diff)
downloadglibc-979cfed05d0ee5a9d81d310ea1eb2d590739e36b.tar.gz
glibc-979cfed05d0ee5a9d81d310ea1eb2d590739e36b.tar.xz
glibc-979cfed05d0ee5a9d81d310ea1eb2d590739e36b.zip
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.
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/unix/sysv/linux/aarch64/init-first.c8
-rw-r--r--sysdeps/unix/sysv/linux/aarch64/libc-vdso.h7
-rw-r--r--sysdeps/unix/sysv/linux/aarch64/sysdep.h3
3 files changed, 8 insertions, 10 deletions
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>
diff --git a/sysdeps/unix/sysv/linux/aarch64/libc-vdso.h b/sysdeps/unix/sysv/linux/aarch64/libc-vdso.h
index 65b2228662..c646633ae0 100644
--- a/sysdeps/unix/sysv/linux/aarch64/libc-vdso.h
+++ b/sysdeps/unix/sysv/linux/aarch64/libc-vdso.h
@@ -19,15 +19,12 @@
 #ifndef _LIBC_VDSO_H
 #define _LIBC_VDSO_H
 
-#ifdef SHARED
-
-# include <sysdep-vdso.h>
+#include <sysdep.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 *);
 extern int (*VDSO_SYMBOL(clock_getres)) (clockid_t, struct timespec *);
 
-#endif
-
 #endif /* _LIBC_VDSO_H */
diff --git a/sysdeps/unix/sysv/linux/aarch64/sysdep.h b/sysdeps/unix/sysv/linux/aarch64/sysdep.h
index 9ac2f0702a..dc529d22fb 100644
--- a/sysdeps/unix/sysv/linux/aarch64/sysdep.h
+++ b/sysdeps/unix/sysv/linux/aarch64/sysdep.h
@@ -19,6 +19,9 @@
 #ifndef _LINUX_AARCH64_SYSDEP_H
 #define _LINUX_AARCH64_SYSDEP_H 1
 
+/* Always enable vsyscalls on aarch64 */
+#define ALWAYS_USE_VSYSCALL 1
+
 #include <sysdeps/unix/sysdep.h>
 #include <sysdeps/aarch64/sysdep.h>
 #include <sysdeps/unix/sysv/linux/generic/sysdep.h>