diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2019-05-29 18:48:38 -0300 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2019-08-05 16:01:24 -0300 |
| commit | 27a0914e4586b06375b20731fa6515fe30334373 (patch) | |
| tree | d95d41be588110c52dc49d7c0cce6c147538268f | |
| parent | 503fc587f34a39e3fa12e5ff0e0b37369b436df6 (diff) | |
| download | glibc-27a0914e4586b06375b20731fa6515fe30334373.tar.gz glibc-27a0914e4586b06375b20731fa6515fe30334373.tar.xz glibc-27a0914e4586b06375b20731fa6515fe30334373.zip | |
riscv: Enable VDSO for static linking
Checked on riscv64-linux-gnu-rv64imafdc-lp64d qemu system with some static tests. [BZ #19767] * sysdeps/unix/sysv/linux/riscv/init-first.c: Remove #ifdef SHARED. * sysdeps/unix/sysv/linux/riscv/libc-vdso.h: Likewise. * sysdeps/unix/sysv/linux/riscv/sysdep.h (ALWAYS_USE_VSYSCALL): Define.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/riscv/init-first.c | 8 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/riscv/libc-vdso.h | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/riscv/sysdep.h | 3 |
4 files changed, 13 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog index bd17d9e7e0..bd12f2d60a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2019-08-05 Adhemerval Zanella <adhemerval.zanella@linaro.org> + [BZ #19767] + * sysdeps/unix/sysv/linux/riscv/init-first.c: Remove #ifdef SHARED. + * sysdeps/unix/sysv/linux/riscv/libc-vdso.h: Likewise. + * sysdeps/unix/sysv/linux/riscv/sysdep.h (ALWAYS_USE_VSYSCALL): + Define. + * sysdeps/sh/libm-test-ulps: Update. 2019-08-05 Florian Weimer <fweimer@redhat.com> diff --git a/sysdeps/unix/sysv/linux/riscv/init-first.c b/sysdeps/unix/sysv/linux/riscv/init-first.c index 8134c79695..98a8ce33ad 100644 --- a/sysdeps/unix/sysv/linux/riscv/init-first.c +++ b/sysdeps/unix/sysv/linux/riscv/init-first.c @@ -17,9 +17,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 (getcpu)) (unsigned int *, unsigned int *, void *) attribute_hidden; @@ -52,7 +51,6 @@ _libc_vdso_platform_setup (void) VDSO_SYMBOL (clock_getres) = 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/riscv/libc-vdso.h b/sysdeps/unix/sysv/linux/riscv/libc-vdso.h index b0c46f3cb7..2373292ab9 100644 --- a/sysdeps/unix/sysv/linux/riscv/libc-vdso.h +++ b/sysdeps/unix/sysv/linux/riscv/libc-vdso.h @@ -20,9 +20,7 @@ #ifndef _LIBC_VDSO_H #define _LIBC_VDSO_H -#ifdef SHARED - -# include <sysdep-vdso.h> +#include <sysdep-vdso.h> extern long int (*VDSO_SYMBOL (getcpu)) (unsigned int *, unsigned int *, void *) attribute_hidden; @@ -33,6 +31,4 @@ extern long int (*VDSO_SYMBOL (clock_gettime)) (clockid_t, struct timespec *) extern long int (*VDSO_SYMBOL (clock_getres)) (clockid_t, struct timespec *) attribute_hidden; -#endif - #endif /* _LIBC_VDSO_H */ diff --git a/sysdeps/unix/sysv/linux/riscv/sysdep.h b/sysdeps/unix/sysv/linux/riscv/sysdep.h index 5470ea3d2a..caf013a9a1 100644 --- a/sysdeps/unix/sysv/linux/riscv/sysdep.h +++ b/sysdeps/unix/sysv/linux/riscv/sysdep.h @@ -19,6 +19,9 @@ #ifndef _LINUX_RISCV_SYSDEP_H #define _LINUX_RISCV_SYSDEP_H 1 +/* Always enable vsyscalls on riscv */ +#define ALWAYS_USE_VSYSCALL 1 + #include <sysdeps/unix/sysv/linux/generic/sysdep.h> #include <tls.h> |