lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code Activity

i386, x86: Use libc_ifunc macro for time, gettimeofday.

Browse Source 
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.
This commit is contained in:
Stefan Liebler
2016-10-07 09:56:47 +02:00
parent 18d6c45e12
commit e23faea6ae
6 changed files with 60 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
sysdeps/unix/sysv/linux/x86/time.c
View File

@ -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