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/s390/s390-32/libc.abilist | 2 ++ sysdeps/unix/sysv/linux/s390/s390-32/libresolv.abilist | 1 - sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist | 2 ++ sysdeps/unix/sysv/linux/s390/s390-64/libresolv.abilist | 1 - 4 files changed, 4 insertions(+), 2 deletions(-) (limited to 'sysdeps/unix/sysv/linux/s390') diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist index 7d6878ec4d..7efc7e2328 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist +++ b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist @@ -122,6 +122,7 @@ GLIBC_2.0 __deregister_frame F GLIBC_2.0 __deregister_frame_info F GLIBC_2.0 __dgettext F GLIBC_2.0 __divdi3 F +GLIBC_2.0 __dn_comp F GLIBC_2.0 __dup2 F GLIBC_2.0 __environ D 0x4 GLIBC_2.0 __errno_location F @@ -2556,6 +2557,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/s390/s390-32/libresolv.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libresolv.abilist index 1bcda7408c..8ee174124c 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/libresolv.abilist +++ b/sysdeps/unix/sysv/linux/s390/s390-32/libresolv.abilist @@ -1,6 +1,5 @@ GLIBC_2.0 __b64_ntop F GLIBC_2.0 __b64_pton F -GLIBC_2.0 __dn_comp F GLIBC_2.0 __dn_count_labels F GLIBC_2.0 __dn_skipname F GLIBC_2.0 __fp_nquery F diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist index 5a84bfe5fd..b2773db2c4 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist +++ b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist @@ -260,6 +260,7 @@ GLIBC_2.2 __default_morecore F GLIBC_2.2 __deregister_frame F GLIBC_2.2 __deregister_frame_info F GLIBC_2.2 __dgettext F +GLIBC_2.2 __dn_comp F GLIBC_2.2 __dn_expand F GLIBC_2.2 __dup2 F GLIBC_2.2 __duplocale F @@ -2363,6 +2364,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/s390/s390-64/libresolv.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libresolv.abilist index dd96d28ed9..e3ed8ccd8e 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/libresolv.abilist +++ b/sysdeps/unix/sysv/linux/s390/s390-64/libresolv.abilist @@ -1,6 +1,5 @@ GLIBC_2.2 __b64_ntop F GLIBC_2.2 __b64_pton F -GLIBC_2.2 __dn_comp F GLIBC_2.2 __dn_count_labels F GLIBC_2.2 __dn_skipname F GLIBC_2.2 __fp_nquery F -- cgit 1.4.1