diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2019-05-30 08:04:06 -0300 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2019-08-05 16:38:22 -0300 |
| commit | 5e855c8954014bca7b0d6f07312ec09553695ffd (patch) | |
| tree | 92f5a75cdb6c24563b8f02bf9497276c6968b0f5 /sysdeps/unix/sysv/linux | |
| parent | 27a0914e4586b06375b20731fa6515fe30334373 (diff) | |
| download | glibc-5e855c8954014bca7b0d6f07312ec09553695ffd.tar.gz glibc-5e855c8954014bca7b0d6f07312ec09553695ffd.tar.xz glibc-5e855c8954014bca7b0d6f07312ec09553695ffd.zip | |
s390: Enable VDSO for static linking
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.
Diffstat (limited to 'sysdeps/unix/sysv/linux')
| -rw-r--r-- | sysdeps/unix/sysv/linux/s390/init-first.c | 8 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/s390/libc-vdso.h | 3 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h | 3 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h | 3 |
4 files changed, 8 insertions, 9 deletions
diff --git a/sysdeps/unix/sysv/linux/s390/init-first.c b/sysdeps/unix/sysv/linux/s390/init-first.c index 1f46e8052a..8c54d13935 100644 --- a/sysdeps/unix/sysv/linux/s390/init-first.c +++ b/sysdeps/unix/sysv/linux/s390/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> long int (*VDSO_SYMBOL(gettimeofday)) (struct timeval *, void *) attribute_hidden; @@ -54,7 +53,4 @@ _libc_vdso_platform_setup (void) VDSO_SYMBOL (getcpu) = p; } -# define VDSO_SETUP _libc_vdso_platform_setup -#endif - #include <csu/init-first.c> diff --git a/sysdeps/unix/sysv/linux/s390/libc-vdso.h b/sysdeps/unix/sysv/linux/s390/libc-vdso.h index 5e2d1e4b3f..cc97601383 100644 --- a/sysdeps/unix/sysv/linux/s390/libc-vdso.h +++ b/sysdeps/unix/sysv/linux/s390/libc-vdso.h @@ -20,8 +20,6 @@ #ifndef _LIBC_VDSO_H #define _LIBC_VDSO_H -#ifdef SHARED - #include <sysdep-vdso.h> 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 *) attribute_hidden; -#endif #endif /* _LIBC_VDSO_H */ diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h b/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h index 640fb52de1..47d1c5cdb2 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h +++ b/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h @@ -19,6 +19,9 @@ #ifndef _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/unix/sysdep.h> #include <sysdeps/unix/sysv/linux/sysdep.h> diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h b/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h index 9a9834c750..2552aaa711 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h +++ b/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h @@ -20,6 +20,9 @@ #ifndef _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/unix/sysdep.h> #include <sysdeps/unix/sysv/linux/sysdep.h> |