From ea9878ec271c791880fcbbe519d70c42f8113750 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Mon, 19 Jul 2021 07:55:27 +0200 Subject: resolv: Move res_query functions into libc This switches to public symbols without __ prefixes, due to improved namespace management in glibc. The script was used with --no-new-version to move the symbols __res_nquery, __res_nquerydomain, __res_nsearch, __res_query, __res_querydomain, __res_search, res_query, res_querydomain, res_search. The public symbols res_nquery, res_nquerydomain, res_nsearch, res_ownok, res_query, res_querydomain, res_search were 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 | 15 +++++++++++++++ sysdeps/unix/sysv/linux/s390/s390-32/libresolv.abilist | 9 --------- sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist | 12 ++++++++++++ sysdeps/unix/sysv/linux/s390/s390-64/libresolv.abilist | 6 ------ 4 files changed, 27 insertions(+), 15 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 1e68f5cbd9..f803a1093c 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist +++ b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist @@ -980,6 +980,9 @@ GLIBC_2.0 remque F GLIBC_2.0 rename F GLIBC_2.0 res_init F GLIBC_2.0 res_mkquery F +GLIBC_2.0 res_query F +GLIBC_2.0 res_querydomain F +GLIBC_2.0 res_search F GLIBC_2.0 revoke F GLIBC_2.0 rewind F GLIBC_2.0 rewinddir F @@ -1946,7 +1949,13 @@ GLIBC_2.2 __res_mkquery F GLIBC_2.2 __res_nclose F GLIBC_2.2 __res_ninit F GLIBC_2.2 __res_nmkquery F +GLIBC_2.2 __res_nquery F +GLIBC_2.2 __res_nquerydomain F +GLIBC_2.2 __res_nsearch F GLIBC_2.2 __res_nsend F +GLIBC_2.2 __res_query F +GLIBC_2.2 __res_querydomain F +GLIBC_2.2 __res_search F GLIBC_2.2 __res_state F GLIBC_2.2 __setmntent F GLIBC_2.2 __statfs F @@ -2697,8 +2706,14 @@ GLIBC_2.34 res_hnok F GLIBC_2.34 res_mailok F GLIBC_2.34 res_mkquery F GLIBC_2.34 res_nmkquery F +GLIBC_2.34 res_nquery F +GLIBC_2.34 res_nquerydomain F +GLIBC_2.34 res_nsearch F GLIBC_2.34 res_nsend F GLIBC_2.34 res_ownok F +GLIBC_2.34 res_query F +GLIBC_2.34 res_querydomain F +GLIBC_2.34 res_search F GLIBC_2.34 res_send F GLIBC_2.34 sem_clockwait F GLIBC_2.34 sem_close F diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libresolv.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libresolv.abilist index f2707204ed..56dcd57b6c 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/libresolv.abilist +++ b/sysdeps/unix/sysv/linux/s390/s390-32/libresolv.abilist @@ -42,18 +42,9 @@ GLIBC_2.0 inet_neta F GLIBC_2.0 res_gethostbyaddr F GLIBC_2.0 res_gethostbyname F GLIBC_2.0 res_gethostbyname2 F -GLIBC_2.0 res_query F -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 __res_hostalias F -GLIBC_2.2 __res_nquery F -GLIBC_2.2 __res_nquerydomain F -GLIBC_2.2 __res_nsearch F -GLIBC_2.2 __res_query F -GLIBC_2.2 __res_querydomain F -GLIBC_2.2 __res_search F GLIBC_2.3.2 __p_rcode F GLIBC_2.9 ns_datetosecs F GLIBC_2.9 ns_format_ttl F diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist index 0175572126..3ec521cf52 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist +++ b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist @@ -416,9 +416,15 @@ GLIBC_2.2 __res_mkquery F GLIBC_2.2 __res_nclose F GLIBC_2.2 __res_ninit F GLIBC_2.2 __res_nmkquery F +GLIBC_2.2 __res_nquery F +GLIBC_2.2 __res_nquerydomain F +GLIBC_2.2 __res_nsearch F GLIBC_2.2 __res_nsend F GLIBC_2.2 __res_ownok F +GLIBC_2.2 __res_query F +GLIBC_2.2 __res_querydomain F GLIBC_2.2 __res_randomid F +GLIBC_2.2 __res_search F GLIBC_2.2 __res_send F GLIBC_2.2 __res_state F GLIBC_2.2 __sbrk F @@ -2503,8 +2509,14 @@ GLIBC_2.34 res_hnok F GLIBC_2.34 res_mailok F GLIBC_2.34 res_mkquery F GLIBC_2.34 res_nmkquery F +GLIBC_2.34 res_nquery F +GLIBC_2.34 res_nquerydomain F +GLIBC_2.34 res_nsearch F GLIBC_2.34 res_nsend F GLIBC_2.34 res_ownok F +GLIBC_2.34 res_query F +GLIBC_2.34 res_querydomain F +GLIBC_2.34 res_search F GLIBC_2.34 res_send F GLIBC_2.34 sem_clockwait F GLIBC_2.34 sem_close F diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libresolv.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libresolv.abilist index 3b8ffd2766..7f2b4f6cab 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/libresolv.abilist +++ b/sysdeps/unix/sysv/linux/s390/s390-64/libresolv.abilist @@ -25,13 +25,7 @@ GLIBC_2.2 __res_close F GLIBC_2.2 __res_hostalias F GLIBC_2.2 __res_isourserver F GLIBC_2.2 __res_nameinquery F -GLIBC_2.2 __res_nquery F -GLIBC_2.2 __res_nquerydomain F -GLIBC_2.2 __res_nsearch F GLIBC_2.2 __res_queriesmatch F -GLIBC_2.2 __res_query F -GLIBC_2.2 __res_querydomain F -GLIBC_2.2 __res_search F GLIBC_2.2 __sym_ntop F GLIBC_2.2 __sym_ntos F GLIBC_2.2 __sym_ston F -- cgit v1.2.3