From 620f462e88f6e7b59488a963b3c42d89035e4ba6 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Wed, 8 Oct 2014 23:19:32 +0000 Subject: Don't use INTUSE with __adjtimex (bug 14132). Bug 14132 is removal of the old INTDEF/INTUSE system of *_internal aliases as obsoleted by the hidden_proto / hidden_def system. Various cases were cleaned up in 2012, but some remain. This patch removes the use of this mechanism for __adjtimex. Tested for x86_64 that stripped installed shared libraries are unchanged by the patch. [BZ #14132] * sysdeps/unix/sysv/linux/include/sys/timex.h: New file. * sysdeps/unix/sysv/linux/adjtime.c [!ADJTIMEX] (ADJTIMEX): Do not use INTUSE. [!ADJTIMEX] (INTUSE(__adjtimex)): Remove declaration. * sysdeps/unix/sysv/linux/alpha/adjtime.c (__adjtimex_internal): Remove alias. (__adjtimex): Define using libc_hidden_ver. * sysdeps/unix/sysv/linux/ntp_gettime.c (INTUSE(__adjtimex)): Remove declaration. (ntp_gettime): Call __adjtimex directly. * sysdeps/unix/sysv/linux/ntp_gettimex.c (INTUSE(__adjtimex)): Remove declaration. (ntp_gettimex): Call __adjtimex directly. * sysdeps/unix/sysv/linux/syscalls.list (adjtimex): Remove __adjtimex_internal alias. --- sysdeps/unix/sysv/linux/ntp_gettime.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'sysdeps/unix/sysv/linux/ntp_gettime.c') diff --git a/sysdeps/unix/sysv/linux/ntp_gettime.c b/sysdeps/unix/sysv/linux/ntp_gettime.c index 1b91292092..7e3cc3f742 100644 --- a/sysdeps/unix/sysv/linux/ntp_gettime.c +++ b/sysdeps/unix/sysv/linux/ntp_gettime.c @@ -26,9 +26,6 @@ #endif -extern int INTUSE(__adjtimex) (struct timex *__ntx); - - int ntp_gettime (struct ntptimeval *ntv) { @@ -36,7 +33,7 @@ ntp_gettime (struct ntptimeval *ntv) int result; tntx.modes = 0; - result = INTUSE(__adjtimex) (&tntx); + result = __adjtimex (&tntx); ntv->time = tntx.time; ntv->maxerror = tntx.maxerror; ntv->esterror = tntx.esterror; -- cgit v1.2.3-70-g09d2