From 640bbdf71c6f10ac26252ac67a22902e26657bd8 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Mon, 19 Jul 2021 07:55:27 +0200 Subject: resolv: Move dn_expand to its own file and into libc And reformat to GNU style. This switches back to the dn_expand name for the ABI symbol and turns __dn_expand into a compatibility symbol. With the improved namespace management in current glibc, it is no longer necessary to use a private namespace symbol. To avoid old code binding to a GLIBC_PRIVATE symbol by accident, use __libc_dn_expand for the internal symbol name. The symbols dn_expand, __dnexpand were moved using scripts/move-symbol-to-libc.py, followed by an adjustment to make dn_expand the only GLIBC_2.34 symbol. Reviewed-by: Carlos O'Donell Tested-by: Carlos O'Donell --- sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist | 2 ++ sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libresolv.abilist | 1 - sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist | 2 ++ sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libresolv.abilist | 1 - 4 files changed, 4 insertions(+), 2 deletions(-) (limited to 'sysdeps/unix/sysv/linux/powerpc/powerpc64') diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist index 615970660b..7e8d35172f 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist @@ -318,6 +318,7 @@ GLIBC_2.3 __daylight D 0x4 GLIBC_2.3 __dcgettext F GLIBC_2.3 __default_morecore F GLIBC_2.3 __dgettext F +GLIBC_2.3 __dn_expand F GLIBC_2.3 __dup2 F GLIBC_2.3 __duplocale F GLIBC_2.3 __endmntent F @@ -2325,6 +2326,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_expand F GLIBC_2.34 execveat F GLIBC_2.34 forkpty F GLIBC_2.34 gai_cancel F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libresolv.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libresolv.abilist index b6e579f3c0..213741bba9 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libresolv.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libresolv.abilist @@ -2,7 +2,6 @@ GLIBC_2.3 __b64_ntop F GLIBC_2.3 __b64_pton F GLIBC_2.3 __dn_comp F GLIBC_2.3 __dn_count_labels F -GLIBC_2.3 __dn_expand F GLIBC_2.3 __dn_skipname F GLIBC_2.3 __fp_nquery F GLIBC_2.3 __fp_query F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist index 7b72a039af..a7db5a8081 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist @@ -165,6 +165,7 @@ GLIBC_2.17 __daylight D 0x4 GLIBC_2.17 __dcgettext F GLIBC_2.17 __default_morecore F GLIBC_2.17 __dgettext F +GLIBC_2.17 __dn_expand F GLIBC_2.17 __dprintf_chk F GLIBC_2.17 __dup2 F GLIBC_2.17 __duplocale F @@ -2627,6 +2628,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_expand F GLIBC_2.34 execveat F GLIBC_2.34 forkpty F GLIBC_2.34 gai_cancel F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libresolv.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libresolv.abilist index 6e740fad8f..4edce71c8e 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libresolv.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libresolv.abilist @@ -2,7 +2,6 @@ GLIBC_2.17 __b64_ntop F GLIBC_2.17 __b64_pton F GLIBC_2.17 __dn_comp F GLIBC_2.17 __dn_count_labels F -GLIBC_2.17 __dn_expand F GLIBC_2.17 __dn_skipname F GLIBC_2.17 __fp_nquery F GLIBC_2.17 __fp_query F -- cgit 1.4.1