diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sparc/Makefile | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sparc/Versions | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sparc/init-first.c | 46 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sparc/libc-vdso.h | 33 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sparc/sysdep.h | 11 |
6 files changed, 109 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 94e239f043..4f0448c708 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,16 @@ 2018-10-18 David S. Miller <davem@davemloft.net> + * sysdeps/unix/sysv/linux/sparc/init-first.c: New file. + * sysdeps/unix/sysv/linux/sparc/libc-vdso.h: New file. + * sysdeps/unix/sysv/linux/sparc/Makefile: Add dl-vdso to + sysdep_routines in subdir elf. + * sysdeps/unix/sysv/linux/sparc/Versions: Add GLIBC_PRIVATE + version for __vdso_clock_gettime. + * sysdeps/unix/sysv/linux/sparc/sysdep.h (INTERNAL_VSYSCALL_CALL): + Define. + (HAVE_CLOCK_GETTIME_VSYSCALL): Define. + (HAVE_GETTIMEOFDAY_VSYSCALL): Define. + * sysdeps/sparc/fpu/libm-test-ulps: Regenerated. 2018-10-17 H.J. Lu <hongjiu.lu@intel.com> diff --git a/sysdeps/unix/sysv/linux/sparc/Makefile b/sysdeps/unix/sysv/linux/sparc/Makefile index b0d182a439..fb3ee5b8a1 100644 --- a/sysdeps/unix/sysv/linux/sparc/Makefile +++ b/sysdeps/unix/sysv/linux/sparc/Makefile @@ -7,6 +7,10 @@ librt-routines += rt-sysdep librt-shared-only-routines += rt-sysdep endif +ifeq ($(subdir),elf) +sysdep_routines += dl-vdso +endif + ifeq ($(subdir),sysvipc) sysdep_routines += getshmlba endif diff --git a/sysdeps/unix/sysv/linux/sparc/Versions b/sysdeps/unix/sysv/linux/sparc/Versions index 4dc1cd720b..f056addee6 100644 --- a/sysdeps/unix/sysv/linux/sparc/Versions +++ b/sysdeps/unix/sysv/linux/sparc/Versions @@ -29,6 +29,10 @@ libc { __getshmlba; } + GLIBC_PRIVATE { + # nptl/pthread_cond_timedwait.c uses INTERNAL_VSYSCALL(clock_gettime). + __vdso_clock_gettime; + } } libpthread { diff --git a/sysdeps/unix/sysv/linux/sparc/init-first.c b/sysdeps/unix/sysv/linux/sparc/init-first.c new file mode 100644 index 0000000000..7700cdfe1f --- /dev/null +++ b/sysdeps/unix/sysv/linux/sparc/init-first.c @@ -0,0 +1,46 @@ +/* SPARC VDSO initialization + Copyright (C) 2018 Free Software Foundation, Inc. + + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + 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> + +long int (*VDSO_SYMBOL (gettimeofday)) (struct timeval *, void *) + attribute_hidden; +long int (*VDSO_SYMBOL (clock_gettime)) (clockid_t, struct timespec *) + attribute_hidden; + +static inline void +_libc_vdso_platform_setup (void) +{ + PREPARE_VERSION_KNOWN (linux_version, LINUX_2_6); + + void *p = _dl_vdso_vsym ("__vdso_gettimeofday", &linux_version); + PTR_MANGLE (p); + VDSO_SYMBOL (gettimeofday) = p; + + p = _dl_vdso_vsym ("__vdso_clock_gettime", &linux_version); + PTR_MANGLE (p); + VDSO_SYMBOL (clock_gettime) = p; +} + +# define VDSO_SETUP _libc_vdso_platform_setup +#endif + +#include <csu/init-first.c> diff --git a/sysdeps/unix/sysv/linux/sparc/libc-vdso.h b/sysdeps/unix/sysv/linux/sparc/libc-vdso.h new file mode 100644 index 0000000000..b3938ab151 --- /dev/null +++ b/sysdeps/unix/sysv/linux/sparc/libc-vdso.h @@ -0,0 +1,33 @@ +/* VDSO function pointer declarations. + Copyright (C) 2018 Free Software Foundation, Inc. + + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library. If not, see + <http://www.gnu.org/licenses/>. */ + +#ifndef _LIBC_VDSO_H +#define _LIBC_VDSO_H + +#ifdef SHARED + +# include <sysdep-vdso.h> + +extern long int (*VDSO_SYMBOL(gettimeofday)) (struct timeval *, void *) + attribute_hidden; +extern long int (*VDSO_SYMBOL(clock_gettime)) (clockid_t, struct timespec *); + +#endif + +#endif /* _LIBC_VDSO_H */ diff --git a/sysdeps/unix/sysv/linux/sparc/sysdep.h b/sysdeps/unix/sysv/linux/sparc/sysdep.h index fd06a4349e..5fb7828a05 100644 --- a/sysdeps/unix/sysv/linux/sparc/sysdep.h +++ b/sysdeps/unix/sysv/linux/sparc/sysdep.h @@ -34,6 +34,17 @@ #else /* __ASSEMBLER__ */ +#define INTERNAL_VSYSCALL_CALL(funcptr, err, nr, args...) \ + ({ \ + long _ret = funcptr (args); \ + err = ((unsigned long) (_ret) >= (unsigned long) -4095L); \ + _ret; \ + }) + +/* List of system calls which are supported as vsyscalls. */ +# define HAVE_CLOCK_GETTIME_VSYSCALL 1 +# define HAVE_GETTIMEOFDAY_VSYSCALL 1 + #undef INLINE_SYSCALL #define INLINE_SYSCALL(name, nr, args...) \ ({ INTERNAL_SYSCALL_DECL(err); \ |