diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2014-10-08 23:19:32 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2014-10-08 23:19:32 +0000 |
| commit | 620f462e88f6e7b59488a963b3c42d89035e4ba6 (patch) | |
| tree | 7099e1f31de419862ee198ab72da6307ec32fb93 /sysdeps/unix/sysv/linux/alpha | |
| parent | c763c5d27112be055920c46f3be8d05bc8b669da (diff) | |
| download | glibc-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/alpha')
| -rw-r--r-- | sysdeps/unix/sysv/linux/alpha/adjtime.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sysdeps/unix/sysv/linux/alpha/adjtime.c b/sysdeps/unix/sysv/linux/alpha/adjtime.c index a0cbba3d17..59a44029a6 100644 --- a/sysdeps/unix/sysv/linux/alpha/adjtime.c +++ b/sysdeps/unix/sysv/linux/alpha/adjtime.c @@ -86,7 +86,7 @@ compat_symbol (libc, __adjtime_tv32, adjtime, GLIBC_2_0); int __adjtimex_tv64 (struct timex *tx) { return ADJTIMEX (tx); } -strong_alias (__adjtimex_tv64, __adjtimex_internal); +libc_hidden_ver (__adjtimex_tv64, __adjtimex) strong_alias (__adjtimex_tv64, __adjtimex_tv64p); weak_alias (__adjtimex_tv64, ntp_adjtime); versioned_symbol (libc, __adjtimex_tv64, __adjtimex, GLIBC_2_1); |