lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-30 22:43:12 +03:00
Code Activity

s390: Enable VDSO for static linking

Browse Source 
Although s390 only enables vDSO for dynamically linked elf binaries
(arch/s390/kernel/vdso.c:217), there is no indication in the code or
associated commit message for why not enable it for statically linked
binaries as well.  To double check, I rebuilt a kernel with the
check removed and the vDSO does work for static build for supplied
symbols.

Checked on s390x-linux-gnu and s390-linux-gnu.

	[BZ #19767]
	* sysdeps/unix/sysv/linux/s390/init-first.c: Remove #ifdef SHARED.
	* sysdeps/unix/sysv/linux/s390/libc-vdso.h: Likewise.
	* sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h
	(ALWAYS_USE_VSYSCALL): Define.
	* sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h
	(ALWAYS_USE_VSYSCALL): Likewise.
This commit is contained in:
Adhemerval Zanella
2019-05-30 08:04:06 -03:00
parent 27a0914e45
commit 5e855c8954
5 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,5 +1,13 @@
2019-08-05 Adhemerval Zanella <adhemerval.zanella@linaro.org> 2019-08-05 Adhemerval Zanella <adhemerval.zanella@linaro.org>
[BZ #19767]
* sysdeps/unix/sysv/linux/s390/init-first.c: Remove #ifdef SHARED.
* sysdeps/unix/sysv/linux/s390/libc-vdso.h: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h
(ALWAYS_USE_VSYSCALL): Define.
* sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h
(ALWAYS_USE_VSYSCALL): Likewise.
[BZ #19767] [BZ #19767]
* sysdeps/unix/sysv/linux/riscv/init-first.c: Remove #ifdef SHARED. * sysdeps/unix/sysv/linux/riscv/init-first.c: Remove #ifdef SHARED.
* sysdeps/unix/sysv/linux/riscv/libc-vdso.h: Likewise. * sysdeps/unix/sysv/linux/riscv/libc-vdso.h: Likewise.

8
sysdeps/unix/sysv/linux/s390/init-first.c
View File

@ -16,9 +16,8 @@
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>
long int (*VDSO_SYMBOL(gettimeofday)) (struct timeval *, void *) long int (*VDSO_SYMBOL(gettimeofday)) (struct timeval *, void *)
attribute_hidden; attribute_hidden;
@ -54,7 +53,4 @@ _libc_vdso_platform_setup (void)
VDSO_SYMBOL (getcpu) = p; VDSO_SYMBOL (getcpu) = p;
} }
# define VDSO_SETUP _libc_vdso_platform_setup
#endif
#include <csu/init-first.c> #include <csu/init-first.c>

3
sysdeps/unix/sysv/linux/s390/libc-vdso.h
View File

@ -20,8 +20,6 @@
#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 long int (*VDSO_SYMBOL(gettimeofday)) (struct timeval *, void *) extern long int (*VDSO_SYMBOL(gettimeofday)) (struct timeval *, void *)
@ -33,6 +31,5 @@ extern long int (*VDSO_SYMBOL(clock_getres)) (clockid_t, struct timespec *);
extern long int (*VDSO_SYMBOL(getcpu)) (unsigned *, unsigned *, void *) extern long int (*VDSO_SYMBOL(getcpu)) (unsigned *, unsigned *, void *)
attribute_hidden; attribute_hidden;
#endif
#endif /* _LIBC_VDSO_H */ #endif /* _LIBC_VDSO_H */

3
sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h
View File

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

3
sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h
View File

@ -20,6 +20,9 @@
#ifndef _LINUX_S390_SYSDEP_H #ifndef _LINUX_S390_SYSDEP_H
#define _LINUX_S390_SYSDEP_H #define _LINUX_S390_SYSDEP_H
/* Always enable vsyscalls on s390-64. */
#define ALWAYS_USE_VSYSCALL 1
#include <sysdeps/s390/s390-64/sysdep.h> #include <sysdeps/s390/s390-64/sysdep.h>
#include <sysdeps/unix/sysdep.h> #include <sysdeps/unix/sysdep.h>
#include <sysdeps/unix/sysv/linux/sysdep.h> #include <sysdeps/unix/sysv/linux/sysdep.h>