diff options
author | Stefan Liebler <stli@linux.vnet.ibm.com> | 2016-10-07 09:56:47 +0200 |
---|---|---|
committer | Stefan Liebler <stli@linux.vnet.ibm.com> | 2016-10-07 10:12:42 +0200 |
commit | e23faea6aec97b75f7a7567350538c1c0dfc1cee (patch) | |
tree | 2ba0ed050ee0966c85c7bee2f2a18bdf3e3dd139 /sysdeps/unix/sysv | |
parent | 18d6c45e12127ea88a704c0915de2ba13d3af998 (diff) | |
download | glibc-e23faea6aec97b75f7a7567350538c1c0dfc1cee.tar.gz glibc-e23faea6aec97b75f7a7567350538c1c0dfc1cee.tar.xz glibc-e23faea6aec97b75f7a7567350538c1c0dfc1cee.zip |
i386, x86: Use libc_ifunc macro for time, gettimeofday.
This patch uses the libc_ifunc_hidden macro to create already existing ifunc functions time and gettimeofday on intel. This way, the libc_hidden_def macro can be used instead of the libc_ifunc_hidden_def one which was only used here. Thus the macro is removed from libc-symbols.h. On i386, the __GI_* symbols do not target the ifunc symbol and thus the redirection construct has to be applied here. ChangeLog: * sysdeps/unix/sysv/linux/x86/gettimeofday.c (__gettimeofday): Use libc_ifunc_hidden macro. Use libc_hidden_def instead of libc_ifunc_hidden_def. * sysdeps/unix/sysv/linux/x86/time.c (time): Likewise. * sysdeps/unix/sysv/linux/i386/gettimeofday.c (__gettimeofday): Redirect ifunced function in header for using it as type of ifunc'ed function. Redefine libc_hidden_def to use fallback non ifunc'ed function for __GI_* symbol. * sysdeps/unix/sysv/linux/i386/time.c (time): Likewise. * include/libc-symbols.h (libc_ifunc_hidden_def, libc_ifunc_hidden_def1): Delete macro.
Diffstat (limited to 'sysdeps/unix/sysv')
-rw-r--r-- | sysdeps/unix/sysv/linux/i386/gettimeofday.c | 14 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/i386/time.c | 14 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/x86/gettimeofday.c | 28 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/x86/time.c | 26 |
4 files changed, 48 insertions, 34 deletions
diff --git a/sysdeps/unix/sysv/linux/i386/gettimeofday.c b/sysdeps/unix/sysv/linux/i386/gettimeofday.c index 965bb81a4b..6ab1215519 100644 --- a/sysdeps/unix/sysv/linux/i386/gettimeofday.c +++ b/sysdeps/unix/sysv/linux/i386/gettimeofday.c @@ -16,14 +16,20 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ +#ifdef SHARED +# define __gettimeofday __redirect___gettimeofday +#endif + #include <sys/time.h> #ifdef SHARED +# undef __gettimeofday +# define __gettimeofday_type __redirect___gettimeofday -# undef libc_ifunc_hidden_def -# define libc_ifunc_hidden_def(name) \ - libc_ifunc_hidden_def1 (__GI_##name, __gettimeofday_syscall) - +# undef libc_hidden_def +# define libc_hidden_def(name) \ + __hidden_ver1 (__gettimeofday_syscall, __GI___gettimeofday, \ + __gettimeofday_syscall); #endif #include <sysdeps/unix/sysv/linux/x86/gettimeofday.c> diff --git a/sysdeps/unix/sysv/linux/i386/time.c b/sysdeps/unix/sysv/linux/i386/time.c index 62b78b22de..980a11828f 100644 --- a/sysdeps/unix/sysv/linux/i386/time.c +++ b/sysdeps/unix/sysv/linux/i386/time.c @@ -17,10 +17,18 @@ <http://www.gnu.org/licenses/>. */ #ifdef SHARED +# define time __redirect_time +#endif + +#include <time.h> + +#ifdef SHARED +# undef time +# define time_type __redirect_time -# undef libc_ifunc_hidden_def -# define libc_ifunc_hidden_def(name) \ - libc_ifunc_hidden_def1 (__GI_##name, __time_syscall) +# undef libc_hidden_def +# define libc_hidden_def(name) \ + __hidden_ver1 (__time_syscall, __GI_time, __time_syscall); #endif #include <sysdeps/unix/sysv/linux/x86/time.c> diff --git a/sysdeps/unix/sysv/linux/x86/gettimeofday.c b/sysdeps/unix/sysv/linux/x86/gettimeofday.c index 36f7c26ffb..c82452f855 100644 --- a/sysdeps/unix/sysv/linux/x86/gettimeofday.c +++ b/sysdeps/unix/sysv/linux/x86/gettimeofday.c @@ -29,20 +29,20 @@ __gettimeofday_syscall (struct timeval *tv, struct timezone *tz) return INLINE_SYSCALL (gettimeofday, 2, tv, tz); } -void *gettimeofday_ifunc (void) __asm__ ("__gettimeofday"); - -void * -gettimeofday_ifunc (void) -{ - PREPARE_VERSION_KNOWN (linux26, LINUX_2_6); - - /* If the vDSO is not available we fall back to syscall. */ - return (_dl_vdso_vsym ("__vdso_gettimeofday", &linux26) - ?: (void*) (&__gettimeofday_syscall)); -} -asm (".type __gettimeofday, %gnu_indirect_function"); - -libc_ifunc_hidden_def(__gettimeofday) +# ifndef __gettimeofday_type +/* The i386 gettimeofday.c includes this file with a defined + __gettimeofday_type macro. For x86_64 we have to define it to __gettimeofday + as the internal symbol is the ifunc'ed one. */ +# define __gettimeofday_type __gettimeofday +# endif + +# undef INIT_ARCH +# define INIT_ARCH() PREPARE_VERSION_KNOWN (linux26, LINUX_2_6) +/* If the vDSO is not available we fall back to syscall. */ +libc_ifunc_hidden (__gettimeofday_type, __gettimeofday, + (_dl_vdso_vsym ("__vdso_gettimeofday", &linux26) + ?: &__gettimeofday_syscall)) +libc_hidden_def (__gettimeofday) #else diff --git a/sysdeps/unix/sysv/linux/x86/time.c b/sysdeps/unix/sysv/linux/x86/time.c index f5f7f918c9..a40fe3943d 100644 --- a/sysdeps/unix/sysv/linux/x86/time.c +++ b/sysdeps/unix/sysv/linux/x86/time.c @@ -30,20 +30,20 @@ __time_syscall (time_t *t) return INTERNAL_SYSCALL (time, err, 1, t); } -void *time_ifunc (void) __asm__ ("time"); - -void * -time_ifunc (void) -{ - PREPARE_VERSION_KNOWN (linux26, LINUX_2_6); - +# ifndef time_type +/* The i386 time.c includes this file with a defined time_type macro. + For x86_64 we have to define it to time as the internal symbol is the + ifunc'ed one. */ +# define time_type time +# endif + +#undef INIT_ARCH +#define INIT_ARCH() PREPARE_VERSION_KNOWN (linux26, LINUX_2_6); /* If the vDSO is not available we fall back on the syscall. */ - return _dl_vdso_vsym ("__vdso_time", &linux26) - ?: (void*) &__time_syscall; -} -asm (".type time, %gnu_indirect_function"); - -libc_ifunc_hidden_def(time) +libc_ifunc_hidden (time_type, time, + (_dl_vdso_vsym ("__vdso_time", &linux26) + ?: &__time_syscall)) +libc_hidden_def (time) #else |