From 391e02236b931132c0e8b5ba4c3b087c2aaa1044 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Mon, 19 Jul 2021 07:55:27 +0200 Subject: resolv: Move dn_skipname to its own file and into libc And reformat it to GNU style. dn_skipname is used outside glibc, so do not deprecate it, and export it as dn_skipname (not __dn_skipname). Due to internal users, provide a __libc_dn_skipname alias, and keep __dn_skipname as a pure compatibility symbol. __dn_skipname@GLIBC_2.0 was moved using the script, and dn_skipname@@GLIBC_2.34 was added using make update-all-abi. Reviewed-by: Carlos O'Donell Tested-by: Carlos O'Donell --- sysdeps/unix/sysv/linux/x86_64/64/libc.abilist | 2 ++ sysdeps/unix/sysv/linux/x86_64/64/libresolv.abilist | 1 - sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist | 2 ++ sysdeps/unix/sysv/linux/x86_64/x32/libresolv.abilist | 1 - 4 files changed, 4 insertions(+), 2 deletions(-) (limited to 'sysdeps/unix/sysv/linux/x86_64') diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist index c91a47da4c..e2055934b6 100644 --- a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist +++ b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist @@ -250,6 +250,7 @@ GLIBC_2.2.5 __default_morecore F GLIBC_2.2.5 __dgettext F GLIBC_2.2.5 __dn_comp F GLIBC_2.2.5 __dn_expand F +GLIBC_2.2.5 __dn_skipname F GLIBC_2.2.5 __dup2 F GLIBC_2.2.5 __duplocale F GLIBC_2.2.5 __endmntent F @@ -2344,6 +2345,7 @@ GLIBC_2.34 dlsym F GLIBC_2.34 dlvsym F GLIBC_2.34 dn_comp F GLIBC_2.34 dn_expand F +GLIBC_2.34 dn_skipname F GLIBC_2.34 execveat F GLIBC_2.34 forkpty F GLIBC_2.34 gai_cancel F diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libresolv.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libresolv.abilist index 640facbd02..93c5e8111c 100644 --- a/sysdeps/unix/sysv/linux/x86_64/64/libresolv.abilist +++ b/sysdeps/unix/sysv/linux/x86_64/64/libresolv.abilist @@ -1,7 +1,6 @@ GLIBC_2.2.5 __b64_ntop F GLIBC_2.2.5 __b64_pton F GLIBC_2.2.5 __dn_count_labels F -GLIBC_2.2.5 __dn_skipname F GLIBC_2.2.5 __fp_nquery F GLIBC_2.2.5 __fp_query F GLIBC_2.2.5 __fp_resstat F diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist index 7bad9379c5..f4a1f04c59 100644 --- a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist +++ b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist @@ -168,6 +168,7 @@ GLIBC_2.16 __default_morecore F GLIBC_2.16 __dgettext F GLIBC_2.16 __dn_comp F GLIBC_2.16 __dn_expand F +GLIBC_2.16 __dn_skipname F GLIBC_2.16 __dprintf_chk F GLIBC_2.16 __dup2 F GLIBC_2.16 __duplocale F @@ -2450,6 +2451,7 @@ GLIBC_2.34 dlsym F GLIBC_2.34 dlvsym F GLIBC_2.34 dn_comp F GLIBC_2.34 dn_expand F +GLIBC_2.34 dn_skipname F GLIBC_2.34 execveat F GLIBC_2.34 forkpty F GLIBC_2.34 gai_cancel F diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libresolv.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libresolv.abilist index 6990240c4e..5c84955527 100644 --- a/sysdeps/unix/sysv/linux/x86_64/x32/libresolv.abilist +++ b/sysdeps/unix/sysv/linux/x86_64/x32/libresolv.abilist @@ -1,7 +1,6 @@ GLIBC_2.16 __b64_ntop F GLIBC_2.16 __b64_pton F GLIBC_2.16 __dn_count_labels F -GLIBC_2.16 __dn_skipname F GLIBC_2.16 __fp_nquery F GLIBC_2.16 __fp_query F GLIBC_2.16 __fp_resstat F -- cgit 1.4.1