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.
This commit is contained in:
Rafael Ávila de Espíndola 2018-11-27 12:27:39 +00:00 committed by Szabolcs Nagy
parent ce035c6e90
commit 979cfed05d
4 changed files with 15 additions and 10 deletions

View File

@ -1,3 +1,10 @@
2018-11-27 Rafael Ávila de Espíndola <rafael@espindo.la>
[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: Define ALWAYS_USE_VSYSCALL.
2018-11-26 Carlos O'Donell <carlos@redhat.com> 2018-11-26 Carlos O'Donell <carlos@redhat.com>
* scripts/abilist.awk: Handle .tdata. Error for unknown combinations. * scripts/abilist.awk: Handle .tdata. Error for unknown combinations.

View File

@ -16,7 +16,6 @@
License along with the GNU C Library; if not, see License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */ <http://www.gnu.org/licenses/>. */
#ifdef SHARED
#include <dl-vdso.h> #include <dl-vdso.h>
#include <libc-vdso.h> #include <libc-vdso.h>
@ -47,6 +46,5 @@ _libc_vdso_platform_setup (void)
} }
#define VDSO_SETUP _libc_vdso_platform_setup #define VDSO_SETUP _libc_vdso_platform_setup
#endif
#include <csu/init-first.c> #include <csu/init-first.c>

View File

@ -19,8 +19,7 @@
#ifndef _LIBC_VDSO_H #ifndef _LIBC_VDSO_H
#define _LIBC_VDSO_H #define _LIBC_VDSO_H
#ifdef SHARED #include <sysdep.h>
#include <sysdep-vdso.h> #include <sysdep-vdso.h>
extern int (*VDSO_SYMBOL(gettimeofday)) (struct timeval *, void *) extern int (*VDSO_SYMBOL(gettimeofday)) (struct timeval *, void *)
@ -28,6 +27,4 @@ extern int (*VDSO_SYMBOL(gettimeofday)) (struct timeval *, void *)
extern int (*VDSO_SYMBOL(clock_gettime)) (clockid_t, struct timespec *); extern int (*VDSO_SYMBOL(clock_gettime)) (clockid_t, struct timespec *);
extern int (*VDSO_SYMBOL(clock_getres)) (clockid_t, struct timespec *); extern int (*VDSO_SYMBOL(clock_getres)) (clockid_t, struct timespec *);
#endif
#endif /* _LIBC_VDSO_H */ #endif /* _LIBC_VDSO_H */

View File

@ -19,6 +19,9 @@
#ifndef _LINUX_AARCH64_SYSDEP_H #ifndef _LINUX_AARCH64_SYSDEP_H
#define _LINUX_AARCH64_SYSDEP_H 1 #define _LINUX_AARCH64_SYSDEP_H 1
/* Always enable vsyscalls on aarch64 */
#define ALWAYS_USE_VSYSCALL 1
#include <sysdeps/unix/sysdep.h> #include <sysdeps/unix/sysdep.h>
#include <sysdeps/aarch64/sysdep.h> #include <sysdeps/aarch64/sysdep.h>
#include <sysdeps/unix/sysv/linux/generic/sysdep.h> #include <sysdeps/unix/sysv/linux/generic/sysdep.h>