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/include/sys | |
| 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/include/sys')
| -rw-r--r-- | sysdeps/unix/sysv/linux/include/sys/timex.h | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/sysdeps/unix/sysv/linux/include/sys/timex.h b/sysdeps/unix/sysv/linux/include/sys/timex.h new file mode 100644 index 0000000000..02bb59266e --- /dev/null +++ b/sysdeps/unix/sysv/linux/include/sys/timex.h @@ -0,0 +1,26 @@ +/* Internal declarations for sys/timex.h. + Copyright (C) 2014 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ + +#ifndef _INCLUDE_SYS_TIMEX_H +#define _INCLUDE_SYS_TIMEX_H 1 + +#include_next <sys/timex.h> + +libc_hidden_proto (__adjtimex) + +#endif /* sys/timex.h */ |