mirrors/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-24 10:22:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Enable VDSO for static linking on arm

Browse Source 
I have tested that this builds and the resulting program still work.
The kernel in gcc117 (which I ussed for testing) seems to be missing
https://patchwork.kernel.org/patch/10060431/, so the vdso is never used.

	[BZ #19767]
	* sysdeps/unix/sysv/linux/arm/init-first.c: Remove #ifdef SHARED.
	* sysdeps/unix/sysv/linux/arm/libc-vdso.h: Remove #ifdef SHARED.
	* sysdeps/unix/sysv/linux/arm/sysdep.h: Define
	ALWAYS_USE_VSYSCALL.
This commit is contained in:
Rafael Ávila de Espíndola 2018-12-03 20:59:22 +00:00 committed by Joseph Myers
parent f5ec0ea9ea
commit 6af956e5c0
4 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2018-12-03 Rafael Ávila de Espíndola <rafael@espindo.la>
[BZ #19767]
* sysdeps/unix/sysv/linux/arm/init-first.c: Remove #ifdef SHARED.
* sysdeps/unix/sysv/linux/arm/libc-vdso.h: Remove #ifdef SHARED.
* sysdeps/unix/sysv/linux/arm/sysdep.h: Define
ALWAYS_USE_VSYSCALL.
2018-12-03 Adhemerval Zanella <adhemerval.zanella@linaro.org> 2018-12-03 Adhemerval Zanella <adhemerval.zanella@linaro.org>
[BZ #23913] [BZ #23913]

9
sysdeps/unix/sysv/linux/arm/init-first.c
View File

@ -17,9 +17,9 @@
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> #include <sysdep-vdso.h>
int (*VDSO_SYMBOL(gettimeofday)) (struct timeval *, void *) attribute_hidden; int (*VDSO_SYMBOL(gettimeofday)) (struct timeval *, void *) attribute_hidden;
int (*VDSO_SYMBOL(clock_gettime)) (clockid_t, struct timespec *); int (*VDSO_SYMBOL(clock_gettime)) (clockid_t, struct timespec *);
@ -38,7 +38,6 @@ _libc_vdso_platform_setup (void)
VDSO_SYMBOL (clock_gettime) = p; VDSO_SYMBOL (clock_gettime) = p;
} }
# 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>

6
sysdeps/unix/sysv/linux/arm/libc-vdso.h
View File

@ -20,14 +20,10 @@
#ifndef _LIBC_VDSO_H #ifndef _LIBC_VDSO_H
#define _LIBC_VDSO_H #define _LIBC_VDSO_H
#ifdef SHARED #include <sysdep-vdso.h>
# include <sysdep-vdso.h>
extern int (*VDSO_SYMBOL(gettimeofday)) (struct timeval *, void *) extern int (*VDSO_SYMBOL(gettimeofday)) (struct timeval *, void *)
attribute_hidden; attribute_hidden;
extern int (*VDSO_SYMBOL(clock_gettime)) (clockid_t, struct timespec *); extern int (*VDSO_SYMBOL(clock_gettime)) (clockid_t, struct timespec *);
#endif
#endif /* _LIBC_VDSO_H */ #endif /* _LIBC_VDSO_H */

3
sysdeps/unix/sysv/linux/arm/sysdep.h
View File

@ -20,6 +20,9 @@
#ifndef _LINUX_ARM_SYSDEP_H #ifndef _LINUX_ARM_SYSDEP_H
#define _LINUX_ARM_SYSDEP_H 1 #define _LINUX_ARM_SYSDEP_H 1
/* Always enable vsyscalls on arm */
#define ALWAYS_USE_VSYSCALL 1
/* There is some commonality. */ /* There is some commonality. */
#include <sysdeps/unix/sysv/linux/sysdep.h> #include <sysdeps/unix/sysv/linux/sysdep.h>
#include <sysdeps/unix/arm/sysdep.h> #include <sysdeps/unix/arm/sysdep.h>