diff options
| author | Rafael Ávila de Espíndola <rafael@espindo.la> | 2018-12-03 20:59:22 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2018-12-03 20:59:22 +0000 |
| commit | 6af956e5c019637051ba8cfb46cfff9bbe574500 (patch) | |
| tree | daeae8dbd01fcc0c7d278faf6532e29aa4a62114 /sysdeps/unix | |
| parent | f5ec0ea9eaf9753188a0bfa391b101ea8d5efc2b (diff) | |
| download | glibc-6af956e5c019637051ba8cfb46cfff9bbe574500.tar.gz glibc-6af956e5c019637051ba8cfb46cfff9bbe574500.tar.xz glibc-6af956e5c019637051ba8cfb46cfff9bbe574500.zip | |
Enable VDSO for static linking on arm
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. [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.
Diffstat (limited to 'sysdeps/unix')
| -rw-r--r-- | sysdeps/unix/sysv/linux/arm/init-first.c | 9 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/arm/libc-vdso.h | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/arm/sysdep.h | 3 |
3 files changed, 8 insertions, 10 deletions
diff --git a/sysdeps/unix/sysv/linux/arm/init-first.c b/sysdeps/unix/sysv/linux/arm/init-first.c index f4293b1cf8..7fbdc27227 100644 --- a/sysdeps/unix/sysv/linux/arm/init-first.c +++ b/sysdeps/unix/sysv/linux/arm/init-first.c @@ -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> diff --git a/sysdeps/unix/sysv/linux/arm/libc-vdso.h b/sysdeps/unix/sysv/linux/arm/libc-vdso.h index 52dd355818..2a8979d356 100644 --- a/sysdeps/unix/sysv/linux/arm/libc-vdso.h +++ b/sysdeps/unix/sysv/linux/arm/libc-vdso.h @@ -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 */ diff --git a/sysdeps/unix/sysv/linux/arm/sysdep.h b/sysdeps/unix/sysv/linux/arm/sysdep.h index 174c530412..3902d46d55 100644 --- a/sysdeps/unix/sysv/linux/arm/sysdep.h +++ b/sysdeps/unix/sysv/linux/arm/sysdep.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> |