From 186cd80b1eb0c28f42c052bbaa9b37a7f66ee662 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Wed, 2 Jun 2021 07:32:19 +0200 Subject: [PATCH] Add missing symbols to Version files Some symbols have explicit versioned_symbol or compat_symbol markers in the sources, but no corresponding entry in the Versions files. This presently works because the local: * directive is only applied to the base version. Reviewed-by: Adhemerval Zanella --- inet/Versions | 2 ++ io/Versions | 1 + libio/Versions | 3 +++ nptl/Versions | 8 ++++++++ posix/Versions | 4 ++++ sysdeps/mach/hurd/i386/Versions | 4 ++++ sysdeps/unix/sysv/linux/Versions | 19 ++++++++++++++++++- sysdeps/unix/sysv/linux/alpha/Versions | 11 +++++------ sysdeps/unix/sysv/linux/i386/Versions | 4 ---- sysdeps/unix/sysv/linux/ia64/Versions | 11 +++++------ sysdeps/unix/sysv/linux/mips/Versions | 5 +++++ sysdeps/unix/sysv/linux/powerpc/Versions | 5 +++++ sysdeps/unix/sysv/linux/powerpc/powerpc32/Versions | 14 ++++++-------- sysdeps/unix/sysv/linux/powerpc/powerpc64/Versions | 8 ++------ sysdeps/unix/sysv/linux/s390/s390-32/Versions | 3 --- sysdeps/unix/sysv/linux/sh/Versions | 3 --- sysdeps/unix/sysv/linux/sparc/Versions | 12 +++++------- sysdeps/unix/sysv/linux/sparc/sparc32/Versions | 3 --- 18 files changed, 73 insertions(+), 47 deletions(-) diff --git a/inet/Versions b/inet/Versions index 9b3661e..84cbe84 100644 --- a/inet/Versions +++ b/inet/Versions @@ -54,6 +54,8 @@ libc { gethostbyname_r; gethostent_r; getnetbyaddr_r; getnetbyname_r; getnetent_r; getnetgrent_r; getprotobyname_r; getprotobynumber_r; getprotoent_r; getservbyname_r; + getservbyport_r; + getservent_r; } GLIBC_2.2 { # i* diff --git a/io/Versions b/io/Versions index 49c4d2d..88caf76 100644 --- a/io/Versions +++ b/io/Versions @@ -129,6 +129,7 @@ libc { copy_file_range; } GLIBC_2.28 { + fcntl; fcntl64; statx; } diff --git a/libio/Versions b/libio/Versions index 6f1ab96..b91a7bc 100644 --- a/libio/Versions +++ b/libio/Versions @@ -92,6 +92,9 @@ libc { # Changed getline function in libio. _IO_getline_info; + _IO_fgetpos64; + _IO_fsetpos64; + # f* fgetpos64; fopen64; freopen64; fseeko; fseeko64; fsetpos64; ftello; ftello64; fopen; fclose; fdopen; fread_unlocked; fwrite_unlocked; diff --git a/nptl/Versions b/nptl/Versions index af62a47..b8b8299 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -175,6 +175,7 @@ libc { GLIBC_2.3.4 { pthread_attr_getaffinity_np; pthread_attr_setaffinity_np; + pthread_getaffinity_np; pthread_setaffinity_np; pthread_setschedprio; } @@ -258,6 +259,7 @@ libc { __pthread_register_cancel_defer; __pthread_unregister_cancel; __pthread_unregister_cancel_restore; + __pthread_unwind_next; call_once; cnd_broadcast; cnd_destroy; @@ -294,6 +296,7 @@ libc { pthread_condattr_getpshared; pthread_condattr_setclock; pthread_condattr_setpshared; + pthread_create; pthread_detach; pthread_getattr_default_np; pthread_getconcurrency; @@ -308,9 +311,12 @@ libc { pthread_mutex_consistent; pthread_mutex_getprioceiling; pthread_mutex_setprioceiling; + pthread_mutex_timedlock; + pthread_mutex_trylock; pthread_mutexattr_destroy; pthread_mutexattr_getprioceiling; pthread_mutexattr_getprotocol; + pthread_mutexattr_getpshared; pthread_mutexattr_getrobust; pthread_mutexattr_gettype; pthread_mutexattr_init; @@ -323,6 +329,7 @@ libc { pthread_rwlock_clockrdlock; pthread_rwlock_clockwrlock; pthread_rwlock_destroy; + pthread_rwlock_init; pthread_rwlock_rdlock; pthread_rwlock_timedrdlock; pthread_rwlock_timedwrlock; @@ -336,6 +343,7 @@ libc { pthread_rwlockattr_init; pthread_rwlockattr_setkind_np; pthread_rwlockattr_setpshared; + pthread_setaffinity_np; pthread_setattr_default_np; pthread_setconcurrency; pthread_setname_np; diff --git a/posix/Versions b/posix/Versions index b77e251..5983144 100644 --- a/posix/Versions +++ b/posix/Versions @@ -138,6 +138,10 @@ libc { GLIBC_2.11 { execvpe; } + GLIBC_2.15 { + posix_spawn; + posix_spawnp; + } GLIBC_2.27 { glob; glob64; } diff --git a/sysdeps/mach/hurd/i386/Versions b/sysdeps/mach/hurd/i386/Versions index 67e6d94..fb7f89f 100644 --- a/sysdeps/mach/hurd/i386/Versions +++ b/sysdeps/mach/hurd/i386/Versions @@ -7,4 +7,8 @@ libc { GLIBC_2.2.6 { ioperm; } + GLIBC_2.3.3 { + posix_fadvise64; + posix_fallocate64; + } } diff --git a/sysdeps/unix/sysv/linux/Versions b/sysdeps/unix/sysv/linux/Versions index 220bb2d..c864ad3 100644 --- a/sysdeps/unix/sysv/linux/Versions +++ b/sysdeps/unix/sysv/linux/Versions @@ -86,6 +86,16 @@ libc { # ipc ctl interface change. semctl; shmctl; msgctl; + + # Old symbol versions from libpthread. + __pread64; + __pwrite64; + lseek64; + open64; + pread; + pread64; + pwrite; + pwrite64; } GLIBC_2.2.1 { # p* @@ -102,7 +112,14 @@ libc { epoll_create; epoll_ctl; epoll_wait; } GLIBC_2.3.3 { - gnu_dev_major; gnu_dev_minor; gnu_dev_makedev; + _sys_siglist; + gnu_dev_major; + gnu_dev_makedev; + gnu_dev_minor; + posix_fadvise64; + posix_fallocate64; + sys_sigabbrev; + sys_siglist; } GLIBC_2.3.4 { sched_getaffinity; sched_setaffinity; diff --git a/sysdeps/unix/sysv/linux/alpha/Versions b/sysdeps/unix/sysv/linux/alpha/Versions index b90d5f2..b113cb6 100644 --- a/sysdeps/unix/sysv/linux/alpha/Versions +++ b/sysdeps/unix/sysv/linux/alpha/Versions @@ -64,6 +64,11 @@ libc { GLIBC_2.3 { _sys_errlist; sys_errlist; _sys_nerr; sys_nerr; } + GLIBC_2.3.3 { + # Changed PTHREAD_STACK_MIN. + pthread_attr_setstack; + pthread_attr_setstacksize; + } GLIBC_2.4 { _sys_errlist; sys_errlist; _sys_nerr; sys_nerr; } @@ -85,12 +90,6 @@ ld { __libc_alpha_cache_shape; } } -libpthread { - GLIBC_2.3.3 { - # Changed PTHREAD_STACK_MIN. - pthread_attr_setstack; pthread_attr_setstacksize; - } -} librt { GLIBC_2.3 { # AIO functions. diff --git a/sysdeps/unix/sysv/linux/i386/Versions b/sysdeps/unix/sysv/linux/i386/Versions index b59ace4..1335e65 100644 --- a/sysdeps/unix/sysv/linux/i386/Versions +++ b/sysdeps/unix/sysv/linux/i386/Versions @@ -33,10 +33,6 @@ libc { # v* versionsort64; } - GLIBC_2.3.3 { - # p* - posix_fadvise64; posix_fallocate64; - } GLIBC_2.3.4 { # v* vm86; diff --git a/sysdeps/unix/sysv/linux/ia64/Versions b/sysdeps/unix/sysv/linux/ia64/Versions index 214e6f9..54e7723 100644 --- a/sysdeps/unix/sysv/linux/ia64/Versions +++ b/sysdeps/unix/sysv/linux/ia64/Versions @@ -14,6 +14,11 @@ libc { # w* wordexp; } + GLIBC_2.3.3 { + # Changed PTHREAD_STACK_MIN. + pthread_attr_setstack; + pthread_attr_setstacksize; + } GLIBC_2.2.6 { getunwind; } @@ -21,12 +26,6 @@ libc { recvmsg; sendmsg; } } -libpthread { - GLIBC_2.3.3 { - # Changed PTHREAD_STACK_MIN. - pthread_attr_setstack; pthread_attr_setstacksize; - } -} librt { GLIBC_2.3.3 { # Changed timer_t. diff --git a/sysdeps/unix/sysv/linux/mips/Versions b/sysdeps/unix/sysv/linux/mips/Versions index aeaac41..db6222e 100644 --- a/sysdeps/unix/sysv/linux/mips/Versions +++ b/sysdeps/unix/sysv/linux/mips/Versions @@ -21,6 +21,11 @@ libc { # _* _test_and_set; } + GLIBC_2.3.3 { + # Changed PTHREAD_STACK_MIN. + pthread_attr_setstack; + pthread_attr_setstacksize; + } GLIBC_2.11 { fallocate64; } diff --git a/sysdeps/unix/sysv/linux/powerpc/Versions b/sysdeps/unix/sysv/linux/powerpc/Versions index 416272b..4e81407 100644 --- a/sysdeps/unix/sysv/linux/powerpc/Versions +++ b/sysdeps/unix/sysv/linux/powerpc/Versions @@ -1,4 +1,9 @@ libc { + GLIBC_2.6 { + # Changed PTHREAD_STACK_MIN. + pthread_attr_setstack; + pthread_attr_setstacksize; + } GLIBC_PRIVATE { __vdso_get_tbfreq; __vdso_clock_gettime; diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/Versions b/sysdeps/unix/sysv/linux/powerpc/powerpc32/Versions index ee505ef..918e023 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/Versions +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/Versions @@ -21,11 +21,15 @@ libc { scandir64; } GLIBC_2.3.3 { - posix_fadvise64; posix_fallocate64; setcontext; getcontext; swapcontext; makecontext; } GLIBC_2.3.4 { - setcontext; getcontext; swapcontext; makecontext; + getcontext; + longjmp; + makecontext; + setcontext; + siglongjmp; + swapcontext; } GLIBC_2.11 { fallocate64; @@ -34,9 +38,3 @@ libc { __ppc_get_timebase_freq; } } - -libpthread { - GLIBC_2.3.4 { - longjmp; siglongjmp; - } -} diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/Versions b/sysdeps/unix/sysv/linux/powerpc/powerpc64/Versions index 7a166f2..84c8095 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/Versions +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/Versions @@ -16,7 +16,9 @@ libc { } GLIBC_2.3.4 { getcontext; + longjmp; setcontext; + siglongjmp; swapcontext; } GLIBC_2.17 { @@ -31,9 +33,3 @@ librt { timer_settime; } } - -libpthread { - GLIBC_2.3.4 { - longjmp; siglongjmp; - } -} diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/Versions b/sysdeps/unix/sysv/linux/s390/s390-32/Versions index 9919398..cc03e70 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/Versions +++ b/sysdeps/unix/sysv/linux/s390/s390-32/Versions @@ -26,9 +26,6 @@ libc { # v* versionsort64; } - GLIBC_2.3.3 { - posix_fadvise64; posix_fallocate64; - } GLIBC_2.9 { getutent; getutid; diff --git a/sysdeps/unix/sysv/linux/sh/Versions b/sysdeps/unix/sysv/linux/sh/Versions index e0938c4..19ba1d8 100644 --- a/sysdeps/unix/sysv/linux/sh/Versions +++ b/sysdeps/unix/sysv/linux/sh/Versions @@ -21,9 +21,6 @@ libc { # v* versionsort64; } - GLIBC_2.3.3 { - posix_fadvise64; posix_fallocate64; - } GLIBC_2.11 { fallocate64; } diff --git a/sysdeps/unix/sysv/linux/sparc/Versions b/sysdeps/unix/sysv/linux/sparc/Versions index 61e57fa..f102760 100644 --- a/sysdeps/unix/sysv/linux/sparc/Versions +++ b/sysdeps/unix/sysv/linux/sparc/Versions @@ -8,6 +8,11 @@ libc { GLIBC_2.3 { _sys_errlist; sys_errlist; _sys_nerr; sys_nerr; } + GLIBC_2.3.3 { + # Changed PTHREAD_STACK_MIN. + pthread_attr_setstack; + pthread_attr_setstacksize; + } GLIBC_2.4 { _sys_errlist; sys_errlist; _sys_nerr; sys_nerr; } @@ -25,13 +30,6 @@ libc { } } -libpthread { - GLIBC_2.3.3 { - # Changed PTHREAD_STACK_MIN. - pthread_attr_setstack; pthread_attr_setstacksize; - } -} - librt { GLIBC_2.3 { # AIO functions. diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/Versions b/sysdeps/unix/sysv/linux/sparc/sparc32/Versions index c9a5b3e..d928a65 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/Versions +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/Versions @@ -17,9 +17,6 @@ libc { # s* scandir64; } - GLIBC_2.3.3 { - posix_fadvise64; posix_fallocate64; - } GLIBC_2.11 { fallocate64; } -- 2.7.4