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/aarch64/libc.abilist | 2 ++ sysdeps/unix/sysv/linux/aarch64/libresolv.abilist | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'sysdeps/unix/sysv/linux/aarch64') diff --git a/sysdeps/unix/sysv/linux/aarch64/libc.abilist b/sysdeps/unix/sysv/linux/aarch64/libc.abilist index 8ae8992..2165aff 100644 --- a/sysdeps/unix/sysv/linux/aarch64/libc.abilist +++ b/sysdeps/unix/sysv/linux/aarch64/libc.abilist @@ -166,6 +166,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 @@ -2431,6 +2432,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/aarch64/libresolv.abilist b/sysdeps/unix/sysv/linux/aarch64/libresolv.abilist index 6e740fa..4edce71 100644 --- a/sysdeps/unix/sysv/linux/aarch64/libresolv.abilist +++ b/sysdeps/unix/sysv/linux/aarch64/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 v1.1