mirror of
				https://sourceware.org/git/glibc.git
				synced 2025-11-03 20:53:13 +03:00 
			
		
		
		
	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.
		
	
		
			
				
	
	
		
			82 lines
		
	
	
		
			2.6 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			82 lines
		
	
	
		
			2.6 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/* Copyright (C) 1993-2017 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/>.  */
 | 
						|
 | 
						|
#include <errno.h>
 | 
						|
#include <string.h>
 | 
						|
#include <termios.h>
 | 
						|
#include <sys/ioctl.h>
 | 
						|
#include <sys/types.h>
 | 
						|
#include <sysdep.h>
 | 
						|
 | 
						|
/* The difference here is that the termios structure used in the
 | 
						|
   kernel is not the same as we use in the libc.  Therefore we must
 | 
						|
   translate it here.  */
 | 
						|
#include <kernel_termios.h>
 | 
						|
 | 
						|
 | 
						|
/* This is a gross hack around a kernel bug.  If the cfsetispeed functions
 | 
						|
   is called with the SPEED argument set to zero this means use the same
 | 
						|
   speed as for output.  But we don't have independent input and output
 | 
						|
   speeds and therefore cannot record this.
 | 
						|
 | 
						|
   We use an unused bit in the `c_iflag' field to keep track of this
 | 
						|
   use of `cfsetispeed'.  The value here must correspond to the one used
 | 
						|
   in `speed.c'.  */
 | 
						|
#define IBAUD0	020000000000
 | 
						|
 | 
						|
 | 
						|
/* Set the state of FD to *TERMIOS_P.  */
 | 
						|
int
 | 
						|
__tcsetattr (int fd, int optional_actions, const struct termios *termios_p)
 | 
						|
{
 | 
						|
  struct __kernel_termios k_termios;
 | 
						|
  unsigned long int cmd;
 | 
						|
 | 
						|
  switch (optional_actions)
 | 
						|
    {
 | 
						|
    case TCSANOW:
 | 
						|
      cmd = TCSETS;
 | 
						|
      break;
 | 
						|
    case TCSADRAIN:
 | 
						|
      cmd = TCSETSW;
 | 
						|
      break;
 | 
						|
    case TCSAFLUSH:
 | 
						|
      cmd = TCSETSF;
 | 
						|
      break;
 | 
						|
    default:
 | 
						|
      return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL);
 | 
						|
    }
 | 
						|
 | 
						|
  k_termios.c_iflag = termios_p->c_iflag & ~IBAUD0;
 | 
						|
  k_termios.c_oflag = termios_p->c_oflag;
 | 
						|
  k_termios.c_cflag = termios_p->c_cflag;
 | 
						|
  k_termios.c_lflag = termios_p->c_lflag;
 | 
						|
  k_termios.c_line = termios_p->c_line;
 | 
						|
#if defined _HAVE_C_ISPEED && defined _HAVE_STRUCT_TERMIOS_C_ISPEED
 | 
						|
  k_termios.c_ispeed = termios_p->c_ispeed;
 | 
						|
#endif
 | 
						|
#if defined _HAVE_C_OSPEED && defined _HAVE_STRUCT_TERMIOS_C_OSPEED
 | 
						|
  k_termios.c_ospeed = termios_p->c_ospeed;
 | 
						|
#endif
 | 
						|
  memcpy (&k_termios.c_cc[0], &termios_p->c_cc[0],
 | 
						|
	  __KERNEL_NCCS * sizeof (cc_t));
 | 
						|
 | 
						|
  return INLINE_SYSCALL (ioctl, 3, fd, cmd, &k_termios);
 | 
						|
}
 | 
						|
weak_alias (__tcsetattr, tcsetattr)
 | 
						|
libc_hidden_def (tcsetattr)
 |