From fa872e1b6210e81e60d6029429f0a083b8eab26e Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Fri, 2 Dec 2016 16:32:28 -0200 Subject: Clean pthread functions namespaces for C11 threads This patch adds internal definition (through {libc_}hidden_{proto,def}) and also change some strong to weak alias for symbols that might be used by C11 threads implementations. The patchset should not change libc/libpthread functional, although object changes are expected (since now internal symbols are used instead) and final exported symbols through GLIBC_PRIVATE is also expanded (to cover libpthread usage of __mmap{64}, __munmap, __mprotect). Checked with a build for all major ABI (aarch64-linux-gnu, alpha-linux-gnu, arm-linux-gnueabi, i386-linux-gnu, ia64-linux-gnu, m68k-linux-gnu, microblaze-linux-gnu [1], mips{64}-linux-gnu, nios2-linux-gnu, powerpc{64le}-linux-gnu, s390{x}-linux-gnu, sparc{64}-linux-gnu, tile{pro,gx}-linux-gnu, and x86_64-linux-gnu). * include/sched.h (__sched_get_priority_max): Add libc hidden proto. (__sched_get_prioriry_min): Likewise. * include/sys/mman.h (__mmap): Likewise. (__mmap64): Likewise. (__munmap): Likewise. (__mprotect): Likewise. * include/termios.h (__tcsetattr): Likewise. * include/time.h (__nanosleep): Use hidden_proto instead of libc_hidden_proto. * posix/nanosleep.c (__nanosleep): Likewise. * misc/Versions (libc): Export __mmap, __munmap, __mprotect, __sched_get_priority_min, and __sched_get_priority_max under GLIBC_PRIVATE. * nptl/allocatestack.c (__free_stacks): Use internal definition for libc symbols. (change_stack_perm): Likewise. (allocate_stack): Likewise. * sysdeps/posix/gethostname.c: Likewise. * nptl/tpp.c (__init_sched_fifo_prio): Likewise. * sysdeps/unix/sysv/linux/i386/smp.h (is_smp_system): Likewise. * sysdeps/unix/sysv/linux/powerpc/ioctl.c (__ioctl): Likewise. * nptl/pthreadP.h (__pthread_mutex_timedlock): Add definition. (__pthread_key_delete): Likewise. (__pthread_detach): Likewise. (__pthread_cancel): Likewise. (__pthread_mutex_trylock): Likewise. (__pthread_mutexattr_init): Likewise. (__pthread_mutexattr_settype): Likewise. * nptl/pthread_cancel.c (pthread_cancel): Change to internal name and create alias for exported one. * nptl/pthread_join.c (pthread_join): Likewise. * nptl/pthread_detach.c (pthread_detach): Likewise. * nptl/pthread_key_delete.c (pthread_key_delete): Likewise. * nptl/pthread_mutex_timedlock.c (pthread_mutex_timedlock): Likewise. * nptl/pthread_create.c: Change static requirements for pthread symbols. * nptl/pthread_equal.c (__pthread_equal): Change strong alias to weak for internal definition. * nptl/pthread_exit.c (__pthread_exit): Likewise. * nptl/pthread_getspecific.c (__pthread_getspecific): Likewise. * nptl/pthread_key_create.c (__pthread_key_create): Likewise. * nptl/pthread_mutex_destroy.c (__pthread_mutex_destroy): Likewise. * nptl/pthread_mutex_init.c (__pthread_mutex_init): Likewise. * nptl/pthread_mutex_lock.c (__pthread_mutex_lock): Likewise. * nptl/pthread_mutex_trylock.c (__pthread_mutex_trylock): Likewise. * nptl/pthread_mutex_unlock.c (__pthread_mutex_unlock): Likewise. * nptl/pthread_mutexattr_init.c (__pthread_mutexattr_init): Likwise. * nptl/pthread_mutexattr_settype.c (__pthread_mutexattr_settype): Likewise. * nptl/pthread_self.c (__pthread_self): Likewise. * nptl/pthread_setspecific.c (__pthread_setspecific): Likewise. * sysdeps/unix/sysv/linux/tcsetattr.c (tcsetattr): Likewise. * misc/mmap.c (__mmap): Add internal symbol definition. * misc/mmap.c (__mmap64): Likewise. * sysdeps/unix/sysv/linux/mmap.c (__mmap): Likewise. * sysdeps/unix/sysv/linux/mmap64.c (__mmap): Likewise. (__mmap64): Likewise. * sysdeps/unix/sysv/linux/i386/Versions (libc) [GLIBC_PRIVATE): Add __uname. --- include/sched.h | 2 ++ include/sys/mman.h | 4 ++++ include/termios.h | 2 ++ include/time.h | 2 +- 4 files changed, 9 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/sched.h b/include/sched.h index b4d74064de..f75faed4ce 100644 --- a/include/sched.h +++ b/include/sched.h @@ -13,7 +13,9 @@ extern int __sched_getscheduler (__pid_t __pid); extern int __sched_yield (void); libc_hidden_proto (__sched_yield) extern int __sched_get_priority_max (int __algorithm); +libc_hidden_proto (__sched_get_priority_max) extern int __sched_get_priority_min (int __algorithm); +libc_hidden_proto (__sched_get_priority_min) extern int __sched_rr_get_interval (__pid_t __pid, struct timespec *__t); /* These are Linux specific. */ diff --git a/include/sys/mman.h b/include/sys/mman.h index 7026f69f42..8b996fce73 100644 --- a/include/sys/mman.h +++ b/include/sys/mman.h @@ -5,10 +5,14 @@ /* Now define the internal interfaces. */ extern void *__mmap (void *__addr, size_t __len, int __prot, int __flags, int __fd, __off_t __offset); +libc_hidden_proto (__mmap) extern void *__mmap64 (void *__addr, size_t __len, int __prot, int __flags, int __fd, __off64_t __offset); +libc_hidden_proto (__mmap64) extern int __munmap (void *__addr, size_t __len); +libc_hidden_proto (__munmap) extern int __mprotect (void *__addr, size_t __len, int __prot); +libc_hidden_proto (__mprotect) extern int __madvise (void *__addr, size_t __len, int __advice); libc_hidden_proto (__madvise) diff --git a/include/termios.h b/include/termios.h index fad51f8385..1a36e226b8 100644 --- a/include/termios.h +++ b/include/termios.h @@ -4,6 +4,8 @@ #ifndef _ISOMAC /* Now define the internal interfaces. */ extern int __tcgetattr (int __fd, struct termios *__termios_p); +extern int __tcsetattr (int __fd, int __optional_actions, + const struct termios *__termios_p); extern int __libc_tcdrain (int __fd); diff --git a/include/time.h b/include/time.h index 7eb0fa72d9..9956b82eb8 100644 --- a/include/time.h +++ b/include/time.h @@ -78,7 +78,7 @@ extern struct tm *__tz_convert (const time_t *timer, int use_localtime, struct t extern int __nanosleep (const struct timespec *__requested_time, struct timespec *__remaining); -libc_hidden_proto (__nanosleep) +hidden_proto (__nanosleep) extern int __nanosleep_nocancel (const struct timespec *__requested_time, struct timespec *__remaining) attribute_hidden; -- cgit 1.4.1