Enable VDSO for static linking on arm
Commit Message
2018-12-02 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.
---
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.
Comments
On Sun, 2 Dec 2018, Rafael Ávila de Espíndola wrote:
> 2018-12-02 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.
OK.
"Joseph Myers" <joseph@codesourcery.com> writes:
> On Sun, 2 Dec 2018, Rafael Ávila de Espíndola wrote:
>
>> 2018-12-02 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.
>
> OK.
Could you please commit it?
Thanks,
Rafael
On Mon, 3 Dec 2018, Rafael Avila de Espindola wrote:
> "Joseph Myers" <joseph@codesourcery.com> writes:
>
> > On Sun, 2 Dec 2018, Rafael Ávila de Espíndola wrote:
> >
> >> 2018-12-02 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.
> >
> > OK.
>
> Could you please commit it?
Done.
@@ -17,9 +17,9 @@
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>
+#include <sysdep-vdso.h>
int (*VDSO_SYMBOL(gettimeofday)) (struct timeval *, void *) attribute_hidden;
int (*VDSO_SYMBOL(clock_gettime)) (clockid_t, struct timespec *);
@@ -38,7 +38,6 @@ _libc_vdso_platform_setup (void)
VDSO_SYMBOL (clock_gettime) = p;
}
-# define VDSO_SETUP _libc_vdso_platform_setup
-#endif
+#define VDSO_SETUP _libc_vdso_platform_setup
#include <csu/init-first.c>
@@ -20,14 +20,10 @@
#ifndef _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 *)
attribute_hidden;
extern int (*VDSO_SYMBOL(clock_gettime)) (clockid_t, struct timespec *);
-#endif
-
#endif /* _LIBC_VDSO_H */
@@ -20,6 +20,9 @@
#ifndef _LINUX_ARM_SYSDEP_H
#define _LINUX_ARM_SYSDEP_H 1
+/* Always enable vsyscalls on arm */
+#define ALWAYS_USE_VSYSCALL 1
+
/* There is some commonality. */
#include <sysdeps/unix/sysv/linux/sysdep.h>
#include <sysdeps/unix/arm/sysdep.h>