From fd8a87c0c1932de591e7ad108ff6288a4b6b18c9 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Mon, 19 Jul 2021 07:55:27 +0200 Subject: resolv: Move dn_comp to its own file and into libc And reformat it to GNU style. dn_comp is used in various programs, so keep it as a non-deprecated symbol. Switch to dn_comp (not __dn_comp) for the ABI name. There are no internal users, so interposition is not a problem. The __dn_comp symbol was moved with scripts/move-symbol-to-libc.py --no-new-version. dn_comp@@GLIBC_2.34 was added with make update-all-abi. Reviewed-by: Carlos O'Donell Tested-by: Carlos O'Donell --- sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist | 2 ++ sysdeps/unix/sysv/linux/x86_64/x32/libresolv.abilist | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'sysdeps/unix/sysv/linux/x86_64/x32') diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist index 5c5110c425..7bad9379c5 100644 --- a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist +++ b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist @@ -166,6 +166,7 @@ GLIBC_2.16 __daylight D 0x4 GLIBC_2.16 __dcgettext F 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 __dprintf_chk F GLIBC_2.16 __dup2 F @@ -2447,6 +2448,7 @@ GLIBC_2.34 dlmopen F GLIBC_2.34 dlopen F 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 execveat F GLIBC_2.34 forkpty F diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libresolv.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libresolv.abilist index 20574620f8..6990240c4e 100644 --- a/sysdeps/unix/sysv/linux/x86_64/x32/libresolv.abilist +++ b/sysdeps/unix/sysv/linux/x86_64/x32/libresolv.abilist @@ -1,6 +1,5 @@ GLIBC_2.16 __b64_ntop F GLIBC_2.16 __b64_pton F -GLIBC_2.16 __dn_comp F GLIBC_2.16 __dn_count_labels F GLIBC_2.16 __dn_skipname F GLIBC_2.16 __fp_nquery F -- cgit 1.4.1