From dbb949f53d4801b91885b2dfac9875b83a8710bf Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Fri, 2 Jul 2021 11:45:00 +0200 Subject: resolv: Move libanl into libc (if libpthread is in libc) The symbols gai_cancel, gai_error, gai_suspend, getaddrinfo_a, __gai_suspend_time64 were moved using scripts/move-symbol-to-libc.py. For Hurd (which remains !PTHREAD_IN_LIBC), a few #define redirects had to be added because several pthread functions are not available under __. (Linux uses __ prefixes for most hidden aliases, and has to in some cases to avoid linknamespace issues.) --- sysdeps/unix/sysv/linux/x86_64/64/libanl.abilist | 5 +---- sysdeps/unix/sysv/linux/x86_64/64/libc.abilist | 8 ++++++++ sysdeps/unix/sysv/linux/x86_64/x32/libanl.abilist | 5 +---- sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist | 8 ++++++++ 4 files changed, 18 insertions(+), 8 deletions(-) (limited to 'sysdeps/unix/sysv/linux/x86_64') diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libanl.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libanl.abilist index 8d025f86b9..62a072e961 100644 --- a/sysdeps/unix/sysv/linux/x86_64/64/libanl.abilist +++ b/sysdeps/unix/sysv/linux/x86_64/64/libanl.abilist @@ -1,4 +1 @@ -GLIBC_2.2.5 gai_cancel F -GLIBC_2.2.5 gai_error F -GLIBC_2.2.5 gai_suspend F -GLIBC_2.2.5 getaddrinfo_a F +GLIBC_2.2.5 __libanl_version_placeholder F diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist index 0d98e85292..57c4f28d17 100644 --- a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist +++ b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist @@ -868,7 +868,10 @@ GLIBC_2.2.5 fwprintf F GLIBC_2.2.5 fwrite F GLIBC_2.2.5 fwrite_unlocked F GLIBC_2.2.5 fwscanf F +GLIBC_2.2.5 gai_cancel F +GLIBC_2.2.5 gai_error F GLIBC_2.2.5 gai_strerror F +GLIBC_2.2.5 gai_suspend F GLIBC_2.2.5 gcvt F GLIBC_2.2.5 get_avphys_pages F GLIBC_2.2.5 get_current_dir_name F @@ -878,6 +881,7 @@ GLIBC_2.2.5 get_nprocs F GLIBC_2.2.5 get_nprocs_conf F GLIBC_2.2.5 get_phys_pages F GLIBC_2.2.5 getaddrinfo F +GLIBC_2.2.5 getaddrinfo_a F GLIBC_2.2.5 getaliasbyname F GLIBC_2.2.5 getaliasbyname_r F GLIBC_2.2.5 getaliasent F @@ -2338,6 +2342,10 @@ GLIBC_2.34 dlsym F GLIBC_2.34 dlvsym F GLIBC_2.34 execveat F GLIBC_2.34 forkpty F +GLIBC_2.34 gai_cancel F +GLIBC_2.34 gai_error F +GLIBC_2.34 gai_suspend F +GLIBC_2.34 getaddrinfo_a F GLIBC_2.34 lio_listio F GLIBC_2.34 lio_listio64 F GLIBC_2.34 login F diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libanl.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libanl.abilist index 067013555a..097f7def8c 100644 --- a/sysdeps/unix/sysv/linux/x86_64/x32/libanl.abilist +++ b/sysdeps/unix/sysv/linux/x86_64/x32/libanl.abilist @@ -1,4 +1 @@ -GLIBC_2.16 gai_cancel F -GLIBC_2.16 gai_error F -GLIBC_2.16 gai_suspend F -GLIBC_2.16 getaddrinfo_a F +GLIBC_2.16 __libanl_version_placeholder F diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist index b6d917c71e..47211abe4e 100644 --- a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist +++ b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist @@ -941,7 +941,10 @@ GLIBC_2.16 fwprintf F GLIBC_2.16 fwrite F GLIBC_2.16 fwrite_unlocked F GLIBC_2.16 fwscanf F +GLIBC_2.16 gai_cancel F +GLIBC_2.16 gai_error F GLIBC_2.16 gai_strerror F +GLIBC_2.16 gai_suspend F GLIBC_2.16 gcvt F GLIBC_2.16 get_avphys_pages F GLIBC_2.16 get_current_dir_name F @@ -951,6 +954,7 @@ GLIBC_2.16 get_nprocs F GLIBC_2.16 get_nprocs_conf F GLIBC_2.16 get_phys_pages F GLIBC_2.16 getaddrinfo F +GLIBC_2.16 getaddrinfo_a F GLIBC_2.16 getaliasbyname F GLIBC_2.16 getaliasbyname_r F GLIBC_2.16 getaliasent F @@ -2437,6 +2441,10 @@ GLIBC_2.34 dlsym F GLIBC_2.34 dlvsym F GLIBC_2.34 execveat F GLIBC_2.34 forkpty F +GLIBC_2.34 gai_cancel F +GLIBC_2.34 gai_error F +GLIBC_2.34 gai_suspend F +GLIBC_2.34 getaddrinfo_a F GLIBC_2.34 lio_listio F GLIBC_2.34 lio_listio64 F GLIBC_2.34 login F -- cgit 1.4.1