diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-07-19 07:55:27 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2021-07-19 07:56:21 +0200 |
| commit | 640bbdf71c6f10ac26252ac67a22902e26657bd8 (patch) | |
| tree | 227d6260dda188bdc22f2d9a6b52acd77c3d68b7 /sysdeps/unix/sysv/linux/s390 | |
| parent | 13e1f86706e463de4429f7e88f47c6ff65cd845e (diff) | |
| download | glibc-640bbdf71c6f10ac26252ac67a22902e26657bd8.tar.gz | |
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 <carlos@redhat.com>
Tested-by: Carlos O'Donell <carlos@redhat.com>
Diffstat (limited to 'sysdeps/unix/sysv/linux/s390')
4 files changed, 5 insertions, 3 deletions
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist index e35e1c62b6..7d6878ec4d 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist +++ b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist @@ -400,6 +400,7 @@ GLIBC_2.0 dlclose F GLIBC_2.0 dlerror F GLIBC_2.0 dlopen F GLIBC_2.0 dlsym F +GLIBC_2.0 dn_expand F GLIBC_2.0 dprintf F GLIBC_2.0 drand48 F GLIBC_2.0 drand48_r F @@ -1907,6 +1908,7 @@ GLIBC_2.2 __ctype32_tolower D 0x4 GLIBC_2.2 __ctype32_toupper D 0x4 GLIBC_2.2 __cyg_profile_func_enter F GLIBC_2.2 __cyg_profile_func_exit F +GLIBC_2.2 __dn_expand F GLIBC_2.2 __endmntent F GLIBC_2.2 __fbufsize F GLIBC_2.2 __flbf F @@ -2554,6 +2556,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/s390/s390-32/libresolv.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libresolv.abilist index 04952c33e8..1bcda7408c 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/libresolv.abilist +++ b/sysdeps/unix/sysv/linux/s390/s390-32/libresolv.abilist @@ -43,7 +43,6 @@ GLIBC_2.0 _getlong F GLIBC_2.0 _getshort F GLIBC_2.0 _res_opcodes D 0x40 GLIBC_2.0 _sethtent F -GLIBC_2.0 dn_expand F GLIBC_2.0 inet_net_ntop F GLIBC_2.0 inet_net_pton F GLIBC_2.0 inet_neta F @@ -56,7 +55,6 @@ GLIBC_2.0 res_querydomain F GLIBC_2.0 res_search F GLIBC_2.0 res_send_setqhook F GLIBC_2.0 res_send_setrhook F -GLIBC_2.2 __dn_expand F GLIBC_2.2 __res_hostalias F GLIBC_2.2 __res_mkquery F GLIBC_2.2 __res_nmkquery F diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist index 4c159037c8..5a84bfe5fd 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_expand F GLIBC_2.2 __dup2 F GLIBC_2.2 __duplocale F GLIBC_2.2 __endmntent F @@ -2362,6 +2363,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/s390/s390-64/libresolv.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libresolv.abilist index 555833e09e..dd96d28ed9 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/libresolv.abilist +++ b/sysdeps/unix/sysv/linux/s390/s390-64/libresolv.abilist @@ -2,7 +2,6 @@ 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_expand F GLIBC_2.2 __dn_skipname F GLIBC_2.2 __fp_nquery F GLIBC_2.2 __fp_query F |