Message ID | sBwcbNTOxu0p3Z9VfOyNq1CcW102b44KP1iIkblItVbsYmWu-i-ZU6LVvkccqmse9bkP0zPVqIs00SqaJml4t3DUkX87GbIr4-WNrfaXv74=@espindo.la |
---|---|
State | New |
Headers | show |
Series | Enable VDSO for static linking on arm | expand |
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.
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>