about summary refs log tree commit diff
path: root/sysdeps/unix/sysv/linux/adjtime.c
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2014-10-08 23:19:32 +0000
committerJoseph Myers <joseph@codesourcery.com>2014-10-08 23:19:32 +0000
commit620f462e88f6e7b59488a963b3c42d89035e4ba6 (patch)
tree7099e1f31de419862ee198ab72da6307ec32fb93 /sysdeps/unix/sysv/linux/adjtime.c
parentc763c5d27112be055920c46f3be8d05bc8b669da (diff)
downloadglibc-620f462e88f6e7b59488a963b3c42d89035e4ba6.tar.gz
glibc-620f462e88f6e7b59488a963b3c42d89035e4ba6.tar.xz
glibc-620f462e88f6e7b59488a963b3c42d89035e4ba6.zip
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.
Diffstat (limited to 'sysdeps/unix/sysv/linux/adjtime.c')
-rw-r--r--sysdeps/unix/sysv/linux/adjtime.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sysdeps/unix/sysv/linux/adjtime.c b/sysdeps/unix/sysv/linux/adjtime.c
index 90300b5fbb..179f4cd6fa 100644
--- a/sysdeps/unix/sysv/linux/adjtime.c
+++ b/sysdeps/unix/sysv/linux/adjtime.c
@@ -41,8 +41,7 @@
 
 #ifndef ADJTIMEX
 #define NO_LOCAL_ADJTIME
-#define ADJTIMEX(x) INTUSE(__adjtimex) (x)
-extern int INTUSE(__adjtimex) (struct timex *__ntx);
+#define ADJTIMEX(x) __adjtimex (x)
 #endif
 
 #ifndef LINKAGE