[03/12] s390: Enable VDSO for static linking
Commit Message
Although s390 explicit does not enable vDSO for binaries without
(arch/s390/kernel/vdso.c:217), there is no indication in the code
the rationale for disabling it. In fact, I rebuilt a kernel with the
check removed and the vDSO does work for static build for supplied
symbols.
Checked on s390x-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.
---
sysdeps/unix/sysv/linux/s390/init-first.c | 8 ++------
sysdeps/unix/sysv/linux/s390/libc-vdso.h | 3 ---
sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h | 3 +++
sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h | 4 ++++
4 files changed, 9 insertions(+), 9 deletions(-)
Comments
Ping.
On 14/06/2019 12:28, Adhemerval Zanella wrote:
> Although s390 explicit does not enable vDSO for binaries without
> (arch/s390/kernel/vdso.c:217), there is no indication in the code
> the rationale for disabling it. In fact, I rebuilt a kernel with the
> check removed and the vDSO does work for static build for supplied
> symbols.
>
> Checked on s390x-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.
> ---
> sysdeps/unix/sysv/linux/s390/init-first.c | 8 ++------
> sysdeps/unix/sysv/linux/s390/libc-vdso.h | 3 ---
> sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h | 3 +++
> sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h | 4 ++++
> 4 files changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/sysdeps/unix/sysv/linux/s390/init-first.c b/sysdeps/unix/sysv/linux/s390/init-first.c
> index 71dd43f738..847977c0d9 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..95829390e2 100644
> --- a/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h
> +++ b/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h
> @@ -20,6 +20,10 @@
> #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>
>
@@ -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>
@@ -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 */
@@ -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>
@@ -20,6 +20,10 @@
#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>