mirror of
https://sourceware.org/git/glibc.git
synced 2025-06-02 02:01:46 +03:00
b8386c2859
This patch removes the PREPARE_VERSION and PREPARE_VERSION_KNOW macro and uses a static inline function instead, get_vdso_symbol. Each architecture that supports vDSO must define the Linux version and its hash for symbol resolution (VDSO_NAME and VDSO_HASH macro respectively). It also organizes the HAVE_*_VSYSCALL for mips, powerpc, and s390 to define them on a common header. The idea is to require less code to configure and enable vDSO support for newer ports. No semantic changes are expected. Checked with a build against all affected architectures. * sysdeps/unix/make-syscalls.sh: Make vDSO call use get_vdso_symbol. * sysdeps/unix/sysv/linux/aarch64/gettimeofday.c (__gettimeofday): Use get_vdso_symbol instead of _dl_vdso_vsym. * sysdeps/unix/sysv/linux/powerpc/time.c (time): Likewise. * sysdeps/unix/sysv/linux/riscv/flush-icache.c (__lookup_riscv_flush_icache): Likewise. * sysdeps/unix/sysv/linux/x86/gettimeofday.c (__gettimeofday): Likewise. * sysdeps/unix/sysv/linux/x86/time.c (time): Likewise. * sysdeps/unix/sysv/linux/powerpc/gettimeofday.c: Likewise. * sysdeps/unix/sysv/linux/aarch64/init-first.c: Likewise. * sysdeps/unix/sysv/linux/arm/init-first.c: Likewise. * sysdeps/unix/sysv/linux/i386/init-first.c: Likewise. * sysdeps/unix/sysv/linux/mips/init-first.c: Likewise. * sysdeps/unix/sysv/linux/powerpc/init-first.c: Likewise. * sysdeps/unix/sysv/linux/riscv/init-first.c: Likewise. * sysdeps/unix/sysv/linux/sparc/init-first.c: Likewise. * sysdeps/unix/sysv/linux/s390/init-first.c: Likewise. * sysdeps/unix/sysv/linux/x86_64/init-first.c: Likewise. * sysdeps/unix/sysv/linux/aarch64/sysdep.h (VDSO_NAME, VDSO_HASH): Define. * sysdeps/unix/sysv/linux/arm/sysdep.h (VDSO_NAME, VDSO_HASH): Likewise. * sysdeps/unix/sysv/linux/i386/sysdep.h (VDSO_NAME, VDSO_HASH): Likewise. * sysdeps/unix/sysv/linux/riscv/sysdep.h (VDSO_NAME, VDSO_HASH): Likewise. * sysdeps/unix/sysv/linux/sparc/sysdep.h (VDSO_NAME, VDSO_HASH): Likewise. * sysdeps/unix/sysv/linux/x86_64/sysdep.h (VDSO_NAME, VDSO_HASH): Likewise. * sysdeps/unix/sysv/linux/mips/mips32/sysdep.h (HAVE_CLOCK_GETTIME_VSYSCALL, HAVE_GETTIMEOFDAY_VSYSCALL): Remove definition. * sysdeps/unix/sysv/linux/mips/mips64/n32/sysdep.h (HAVE_CLOCK_GETTIME_VSYSCALL, HAVE_GETTIMEOFDAY_VSYSCALL): Likewise. * sysdeps/unix/sysv/linux/mips/mips64/n64/sysdep.h (HAVE_CLOCK_GETTIME_VSYSCALL, HAVE_GETTIMEOFDAY_VSYSCALL): Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h (HAVE_CLOCK_GETTIME_VSYSCALL, HAVE_GETTIMEOFDAY_VSYSCALL): Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h (HAVE_CLOCK_GETTIME_VSYSCALL, HAVE_GETTIMEOFDAY_VSYSCALL): Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h (HAVE_CLOCK_GETRES_VSYSCALL, HAVE_CLOCK_GETTIME_VSYSCALL, HAVE_GETTIMEOFDAY_VSYSCALL, HAVE_GETCPU_VSYSCALL): Likewise. * sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h (HAVE_CLOCK_GETRES_VSYSCALL, HAVE_CLOCK_GETTIME_VSYSCALL, HAVE_GETTIMEOFDAY_VSYSCALL, HAVE_GETCPU_VSYSCALL): Likewise. * sysdeps/unix/sysv/linux/mips/sysdep.h: New file. * sysdeps/unix/sysv/linux/powerpc/sysdep.h: Likewise. * sysdeps/unix/sysv/linux/s390/sysdep.h: Likewise. * sysdeps/unix/sysv/linux/dl-vdso.h (PREPARE_VERSION, PREPARE_VERSION_KNOWN, VDSO_NAME_LINUX_2_6, VDSO_HASH_LINUX_2_6, VDSO_NAME_LINUX_2_6_15, VDSO_HASH_LINUX_2_6_15, VDSO_NAME_LINUX_2_6_29, VDSO_HASH_LINUX_2_6_29, VDSO_NAME_LINUX_4_15, VDSO_HASH_LINUX_4_15): Remove defines. (get_vdso_symbol): New function.
80 lines
2.7 KiB
C
80 lines
2.7 KiB
C
/* Initialization code run first thing by the ELF startup code. Linux/PowerPC.
|
|
Copyright (C) 2007-2019 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
|
|
<https://www.gnu.org/licenses/>. */
|
|
|
|
#include <dl-vdso.h>
|
|
#include <libc-vdso.h>
|
|
|
|
int (*VDSO_SYMBOL(gettimeofday)) (struct timeval *, void *)
|
|
attribute_hidden;
|
|
int (*VDSO_SYMBOL(clock_gettime)) (clockid_t, struct timespec *);
|
|
int (*VDSO_SYMBOL(clock_getres)) (clockid_t, struct timespec *);
|
|
unsigned long long (*VDSO_SYMBOL(get_tbfreq)) (void);
|
|
int (*VDSO_SYMBOL(getcpu)) (unsigned *, unsigned *);
|
|
time_t (*VDSO_SYMBOL(time)) (time_t *);
|
|
|
|
#if defined(__PPC64__) || defined(__powerpc64__)
|
|
void *VDSO_SYMBOL(sigtramp_rt64);
|
|
#else
|
|
void *VDSO_SYMBOL(sigtramp32);
|
|
void *VDSO_SYMBOL(sigtramp_rt32);
|
|
#endif
|
|
|
|
static inline void
|
|
_libc_vdso_platform_setup (void)
|
|
{
|
|
void *p = get_vdso_symbol ("__kernel_gettimeofday");
|
|
PTR_MANGLE (p);
|
|
VDSO_SYMBOL (gettimeofday) = p;
|
|
|
|
p = get_vdso_symbol ("__kernel_clock_gettime");
|
|
PTR_MANGLE (p);
|
|
VDSO_SYMBOL (clock_gettime) = p;
|
|
|
|
p = get_vdso_symbol ("__kernel_clock_getres");
|
|
PTR_MANGLE (p);
|
|
VDSO_SYMBOL (clock_getres) = p;
|
|
|
|
p = get_vdso_symbol ("__kernel_get_tbfreq");
|
|
PTR_MANGLE (p);
|
|
VDSO_SYMBOL (get_tbfreq) = p;
|
|
|
|
p = get_vdso_symbol ("__kernel_getcpu");
|
|
PTR_MANGLE (p);
|
|
VDSO_SYMBOL (getcpu) = p;
|
|
|
|
p = get_vdso_symbol ("__kernel_time");
|
|
PTR_MANGLE (p);
|
|
VDSO_SYMBOL (time) = p;
|
|
|
|
/* PPC64 uses only one signal trampoline symbol, while PPC32 will use
|
|
two depending if SA_SIGINFO is used (__kernel_sigtramp_rt32) or not
|
|
(__kernel_sigtramp32).
|
|
There is no need to pointer mangle these symbol because they will
|
|
used only for pointer comparison. */
|
|
#if defined(__PPC64__) || defined(__powerpc64__)
|
|
VDSO_SYMBOL(sigtramp_rt64) = get_vdso_symbol ("__kernel_sigtramp_rt64");
|
|
#else
|
|
VDSO_SYMBOL(sigtramp32) = get_vdso_symbol ("__kernel_sigtramp32");
|
|
VDSO_SYMBOL(sigtramp_rt32) = get_vdso_symbol ("__kernel_sigtramp_rt32");
|
|
#endif
|
|
}
|
|
|
|
#define VDSO_SETUP _libc_vdso_platform_setup
|
|
|
|
#include <csu/init-first.c>
|