Enable VDSO on powerpc statically linked programs.
Commit Message
A new version is attached. It is on top of the latest x86_64 patch and has been tested on 32 and 64 bit powerpc.
2018-11-12 Rafael Ávila de Espíndola <rafael@espindo.la>
[BZ #19767]
* sysdeps/unix/sysv/linux/powerpc/init-first.c: remove #ifdef SHARED.
* sysdeps/unix/sysv/linux/powerpc/libc-vdso.h: remove #ifdef SHARED. Include sysdep.h.
* sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h: define ALWAYS_USE_VSYSCALL.
* sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h: define ALWAYS_USE_VSYSCALL.
Cheers,
Rafael
‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐
On Monday, November 12, 2018 12:47 AM, Andreas Schwab <schwab@suse.de> wrote:
> On Nov 12 2018, Rafael Avila de Espindola rafael@espindo.la wrote:
>
> > The gcc compile farm only has 64 bit powerpc machines, so that is all I was able to test.
>
> gcc110 also has -m32.
>
> Andreas.
>
> ----------------------------------
>
> Andreas Schwab, SUSE Labs, schwab@suse.de
> GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7
> "And now for something completely different."
Comments
Ping.
"Rafael Avila de Espindola" <rafael@espindo.la> writes:
> A new version is attached. It is on top of the latest x86_64 patch and has been tested on 32 and 64 bit powerpc.
>
> 2018-11-12 Rafael Ávila de Espíndola <rafael@espindo.la>
>
> [BZ #19767]
> * sysdeps/unix/sysv/linux/powerpc/init-first.c: remove #ifdef SHARED.
> * sysdeps/unix/sysv/linux/powerpc/libc-vdso.h: remove #ifdef SHARED. Include sysdep.h.
> * sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h: define ALWAYS_USE_VSYSCALL.
> * sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h: define ALWAYS_USE_VSYSCALL.
>
>
> Cheers,
> Rafael
>
>
> ‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐
> On Monday, November 12, 2018 12:47 AM, Andreas Schwab <schwab@suse.de> wrote:
>
>> On Nov 12 2018, Rafael Avila de Espindola rafael@espindo.la wrote:
>>
>> > The gcc compile farm only has 64 bit powerpc machines, so that is all I was able to test.
>>
>> gcc110 also has -m32.
>>
>> Andreas.
>>
>> ----------------------------------
>>
>> Andreas Schwab, SUSE Labs, schwab@suse.de
>> GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7
>> "And now for something completely different."
>
> From 811f103b6170d2e1b84611feeae5d27cd2b6648a Mon Sep 17 00:00:00 2001
> From: =?UTF-8?q?Rafael=20=C3=81vila=20de=20Esp=C3=ADndola?=
> <rafael@espindo.la>
> Date: Sun, 11 Nov 2018 17:53:10 -0800
> Subject: [PATCH] Enable VDSO on static on powerpc.
>
> ---
> sysdeps/unix/sysv/linux/powerpc/init-first.c | 8 +++-----
> sysdeps/unix/sysv/linux/powerpc/libc-vdso.h | 5 +----
> sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h | 3 +++
> sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h | 3 +++
> 4 files changed, 10 insertions(+), 9 deletions(-)
>
> diff --git a/sysdeps/unix/sysv/linux/powerpc/init-first.c b/sysdeps/unix/sysv/linux/powerpc/init-first.c
> index 0a4becbed6..c8a28008db 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/init-first.c
> +++ b/sysdeps/unix/sysv/linux/powerpc/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>
>
> int (*VDSO_SYMBOL(gettimeofday)) (struct timeval *, void *)
> attribute_hidden;
> @@ -79,7 +78,6 @@ _libc_vdso_platform_setup (void)
> #endif
> }
>
> -# define VDSO_SETUP _libc_vdso_platform_setup
> -#endif
> +#define VDSO_SETUP _libc_vdso_platform_setup
>
> #include <csu/init-first.c>
> diff --git a/sysdeps/unix/sysv/linux/powerpc/libc-vdso.h b/sysdeps/unix/sysv/linux/powerpc/libc-vdso.h
> index 5fe817d6cb..6f55944a51 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/libc-vdso.h
> +++ b/sysdeps/unix/sysv/linux/powerpc/libc-vdso.h
> @@ -20,8 +20,7 @@
> #ifndef _LIBC_VDSO_H
> #define _LIBC_VDSO_H
>
> -#ifdef SHARED
> -
> +#include <sysdep.h>
> #include <sysdep-vdso.h>
>
> extern int (*VDSO_SYMBOL(gettimeofday)) (struct timeval *, void *)
> @@ -69,6 +68,4 @@ extern void *VDSO_SYMBOL(sigtramp_rt32);
> #define VDSO_IFUNC_RET(value) ((void *) (value))
> #endif
>
> -#endif
> -
> #endif /* _LIBC_VDSO_H */
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h b/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h
> index ec5c5250f8..6fe0a9951f 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h
> @@ -18,6 +18,9 @@
> #ifndef _LINUX_POWERPC_SYSDEP_H
> #define _LINUX_POWERPC_SYSDEP_H 1
>
> +/* Always enable vsyscalls on powerpc32 */
> +#define ALWAYS_USE_VSYSCALL 1
> +
> #include <sysdeps/unix/sysv/linux/sysdep.h>
> #include <sysdeps/unix/powerpc/sysdep.h>
> #include <tls.h>
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h b/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h
> index 1f17f7bd5f..4d4015a03d 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h
> @@ -20,6 +20,9 @@
> #ifndef _LINUX_POWERPC_SYSDEP_H
> #define _LINUX_POWERPC_SYSDEP_H 1
>
> +/* Always enable vsyscalls on powerpc64 */
> +#define ALWAYS_USE_VSYSCALL 1
> +
> #include <sysdeps/unix/sysv/linux/sysdep.h>
> #include <sysdeps/unix/powerpc/sysdep.h>
> #include <tls.h>
> --
> 2.19.1
Rafael Avila de Espindola <rafael@espindo.la> writes:
> A new version is attached. It is on top of the latest x86_64 patch and has been tested on 32 and 64 bit powerpc.
>
> 2018-11-12 Rafael Ávila de Espíndola <rafael@espindo.la>
>
> [BZ #19767]
> * sysdeps/unix/sysv/linux/powerpc/init-first.c: remove #ifdef SHARED.
> * sysdeps/unix/sysv/linux/powerpc/libc-vdso.h: remove #ifdef SHARED. Include sysdep.h.
> * sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h: define ALWAYS_USE_VSYSCALL.
> * sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h: define ALWAYS_USE_VSYSCALL.
Tested on powerpc, powerpc64 and powerpc64le.
LGTM. I'm merging it.
Thanks!
From 811f103b6170d2e1b84611feeae5d27cd2b6648a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20=C3=81vila=20de=20Esp=C3=ADndola?=
<rafael@espindo.la>
Date: Sun, 11 Nov 2018 17:53:10 -0800
Subject: [PATCH] Enable VDSO on static on powerpc.
---
sysdeps/unix/sysv/linux/powerpc/init-first.c | 8 +++-----
sysdeps/unix/sysv/linux/powerpc/libc-vdso.h | 5 +----
sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h | 3 +++
sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h | 3 +++
4 files changed, 10 insertions(+), 9 deletions(-)
@@ -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>
int (*VDSO_SYMBOL(gettimeofday)) (struct timeval *, void *)
attribute_hidden;
@@ -79,7 +78,6 @@ _libc_vdso_platform_setup (void)
#endif
}
-# define VDSO_SETUP _libc_vdso_platform_setup
-#endif
+#define VDSO_SETUP _libc_vdso_platform_setup
#include <csu/init-first.c>
@@ -20,8 +20,7 @@
#ifndef _LIBC_VDSO_H
#define _LIBC_VDSO_H
-#ifdef SHARED
-
+#include <sysdep.h>
#include <sysdep-vdso.h>
extern int (*VDSO_SYMBOL(gettimeofday)) (struct timeval *, void *)
@@ -69,6 +68,4 @@ extern void *VDSO_SYMBOL(sigtramp_rt32);
#define VDSO_IFUNC_RET(value) ((void *) (value))
#endif
-#endif
-
#endif /* _LIBC_VDSO_H */
@@ -18,6 +18,9 @@
#ifndef _LINUX_POWERPC_SYSDEP_H
#define _LINUX_POWERPC_SYSDEP_H 1
+/* Always enable vsyscalls on powerpc32 */
+#define ALWAYS_USE_VSYSCALL 1
+
#include <sysdeps/unix/sysv/linux/sysdep.h>
#include <sysdeps/unix/powerpc/sysdep.h>
#include <tls.h>
@@ -20,6 +20,9 @@
#ifndef _LINUX_POWERPC_SYSDEP_H
#define _LINUX_POWERPC_SYSDEP_H 1
+/* Always enable vsyscalls on powerpc64 */
+#define ALWAYS_USE_VSYSCALL 1
+
#include <sysdeps/unix/sysv/linux/sysdep.h>
#include <sysdeps/unix/powerpc/sysdep.h>
#include <tls.h>
--
2.19.1