[16/30] resolv: Rename res_comp.c to res-name-checking.c and move into libc

Message ID 5d78b9f4507b1b7b5a8dcdf8d92b64444c64c4d8.1625251244.git.fweimer@redhat.com
State Superseded
Headers show
Series
  • Move nss_dns into libc
Related show

Commit Message

Adhemerval Zanella via Libc-alpha July 2, 2021, 6:48 p.m.
This reflects what the remaining functions in the file do.

The __res_dnok, __res_hnok, __res_mailok, __res_ownok were moved
with the script, using --no-new-version, and turned into compat
symbols.  __libc_res_dnok@@GLIBC_PRIVATE and
__libc_res_hnok@@GLIBC_PRIVATE are added for internal use, to avoid
accidentally binding to compatibility symbols.  The new public
symbols res_dnok, res_hnok, res_mailok, res_ownok were added using
make update-all-abi.
---
 include/resolv.h                              |  6 ++-
 resolv/Makefile                               |  2 +-
 resolv/Versions                               | 14 ++++--
 resolv/{res_comp.c => res-name-checking.c}    | 48 ++++++++++++-------
 resolv/resolv.h                               |  4 --
 sysdeps/mach/hurd/i386/libc.abilist           |  8 ++++
 sysdeps/mach/hurd/i386/libresolv.abilist      |  4 --
 sysdeps/unix/sysv/linux/aarch64/libc.abilist  |  8 ++++
 .../unix/sysv/linux/aarch64/libresolv.abilist |  4 --
 sysdeps/unix/sysv/linux/alpha/libc.abilist    |  8 ++++
 .../unix/sysv/linux/alpha/libresolv.abilist   |  4 --
 sysdeps/unix/sysv/linux/arc/libc.abilist      |  8 ++++
 sysdeps/unix/sysv/linux/arc/libresolv.abilist |  4 --
 sysdeps/unix/sysv/linux/arm/be/libc.abilist   |  8 ++++
 .../unix/sysv/linux/arm/be/libresolv.abilist  |  4 --
 sysdeps/unix/sysv/linux/arm/le/libc.abilist   |  8 ++++
 .../unix/sysv/linux/arm/le/libresolv.abilist  |  4 --
 sysdeps/unix/sysv/linux/csky/libc.abilist     |  8 ++++
 .../unix/sysv/linux/csky/libresolv.abilist    |  4 --
 sysdeps/unix/sysv/linux/hppa/libc.abilist     |  8 ++++
 .../unix/sysv/linux/hppa/libresolv.abilist    |  4 --
 sysdeps/unix/sysv/linux/i386/libc.abilist     |  8 ++++
 .../unix/sysv/linux/i386/libresolv.abilist    |  4 --
 sysdeps/unix/sysv/linux/ia64/libc.abilist     |  8 ++++
 .../unix/sysv/linux/ia64/libresolv.abilist    |  4 --
 .../sysv/linux/m68k/coldfire/libc.abilist     |  8 ++++
 .../linux/m68k/coldfire/libresolv.abilist     |  4 --
 .../unix/sysv/linux/m68k/m680x0/libc.abilist  |  8 ++++
 .../sysv/linux/m68k/m680x0/libresolv.abilist  |  4 --
 .../sysv/linux/microblaze/be/libc.abilist     |  8 ++++
 .../linux/microblaze/be/libresolv.abilist     |  4 --
 .../sysv/linux/microblaze/le/libc.abilist     |  8 ++++
 .../linux/microblaze/le/libresolv.abilist     |  4 --
 .../sysv/linux/mips/mips32/fpu/libc.abilist   |  8 ++++
 .../sysv/linux/mips/mips32/libresolv.abilist  |  4 --
 .../sysv/linux/mips/mips32/nofpu/libc.abilist |  8 ++++
 .../sysv/linux/mips/mips64/n32/libc.abilist   |  8 ++++
 .../linux/mips/mips64/n32/libresolv.abilist   |  4 --
 .../sysv/linux/mips/mips64/n64/libc.abilist   |  8 ++++
 .../linux/mips/mips64/n64/libresolv.abilist   |  4 --
 sysdeps/unix/sysv/linux/nios2/libc.abilist    |  8 ++++
 .../unix/sysv/linux/nios2/libresolv.abilist   |  4 --
 .../linux/powerpc/powerpc32/fpu/libc.abilist  |  8 ++++
 .../linux/powerpc/powerpc32/libresolv.abilist |  4 --
 .../powerpc/powerpc32/nofpu/libc.abilist      |  8 ++++
 .../linux/powerpc/powerpc64/be/libc.abilist   |  8 ++++
 .../powerpc/powerpc64/be/libresolv.abilist    |  4 --
 .../linux/powerpc/powerpc64/le/libc.abilist   |  8 ++++
 .../powerpc/powerpc64/le/libresolv.abilist    |  4 --
 .../unix/sysv/linux/riscv/rv32/libc.abilist   |  8 ++++
 .../sysv/linux/riscv/rv32/libresolv.abilist   |  4 --
 .../unix/sysv/linux/riscv/rv64/libc.abilist   |  8 ++++
 .../sysv/linux/riscv/rv64/libresolv.abilist   |  4 --
 .../unix/sysv/linux/s390/s390-32/libc.abilist |  8 ++++
 .../sysv/linux/s390/s390-32/libresolv.abilist |  4 --
 .../unix/sysv/linux/s390/s390-64/libc.abilist |  8 ++++
 .../sysv/linux/s390/s390-64/libresolv.abilist |  4 --
 sysdeps/unix/sysv/linux/sh/be/libc.abilist    |  8 ++++
 .../unix/sysv/linux/sh/be/libresolv.abilist   |  4 --
 sysdeps/unix/sysv/linux/sh/le/libc.abilist    |  8 ++++
 .../unix/sysv/linux/sh/le/libresolv.abilist   |  4 --
 .../sysv/linux/sparc/sparc32/libc.abilist     |  8 ++++
 .../linux/sparc/sparc32/libresolv.abilist     |  4 --
 .../sysv/linux/sparc/sparc64/libc.abilist     |  8 ++++
 .../linux/sparc/sparc64/libresolv.abilist     |  4 --
 .../unix/sysv/linux/x86_64/64/libc.abilist    |  8 ++++
 .../sysv/linux/x86_64/64/libresolv.abilist    |  4 --
 .../unix/sysv/linux/x86_64/x32/libc.abilist   |  8 ++++
 .../sysv/linux/x86_64/x32/libresolv.abilist   |  4 --
 69 files changed, 309 insertions(+), 153 deletions(-)
 rename resolv/{res_comp.c => res-name-checking.c} (82%)

-- 
2.31.1

Patch

diff --git a/include/resolv.h b/include/resolv.h
index 378b36d612..0c8db600d6 100644
--- a/include/resolv.h
+++ b/include/resolv.h
@@ -44,8 +44,6 @@  libresolv_hidden_proto (_sethtent)
 libresolv_hidden_proto (_gethtent)
 libresolv_hidden_proto (_gethtbyaddr)
 libresolv_hidden_proto (_gethtbyname2)
-libresolv_hidden_proto (__res_hnok)
-libresolv_hidden_proto (__res_dnok)
 libresolv_hidden_proto (__putlong)
 libresolv_hidden_proto (__putshort)
 libresolv_hidden_proto (__p_cdnname)
@@ -67,6 +65,10 @@  extern __typeof (dn_expand) __libc_dn_expand;
 libc_hidden_proto (__libc_dn_expand)
 extern __typeof (dn_skipname) __libc_dn_skipname;
 libc_hidden_proto (__libc_dn_skipname)
+extern __typeof (res_dnok) __libc_res_dnok;
+libc_hidden_proto (__libc_res_dnok)
+extern __typeof (res_hnok) __libc_res_hnok;
+libc_hidden_proto (__libc_res_hnok)
 
 # endif /* _RESOLV_H_ && !_ISOMAC */
 #endif
diff --git a/resolv/Makefile b/resolv/Makefile
index e1a608f4ac..7e142b9a14 100644
--- a/resolv/Makefile
+++ b/resolv/Makefile
@@ -44,6 +44,7 @@  routines := \
   ns_name_unpack \
   nsap_addr \
   res-close \
+  res-name-checking \
   res-state \
   res_hconf \
   res_init \
@@ -142,7 +143,6 @@  libresolv-routines := \
   ns_samedomain \
   ns_ttl \
   res-putget \
-  res_comp \
   res_data \
   res_debug \
   res_enable_icmp \
diff --git a/resolv/Versions b/resolv/Versions
index 634c7833a8..3e3b89a0b2 100644
--- a/resolv/Versions
+++ b/resolv/Versions
@@ -3,6 +3,10 @@  libc {
     __dn_comp;
     __dn_skipname;
     __h_errno_location;
+    __res_dnok;
+    __res_hnok;
+    __res_mailok;
+    __res_ownok;
     __res_randomid;
     _res;
     dn_expand;
@@ -54,6 +58,10 @@  libc {
     ns_name_skip;
     ns_name_uncompress;
     ns_name_unpack;
+    res_dnok;
+    res_hnok;
+    res_mailok;
+    res_ownok;
   }
   GLIBC_PRIVATE {
 %if !PTHREAD_IN_LIBC
@@ -64,6 +72,8 @@  libc {
     __inet_pton_length;
     __libc_dn_expand;
     __libc_dn_skipname;
+    __libc_res_dnok;
+    __libc_res_hnok;
     __ns_name_compress;
     __ns_name_ntop;
     __ns_name_pack;
@@ -107,12 +117,8 @@  libresolv {
     __putlong;
     __putshort;
     __res_close;
-    __res_dnok;
-    __res_hnok;
     __res_isourserver;
-    __res_mailok;
     __res_nameinquery;
-    __res_ownok;
     __res_queriesmatch;
     __res_send;
     __sym_ntop;
diff --git a/resolv/res_comp.c b/resolv/res-name-checking.c
similarity index 82%
rename from resolv/res_comp.c
rename to resolv/res-name-checking.c
index 16f7e02111..2c603494fa 100644
--- a/resolv/res_comp.c
+++ b/resolv/res-name-checking.c
@@ -1,4 +1,4 @@ 
-/* Domain name processing functions.
+/* Syntax checking for DNS domain names.
    Copyright (C) 1995-2021 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -82,15 +82,9 @@ 
  * SOFTWARE.
  */
 
-#include <sys/types.h>
-#include <sys/param.h>
-#include <netinet/in.h>
 #include <arpa/nameser.h>
-#include <ctype.h>
 #include <resolv.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
+#include <shlib-compat.h>
 
 /* Return true if the string consists of printable ASCII characters
    only.  */
@@ -148,25 +142,30 @@  binary_leading_dash (const unsigned char *dn)
    contain [0-9a-zA-Z_-] characters, and the name must not start with
    a '-'.  The latter is to avoid confusion with program options.  */
 int
-res_hnok (const char *dn)
+___res_hnok (const char *dn)
 {
   unsigned char buf[NS_MAXCDNAME];
   if (!printable_string (dn)
-      || ns_name_pton (dn, buf, sizeof (buf)) < 0
+      || __ns_name_pton (dn, buf, sizeof (buf)) < 0
       || binary_leading_dash (buf))
     return 0;
   return binary_hnok (buf);
 }
-libresolv_hidden_def (res_hnok)
+versioned_symbol (libc, ___res_hnok, res_hnok, GLIBC_2_34);
+versioned_symbol (libc, ___res_hnok, __libc_res_hnok, GLIBC_PRIVATE);
+libc_hidden_ver (___res_hnok, __libc_res_hnok)
+#if OTHER_SHLIB_COMPAT (libresolv, GLIBC_2_0, GLIBC_2_34)
+compat_symbol (libresolv, ___res_hnok, __res_hnok, GLIBC_2_0);
+#endif
 
 /* Hostname-like (A, MX, WKS) owners can have "*" as their first label
    but must otherwise be as a host name.  */
 int
-res_ownok (const char *dn)
+___res_ownok (const char *dn)
 {
   unsigned char buf[NS_MAXCDNAME];
   if (!printable_string (dn)
-      || ns_name_pton (dn, buf, sizeof (buf)) < 0
+      || __ns_name_pton (dn, buf, sizeof (buf)) < 0
       || binary_leading_dash (buf))
     return 0;
   if (buf[0] == 1 && buf [1] == '*')
@@ -175,15 +174,19 @@  res_ownok (const char *dn)
   else
     return binary_hnok (buf);
 }
+versioned_symbol (libc, ___res_ownok, res_ownok, GLIBC_2_34);
+#if OTHER_SHLIB_COMPAT (libresolv, GLIBC_2_0, GLIBC_2_34)
+compat_symbol (libresolv, ___res_ownok, __res_ownok, GLIBC_2_0);
+#endif
 
 /* SOA RNAMEs and RP RNAMEs can have any byte in their first label,
    but the rest of the name has to look like a host name.  */
 int
-res_mailok (const char *dn)
+___res_mailok (const char *dn)
 {
   unsigned char buf[NS_MAXCDNAME];
   if (!printable_string (dn)
-      || ns_name_pton (dn, buf, sizeof (buf)) < 0)
+      || __ns_name_pton (dn, buf, sizeof (buf)) < 0)
     return 0;
   unsigned char label_length = buf[0];
   /* "." is a valid missing representation */
@@ -196,13 +199,22 @@  res_mailok (const char *dn)
     return 0;
   return binary_hnok (tail);
 }
+versioned_symbol (libc, ___res_mailok, res_mailok, GLIBC_2_34);
+#if OTHER_SHLIB_COMPAT (libresolv, GLIBC_2_0, GLIBC_2_34)
+compat_symbol (libresolv, ___res_mailok, __res_mailok, GLIBC_2_0);
+#endif
 
 /* Return 1 if DN is a syntactically valid domain name.  Empty names
    are accepted.  */
 int
-res_dnok (const char *dn)
+___res_dnok (const char *dn)
 {
   unsigned char buf[NS_MAXCDNAME];
-  return printable_string (dn) && ns_name_pton (dn, buf, sizeof (buf)) >= 0;
+  return printable_string (dn) && __ns_name_pton (dn, buf, sizeof (buf)) >= 0;
 }
-libresolv_hidden_def (res_dnok)
+versioned_symbol (libc, ___res_dnok, res_dnok, GLIBC_2_34);
+versioned_symbol (libc, ___res_dnok, __libc_res_dnok, GLIBC_PRIVATE);
+libc_hidden_ver (___res_dnok, __libc_res_dnok)
+#if OTHER_SHLIB_COMPAT (libresolv, GLIBC_2_0, GLIBC_2_34)
+compat_symbol (libresolv, ___res_dnok, __res_dnok, GLIBC_2_0);
+#endif
diff --git a/resolv/resolv.h b/resolv/resolv.h
index 3056e1aafe..d4e401b580 100644
--- a/resolv/resolv.h
+++ b/resolv/resolv.h
@@ -225,10 +225,7 @@  __END_DECLS
 #define p_rcode			__p_rcode
 #define putlong			__putlong
 #define putshort		__putshort
-#define res_dnok		__res_dnok
-#define res_hnok		__res_hnok
 #define res_hostalias		__res_hostalias
-#define res_mailok		__res_mailok
 #define res_nameinquery		__res_nameinquery
 #define res_nclose		__res_nclose
 #define res_ninit		__res_ninit
@@ -237,7 +234,6 @@  __END_DECLS
 #define res_nquerydomain	__res_nquerydomain
 #define res_nsearch		__res_nsearch
 #define res_nsend		__res_nsend
-#define res_ownok		__res_ownok
 #define res_queriesmatch	__res_queriesmatch
 #define res_randomid		__res_randomid
 #define sym_ntop		__sym_ntop
diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist
index 3e9d6345bb..0c2b5983a8 100644
--- a/sysdeps/mach/hurd/i386/libc.abilist
+++ b/sysdeps/mach/hurd/i386/libc.abilist
@@ -401,9 +401,13 @@  GLIBC_2.2.6 __rawmemchr F
 GLIBC_2.2.6 __rcmd_errstr D 0x4
 GLIBC_2.2.6 __read F
 GLIBC_2.2.6 __realloc_hook D 0x4
+GLIBC_2.2.6 __res_dnok F
+GLIBC_2.2.6 __res_hnok F
 GLIBC_2.2.6 __res_init F
+GLIBC_2.2.6 __res_mailok F
 GLIBC_2.2.6 __res_nclose F
 GLIBC_2.2.6 __res_ninit F
+GLIBC_2.2.6 __res_ownok F
 GLIBC_2.2.6 __res_randomid F
 GLIBC_2.2.6 __res_state F
 GLIBC_2.2.6 __rpc_thread_createerr F
@@ -2254,6 +2258,10 @@  GLIBC_2.34 ns_name_skip F
 GLIBC_2.34 ns_name_uncompress F
 GLIBC_2.34 ns_name_unpack F
 GLIBC_2.34 openpty F
+GLIBC_2.34 res_dnok F
+GLIBC_2.34 res_hnok F
+GLIBC_2.34 res_mailok F
+GLIBC_2.34 res_ownok F
 GLIBC_2.34 shm_open F
 GLIBC_2.34 shm_unlink F
 GLIBC_2.34 timespec_getres F
diff --git a/sysdeps/mach/hurd/i386/libresolv.abilist b/sysdeps/mach/hurd/i386/libresolv.abilist
index 0c8d828f26..8166e6af58 100644
--- a/sysdeps/mach/hurd/i386/libresolv.abilist
+++ b/sysdeps/mach/hurd/i386/libresolv.abilist
@@ -22,11 +22,8 @@  GLIBC_2.2.6 __p_type_syms D 0x228
 GLIBC_2.2.6 __putlong F
 GLIBC_2.2.6 __putshort F
 GLIBC_2.2.6 __res_close F
-GLIBC_2.2.6 __res_dnok F
-GLIBC_2.2.6 __res_hnok F
 GLIBC_2.2.6 __res_hostalias F
 GLIBC_2.2.6 __res_isourserver F
-GLIBC_2.2.6 __res_mailok F
 GLIBC_2.2.6 __res_mkquery F
 GLIBC_2.2.6 __res_nameinquery F
 GLIBC_2.2.6 __res_nmkquery F
@@ -34,7 +31,6 @@  GLIBC_2.2.6 __res_nquery F
 GLIBC_2.2.6 __res_nquerydomain F
 GLIBC_2.2.6 __res_nsearch F
 GLIBC_2.2.6 __res_nsend F
-GLIBC_2.2.6 __res_ownok F
 GLIBC_2.2.6 __res_queriesmatch F
 GLIBC_2.2.6 __res_query F
 GLIBC_2.2.6 __res_querydomain F
diff --git a/sysdeps/unix/sysv/linux/aarch64/libc.abilist b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
index 22beee3228..cb2bfd3779 100644
--- a/sysdeps/unix/sysv/linux/aarch64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
@@ -380,9 +380,13 @@  GLIBC_2.17 __realpath_chk F
 GLIBC_2.17 __recv_chk F
 GLIBC_2.17 __recvfrom_chk F
 GLIBC_2.17 __register_atfork F
+GLIBC_2.17 __res_dnok F
+GLIBC_2.17 __res_hnok F
 GLIBC_2.17 __res_init F
+GLIBC_2.17 __res_mailok F
 GLIBC_2.17 __res_nclose F
 GLIBC_2.17 __res_ninit F
+GLIBC_2.17 __res_ownok F
 GLIBC_2.17 __res_randomid F
 GLIBC_2.17 __res_state F
 GLIBC_2.17 __rpc_thread_createerr F
@@ -2558,6 +2562,10 @@  GLIBC_2.34 pthread_spin_unlock F
 GLIBC_2.34 pthread_testcancel F
 GLIBC_2.34 pthread_timedjoin_np F
 GLIBC_2.34 pthread_tryjoin_np F
+GLIBC_2.34 res_dnok F
+GLIBC_2.34 res_hnok F
+GLIBC_2.34 res_mailok F
+GLIBC_2.34 res_ownok F
 GLIBC_2.34 sem_clockwait F
 GLIBC_2.34 sem_close F
 GLIBC_2.34 sem_destroy F
diff --git a/sysdeps/unix/sysv/linux/aarch64/libresolv.abilist b/sysdeps/unix/sysv/linux/aarch64/libresolv.abilist
index beb6e0efe3..613638f9ce 100644
--- a/sysdeps/unix/sysv/linux/aarch64/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/aarch64/libresolv.abilist
@@ -23,11 +23,8 @@  GLIBC_2.17 __p_type_syms D 0x450
 GLIBC_2.17 __putlong F
 GLIBC_2.17 __putshort F
 GLIBC_2.17 __res_close F
-GLIBC_2.17 __res_dnok F
-GLIBC_2.17 __res_hnok F
 GLIBC_2.17 __res_hostalias F
 GLIBC_2.17 __res_isourserver F
-GLIBC_2.17 __res_mailok F
 GLIBC_2.17 __res_mkquery F
 GLIBC_2.17 __res_nameinquery F
 GLIBC_2.17 __res_nmkquery F
@@ -35,7 +32,6 @@  GLIBC_2.17 __res_nquery F
 GLIBC_2.17 __res_nquerydomain F
 GLIBC_2.17 __res_nsearch F
 GLIBC_2.17 __res_nsend F
-GLIBC_2.17 __res_ownok F
 GLIBC_2.17 __res_queriesmatch F
 GLIBC_2.17 __res_query F
 GLIBC_2.17 __res_querydomain F
diff --git a/sysdeps/unix/sysv/linux/alpha/libc.abilist b/sysdeps/unix/sysv/linux/alpha/libc.abilist
index 17c3124f0b..31882ba563 100644
--- a/sysdeps/unix/sysv/linux/alpha/libc.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist
@@ -213,6 +213,10 @@  GLIBC_2.0 __reml F
 GLIBC_2.0 __remlu F
 GLIBC_2.0 __remq F
 GLIBC_2.0 __remqu F
+GLIBC_2.0 __res_dnok F
+GLIBC_2.0 __res_hnok F
+GLIBC_2.0 __res_mailok F
+GLIBC_2.0 __res_ownok F
 GLIBC_2.0 __res_randomid F
 GLIBC_2.0 __sbrk F
 GLIBC_2.0 __sched_get_priority_max F
@@ -2651,6 +2655,10 @@  GLIBC_2.34 pthread_spin_unlock F
 GLIBC_2.34 pthread_testcancel F
 GLIBC_2.34 pthread_timedjoin_np F
 GLIBC_2.34 pthread_tryjoin_np F
+GLIBC_2.34 res_dnok F
+GLIBC_2.34 res_hnok F
+GLIBC_2.34 res_mailok F
+GLIBC_2.34 res_ownok F
 GLIBC_2.34 sem_clockwait F
 GLIBC_2.34 sem_close F
 GLIBC_2.34 sem_destroy F
diff --git a/sysdeps/unix/sysv/linux/alpha/libresolv.abilist b/sysdeps/unix/sysv/linux/alpha/libresolv.abilist
index 7c80f1818a..abfaf8840f 100644
--- a/sysdeps/unix/sysv/linux/alpha/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libresolv.abilist
@@ -22,12 +22,8 @@  GLIBC_2.0 __p_type_syms D 0x450
 GLIBC_2.0 __putlong F
 GLIBC_2.0 __putshort F
 GLIBC_2.0 __res_close F
-GLIBC_2.0 __res_dnok F
-GLIBC_2.0 __res_hnok F
 GLIBC_2.0 __res_isourserver F
-GLIBC_2.0 __res_mailok F
 GLIBC_2.0 __res_nameinquery F
-GLIBC_2.0 __res_ownok F
 GLIBC_2.0 __res_queriesmatch F
 GLIBC_2.0 __res_send F
 GLIBC_2.0 __sym_ntop F
diff --git a/sysdeps/unix/sysv/linux/arc/libc.abilist b/sysdeps/unix/sysv/linux/arc/libc.abilist
index 3d4bf76924..00462b5520 100644
--- a/sysdeps/unix/sysv/linux/arc/libc.abilist
+++ b/sysdeps/unix/sysv/linux/arc/libc.abilist
@@ -369,9 +369,13 @@  GLIBC_2.32 __realpath_chk F
 GLIBC_2.32 __recv_chk F
 GLIBC_2.32 __recvfrom_chk F
 GLIBC_2.32 __register_atfork F
+GLIBC_2.32 __res_dnok F
+GLIBC_2.32 __res_hnok F
 GLIBC_2.32 __res_init F
+GLIBC_2.32 __res_mailok F
 GLIBC_2.32 __res_nclose F
 GLIBC_2.32 __res_ninit F
+GLIBC_2.32 __res_ownok F
 GLIBC_2.32 __res_randomid F
 GLIBC_2.32 __res_state F
 GLIBC_2.32 __sbrk F
@@ -2317,6 +2321,10 @@  GLIBC_2.34 pthread_spin_unlock F
 GLIBC_2.34 pthread_testcancel F
 GLIBC_2.34 pthread_timedjoin_np F
 GLIBC_2.34 pthread_tryjoin_np F
+GLIBC_2.34 res_dnok F
+GLIBC_2.34 res_hnok F
+GLIBC_2.34 res_mailok F
+GLIBC_2.34 res_ownok F
 GLIBC_2.34 sem_clockwait F
 GLIBC_2.34 sem_close F
 GLIBC_2.34 sem_destroy F
diff --git a/sysdeps/unix/sysv/linux/arc/libresolv.abilist b/sysdeps/unix/sysv/linux/arc/libresolv.abilist
index 81ab66bc6d..f3a103d072 100644
--- a/sysdeps/unix/sysv/linux/arc/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/arc/libresolv.abilist
@@ -22,11 +22,8 @@  GLIBC_2.32 __p_type_syms D 0x228
 GLIBC_2.32 __putlong F
 GLIBC_2.32 __putshort F
 GLIBC_2.32 __res_close F
-GLIBC_2.32 __res_dnok F
-GLIBC_2.32 __res_hnok F
 GLIBC_2.32 __res_hostalias F
 GLIBC_2.32 __res_isourserver F
-GLIBC_2.32 __res_mailok F
 GLIBC_2.32 __res_mkquery F
 GLIBC_2.32 __res_nameinquery F
 GLIBC_2.32 __res_nmkquery F
@@ -34,7 +31,6 @@  GLIBC_2.32 __res_nquery F
 GLIBC_2.32 __res_nquerydomain F
 GLIBC_2.32 __res_nsearch F
 GLIBC_2.32 __res_nsend F
-GLIBC_2.32 __res_ownok F
 GLIBC_2.32 __res_queriesmatch F
 GLIBC_2.32 __res_query F
 GLIBC_2.32 __res_querydomain F
diff --git a/sysdeps/unix/sysv/linux/arm/be/libc.abilist b/sysdeps/unix/sysv/linux/arm/be/libc.abilist
index 686ad0d6a0..ce88c66270 100644
--- a/sysdeps/unix/sysv/linux/arm/be/libc.abilist
+++ b/sysdeps/unix/sysv/linux/arm/be/libc.abilist
@@ -441,6 +441,10 @@  GLIBC_2.34 pthread_spin_unlock F
 GLIBC_2.34 pthread_testcancel F
 GLIBC_2.34 pthread_timedjoin_np F
 GLIBC_2.34 pthread_tryjoin_np F
+GLIBC_2.34 res_dnok F
+GLIBC_2.34 res_hnok F
+GLIBC_2.34 res_mailok F
+GLIBC_2.34 res_ownok F
 GLIBC_2.34 sem_clockwait F
 GLIBC_2.34 sem_close F
 GLIBC_2.34 sem_destroy F
@@ -835,9 +839,13 @@  GLIBC_2.4 __realpath_chk F
 GLIBC_2.4 __recv_chk F
 GLIBC_2.4 __recvfrom_chk F
 GLIBC_2.4 __register_atfork F
+GLIBC_2.4 __res_dnok F
+GLIBC_2.4 __res_hnok F
 GLIBC_2.4 __res_init F
+GLIBC_2.4 __res_mailok F
 GLIBC_2.4 __res_nclose F
 GLIBC_2.4 __res_ninit F
+GLIBC_2.4 __res_ownok F
 GLIBC_2.4 __res_randomid F
 GLIBC_2.4 __res_state F
 GLIBC_2.4 __rpc_thread_createerr F
diff --git a/sysdeps/unix/sysv/linux/arm/be/libresolv.abilist b/sysdeps/unix/sysv/linux/arm/be/libresolv.abilist
index 5c4871fbec..a2ca6abc87 100644
--- a/sysdeps/unix/sysv/linux/arm/be/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/arm/be/libresolv.abilist
@@ -23,11 +23,8 @@  GLIBC_2.4 __p_type_syms D 0x228
 GLIBC_2.4 __putlong F
 GLIBC_2.4 __putshort F
 GLIBC_2.4 __res_close F
-GLIBC_2.4 __res_dnok F
-GLIBC_2.4 __res_hnok F
 GLIBC_2.4 __res_hostalias F
 GLIBC_2.4 __res_isourserver F
-GLIBC_2.4 __res_mailok F
 GLIBC_2.4 __res_mkquery F
 GLIBC_2.4 __res_nameinquery F
 GLIBC_2.4 __res_nmkquery F
@@ -35,7 +32,6 @@  GLIBC_2.4 __res_nquery F
 GLIBC_2.4 __res_nquerydomain F
 GLIBC_2.4 __res_nsearch F
 GLIBC_2.4 __res_nsend F
-GLIBC_2.4 __res_ownok F
 GLIBC_2.4 __res_queriesmatch F
 GLIBC_2.4 __res_query F
 GLIBC_2.4 __res_querydomain F
diff --git a/sysdeps/unix/sysv/linux/arm/le/libc.abilist b/sysdeps/unix/sysv/linux/arm/le/libc.abilist
index 73a282553e..1b3daa54b2 100644
--- a/sysdeps/unix/sysv/linux/arm/le/libc.abilist
+++ b/sysdeps/unix/sysv/linux/arm/le/libc.abilist
@@ -438,6 +438,10 @@  GLIBC_2.34 pthread_spin_unlock F
 GLIBC_2.34 pthread_testcancel F
 GLIBC_2.34 pthread_timedjoin_np F
 GLIBC_2.34 pthread_tryjoin_np F
+GLIBC_2.34 res_dnok F
+GLIBC_2.34 res_hnok F
+GLIBC_2.34 res_mailok F
+GLIBC_2.34 res_ownok F
 GLIBC_2.34 sem_clockwait F
 GLIBC_2.34 sem_close F
 GLIBC_2.34 sem_destroy F
@@ -832,9 +836,13 @@  GLIBC_2.4 __realpath_chk F
 GLIBC_2.4 __recv_chk F
 GLIBC_2.4 __recvfrom_chk F
 GLIBC_2.4 __register_atfork F
+GLIBC_2.4 __res_dnok F
+GLIBC_2.4 __res_hnok F
 GLIBC_2.4 __res_init F
+GLIBC_2.4 __res_mailok F
 GLIBC_2.4 __res_nclose F
 GLIBC_2.4 __res_ninit F
+GLIBC_2.4 __res_ownok F
 GLIBC_2.4 __res_randomid F
 GLIBC_2.4 __res_state F
 GLIBC_2.4 __rpc_thread_createerr F
diff --git a/sysdeps/unix/sysv/linux/arm/le/libresolv.abilist b/sysdeps/unix/sysv/linux/arm/le/libresolv.abilist
index 5c4871fbec..a2ca6abc87 100644
--- a/sysdeps/unix/sysv/linux/arm/le/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/arm/le/libresolv.abilist
@@ -23,11 +23,8 @@  GLIBC_2.4 __p_type_syms D 0x228
 GLIBC_2.4 __putlong F
 GLIBC_2.4 __putshort F
 GLIBC_2.4 __res_close F
-GLIBC_2.4 __res_dnok F
-GLIBC_2.4 __res_hnok F
 GLIBC_2.4 __res_hostalias F
 GLIBC_2.4 __res_isourserver F
-GLIBC_2.4 __res_mailok F
 GLIBC_2.4 __res_mkquery F
 GLIBC_2.4 __res_nameinquery F
 GLIBC_2.4 __res_nmkquery F
@@ -35,7 +32,6 @@  GLIBC_2.4 __res_nquery F
 GLIBC_2.4 __res_nquerydomain F
 GLIBC_2.4 __res_nsearch F
 GLIBC_2.4 __res_nsend F
-GLIBC_2.4 __res_ownok F
 GLIBC_2.4 __res_queriesmatch F
 GLIBC_2.4 __res_query F
 GLIBC_2.4 __res_querydomain F
diff --git a/sysdeps/unix/sysv/linux/csky/libc.abilist b/sysdeps/unix/sysv/linux/csky/libc.abilist
index a2aa9ee015..056fedf121 100644
--- a/sysdeps/unix/sysv/linux/csky/libc.abilist
+++ b/sysdeps/unix/sysv/linux/csky/libc.abilist
@@ -373,9 +373,13 @@  GLIBC_2.29 __realpath_chk F
 GLIBC_2.29 __recv_chk F
 GLIBC_2.29 __recvfrom_chk F
 GLIBC_2.29 __register_atfork F
+GLIBC_2.29 __res_dnok F
+GLIBC_2.29 __res_hnok F
 GLIBC_2.29 __res_init F
+GLIBC_2.29 __res_mailok F
 GLIBC_2.29 __res_nclose F
 GLIBC_2.29 __res_ninit F
+GLIBC_2.29 __res_ownok F
 GLIBC_2.29 __res_randomid F
 GLIBC_2.29 __res_state F
 GLIBC_2.29 __rpc_thread_createerr F
@@ -2583,6 +2587,10 @@  GLIBC_2.34 pthread_spin_unlock F
 GLIBC_2.34 pthread_testcancel F
 GLIBC_2.34 pthread_timedjoin_np F
 GLIBC_2.34 pthread_tryjoin_np F
+GLIBC_2.34 res_dnok F
+GLIBC_2.34 res_hnok F
+GLIBC_2.34 res_mailok F
+GLIBC_2.34 res_ownok F
 GLIBC_2.34 sem_clockwait F
 GLIBC_2.34 sem_close F
 GLIBC_2.34 sem_destroy F
diff --git a/sysdeps/unix/sysv/linux/csky/libresolv.abilist b/sysdeps/unix/sysv/linux/csky/libresolv.abilist
index 3a2239bdee..df1d7ebd48 100644
--- a/sysdeps/unix/sysv/linux/csky/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/csky/libresolv.abilist
@@ -22,11 +22,8 @@  GLIBC_2.29 __p_type_syms D 0x228
 GLIBC_2.29 __putlong F
 GLIBC_2.29 __putshort F
 GLIBC_2.29 __res_close F
-GLIBC_2.29 __res_dnok F
-GLIBC_2.29 __res_hnok F
 GLIBC_2.29 __res_hostalias F
 GLIBC_2.29 __res_isourserver F
-GLIBC_2.29 __res_mailok F
 GLIBC_2.29 __res_mkquery F
 GLIBC_2.29 __res_nameinquery F
 GLIBC_2.29 __res_nmkquery F
@@ -34,7 +31,6 @@  GLIBC_2.29 __res_nquery F
 GLIBC_2.29 __res_nquerydomain F
 GLIBC_2.29 __res_nsearch F
 GLIBC_2.29 __res_nsend F
-GLIBC_2.29 __res_ownok F
 GLIBC_2.29 __res_queriesmatch F
 GLIBC_2.29 __res_query F
 GLIBC_2.29 __res_querydomain F
diff --git a/sysdeps/unix/sysv/linux/hppa/libc.abilist b/sysdeps/unix/sysv/linux/hppa/libc.abilist
index 66e8cbf71d..e5df8dfb66 100644
--- a/sysdeps/unix/sysv/linux/hppa/libc.abilist
+++ b/sysdeps/unix/sysv/linux/hppa/libc.abilist
@@ -1,5 +1,9 @@ 
 GLIBC_2.0 __dn_comp F
 GLIBC_2.0 __dn_skipname F
+GLIBC_2.0 __res_dnok F
+GLIBC_2.0 __res_hnok F
+GLIBC_2.0 __res_mailok F
+GLIBC_2.0 __res_ownok F
 GLIBC_2.0 dladdr F
 GLIBC_2.0 dlclose F
 GLIBC_2.0 dlerror F
@@ -2530,6 +2534,10 @@  GLIBC_2.34 pthread_spin_unlock F
 GLIBC_2.34 pthread_testcancel F
 GLIBC_2.34 pthread_timedjoin_np F
 GLIBC_2.34 pthread_tryjoin_np F
+GLIBC_2.34 res_dnok F
+GLIBC_2.34 res_hnok F
+GLIBC_2.34 res_mailok F
+GLIBC_2.34 res_ownok F
 GLIBC_2.34 sem_clockwait F
 GLIBC_2.34 sem_close F
 GLIBC_2.34 sem_destroy F
diff --git a/sysdeps/unix/sysv/linux/hppa/libresolv.abilist b/sysdeps/unix/sysv/linux/hppa/libresolv.abilist
index 48ff3bffa1..b6244e71e7 100644
--- a/sysdeps/unix/sysv/linux/hppa/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/hppa/libresolv.abilist
@@ -22,12 +22,8 @@  GLIBC_2.0 __p_type_syms D 0x228
 GLIBC_2.0 __putlong F
 GLIBC_2.0 __putshort F
 GLIBC_2.0 __res_close F
-GLIBC_2.0 __res_dnok F
-GLIBC_2.0 __res_hnok F
 GLIBC_2.0 __res_isourserver F
-GLIBC_2.0 __res_mailok F
 GLIBC_2.0 __res_nameinquery F
-GLIBC_2.0 __res_ownok F
 GLIBC_2.0 __res_queriesmatch F
 GLIBC_2.0 __res_send F
 GLIBC_2.0 __sym_ntop F
diff --git a/sysdeps/unix/sysv/linux/i386/libc.abilist b/sysdeps/unix/sysv/linux/i386/libc.abilist
index d237b67aa1..5858649b2f 100644
--- a/sysdeps/unix/sysv/linux/i386/libc.abilist
+++ b/sysdeps/unix/sysv/linux/i386/libc.abilist
@@ -206,6 +206,10 @@  GLIBC_2.0 __register_frame F
 GLIBC_2.0 __register_frame_info F
 GLIBC_2.0 __register_frame_info_table F
 GLIBC_2.0 __register_frame_table F
+GLIBC_2.0 __res_dnok F
+GLIBC_2.0 __res_hnok F
+GLIBC_2.0 __res_mailok F
+GLIBC_2.0 __res_ownok F
 GLIBC_2.0 __res_randomid F
 GLIBC_2.0 __sbrk F
 GLIBC_2.0 __sched_get_priority_max F
@@ -2714,6 +2718,10 @@  GLIBC_2.34 pthread_spin_unlock F
 GLIBC_2.34 pthread_testcancel F
 GLIBC_2.34 pthread_timedjoin_np F
 GLIBC_2.34 pthread_tryjoin_np F
+GLIBC_2.34 res_dnok F
+GLIBC_2.34 res_hnok F
+GLIBC_2.34 res_mailok F
+GLIBC_2.34 res_ownok F
 GLIBC_2.34 sem_clockwait F
 GLIBC_2.34 sem_close F
 GLIBC_2.34 sem_destroy F
diff --git a/sysdeps/unix/sysv/linux/i386/libresolv.abilist b/sysdeps/unix/sysv/linux/i386/libresolv.abilist
index 48ff3bffa1..b6244e71e7 100644
--- a/sysdeps/unix/sysv/linux/i386/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/i386/libresolv.abilist
@@ -22,12 +22,8 @@  GLIBC_2.0 __p_type_syms D 0x228
 GLIBC_2.0 __putlong F
 GLIBC_2.0 __putshort F
 GLIBC_2.0 __res_close F
-GLIBC_2.0 __res_dnok F
-GLIBC_2.0 __res_hnok F
 GLIBC_2.0 __res_isourserver F
-GLIBC_2.0 __res_mailok F
 GLIBC_2.0 __res_nameinquery F
-GLIBC_2.0 __res_ownok F
 GLIBC_2.0 __res_queriesmatch F
 GLIBC_2.0 __res_send F
 GLIBC_2.0 __sym_ntop F
diff --git a/sysdeps/unix/sysv/linux/ia64/libc.abilist b/sysdeps/unix/sysv/linux/ia64/libc.abilist
index c7e70bd3a4..8098431f1c 100644
--- a/sysdeps/unix/sysv/linux/ia64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/ia64/libc.abilist
@@ -1,5 +1,9 @@ 
 GLIBC_2.0 __dn_comp F
 GLIBC_2.0 __dn_skipname F
+GLIBC_2.0 __res_dnok F
+GLIBC_2.0 __res_hnok F
+GLIBC_2.0 __res_mailok F
+GLIBC_2.0 __res_ownok F
 GLIBC_2.0 dladdr F
 GLIBC_2.0 dlclose F
 GLIBC_2.0 dlerror F
@@ -2489,6 +2493,10 @@  GLIBC_2.34 pthread_spin_unlock F
 GLIBC_2.34 pthread_testcancel F
 GLIBC_2.34 pthread_timedjoin_np F
 GLIBC_2.34 pthread_tryjoin_np F
+GLIBC_2.34 res_dnok F
+GLIBC_2.34 res_hnok F
+GLIBC_2.34 res_mailok F
+GLIBC_2.34 res_ownok F
 GLIBC_2.34 sem_clockwait F
 GLIBC_2.34 sem_close F
 GLIBC_2.34 sem_destroy F
diff --git a/sysdeps/unix/sysv/linux/ia64/libresolv.abilist b/sysdeps/unix/sysv/linux/ia64/libresolv.abilist
index 7c80f1818a..abfaf8840f 100644
--- a/sysdeps/unix/sysv/linux/ia64/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/ia64/libresolv.abilist
@@ -22,12 +22,8 @@  GLIBC_2.0 __p_type_syms D 0x450
 GLIBC_2.0 __putlong F
 GLIBC_2.0 __putshort F
 GLIBC_2.0 __res_close F
-GLIBC_2.0 __res_dnok F
-GLIBC_2.0 __res_hnok F
 GLIBC_2.0 __res_isourserver F
-GLIBC_2.0 __res_mailok F
 GLIBC_2.0 __res_nameinquery F
-GLIBC_2.0 __res_ownok F
 GLIBC_2.0 __res_queriesmatch F
 GLIBC_2.0 __res_send F
 GLIBC_2.0 __sym_ntop F
diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
index f58003fef2..6941dc8a9f 100644
--- a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
@@ -442,6 +442,10 @@  GLIBC_2.34 pthread_spin_unlock F
 GLIBC_2.34 pthread_testcancel F
 GLIBC_2.34 pthread_timedjoin_np F
 GLIBC_2.34 pthread_tryjoin_np F
+GLIBC_2.34 res_dnok F
+GLIBC_2.34 res_hnok F
+GLIBC_2.34 res_mailok F
+GLIBC_2.34 res_ownok F
 GLIBC_2.34 sem_clockwait F
 GLIBC_2.34 sem_close F
 GLIBC_2.34 sem_destroy F
@@ -821,9 +825,13 @@  GLIBC_2.4 __realpath_chk F
 GLIBC_2.4 __recv_chk F
 GLIBC_2.4 __recvfrom_chk F
 GLIBC_2.4 __register_atfork F
+GLIBC_2.4 __res_dnok F
+GLIBC_2.4 __res_hnok F
 GLIBC_2.4 __res_init F
+GLIBC_2.4 __res_mailok F
 GLIBC_2.4 __res_nclose F
 GLIBC_2.4 __res_ninit F
+GLIBC_2.4 __res_ownok F
 GLIBC_2.4 __res_randomid F
 GLIBC_2.4 __res_state F
 GLIBC_2.4 __rpc_thread_createerr F
diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libresolv.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libresolv.abilist
index 5c4871fbec..a2ca6abc87 100644
--- a/sysdeps/unix/sysv/linux/m68k/coldfire/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libresolv.abilist
@@ -23,11 +23,8 @@  GLIBC_2.4 __p_type_syms D 0x228
 GLIBC_2.4 __putlong F
 GLIBC_2.4 __putshort F
 GLIBC_2.4 __res_close F
-GLIBC_2.4 __res_dnok F
-GLIBC_2.4 __res_hnok F
 GLIBC_2.4 __res_hostalias F
 GLIBC_2.4 __res_isourserver F
-GLIBC_2.4 __res_mailok F
 GLIBC_2.4 __res_mkquery F
 GLIBC_2.4 __res_nameinquery F
 GLIBC_2.4 __res_nmkquery F
@@ -35,7 +32,6 @@  GLIBC_2.4 __res_nquery F
 GLIBC_2.4 __res_nquerydomain F
 GLIBC_2.4 __res_nsearch F
 GLIBC_2.4 __res_nsend F
-GLIBC_2.4 __res_ownok F
 GLIBC_2.4 __res_queriesmatch F
 GLIBC_2.4 __res_query F
 GLIBC_2.4 __res_querydomain F
diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
index d37d2f7a8c..2724565feb 100644
--- a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
@@ -206,6 +206,10 @@  GLIBC_2.0 __register_frame F
 GLIBC_2.0 __register_frame_info F
 GLIBC_2.0 __register_frame_info_table F
 GLIBC_2.0 __register_frame_table F
+GLIBC_2.0 __res_dnok F
+GLIBC_2.0 __res_hnok F
+GLIBC_2.0 __res_mailok F
+GLIBC_2.0 __res_ownok F
 GLIBC_2.0 __res_randomid F
 GLIBC_2.0 __sbrk F
 GLIBC_2.0 __sched_get_priority_max F
@@ -2657,6 +2661,10 @@  GLIBC_2.34 pthread_spin_unlock F
 GLIBC_2.34 pthread_testcancel F
 GLIBC_2.34 pthread_timedjoin_np F
 GLIBC_2.34 pthread_tryjoin_np F
+GLIBC_2.34 res_dnok F
+GLIBC_2.34 res_hnok F
+GLIBC_2.34 res_mailok F
+GLIBC_2.34 res_ownok F
 GLIBC_2.34 sem_clockwait F
 GLIBC_2.34 sem_close F
 GLIBC_2.34 sem_destroy F
diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libresolv.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libresolv.abilist
index 48ff3bffa1..b6244e71e7 100644
--- a/sysdeps/unix/sysv/linux/m68k/m680x0/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libresolv.abilist
@@ -22,12 +22,8 @@  GLIBC_2.0 __p_type_syms D 0x228
 GLIBC_2.0 __putlong F
 GLIBC_2.0 __putshort F
 GLIBC_2.0 __res_close F
-GLIBC_2.0 __res_dnok F
-GLIBC_2.0 __res_hnok F
 GLIBC_2.0 __res_isourserver F
-GLIBC_2.0 __res_mailok F
 GLIBC_2.0 __res_nameinquery F
-GLIBC_2.0 __res_ownok F
 GLIBC_2.0 __res_queriesmatch F
 GLIBC_2.0 __res_send F
 GLIBC_2.0 __sym_ntop F
diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
index a148c848dd..2eb5fed52d 100644
--- a/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
@@ -381,9 +381,13 @@  GLIBC_2.18 __realpath_chk F
 GLIBC_2.18 __recv_chk F
 GLIBC_2.18 __recvfrom_chk F
 GLIBC_2.18 __register_atfork F
+GLIBC_2.18 __res_dnok F
+GLIBC_2.18 __res_hnok F
 GLIBC_2.18 __res_init F
+GLIBC_2.18 __res_mailok F
 GLIBC_2.18 __res_nclose F
 GLIBC_2.18 __res_ninit F
+GLIBC_2.18 __res_ownok F
 GLIBC_2.18 __res_randomid F
 GLIBC_2.18 __res_state F
 GLIBC_2.18 __rpc_thread_createerr F
@@ -2634,6 +2638,10 @@  GLIBC_2.34 pthread_spin_unlock F
 GLIBC_2.34 pthread_testcancel F
 GLIBC_2.34 pthread_timedjoin_np F
 GLIBC_2.34 pthread_tryjoin_np F
+GLIBC_2.34 res_dnok F
+GLIBC_2.34 res_hnok F
+GLIBC_2.34 res_mailok F
+GLIBC_2.34 res_ownok F
 GLIBC_2.34 sem_clockwait F
 GLIBC_2.34 sem_close F
 GLIBC_2.34 sem_destroy F
diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libresolv.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libresolv.abilist
index eeb54aff28..2e35f266cd 100644
--- a/sysdeps/unix/sysv/linux/microblaze/be/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/be/libresolv.abilist
@@ -23,11 +23,8 @@  GLIBC_2.18 __p_type_syms D 0x228
 GLIBC_2.18 __putlong F
 GLIBC_2.18 __putshort F
 GLIBC_2.18 __res_close F
-GLIBC_2.18 __res_dnok F
-GLIBC_2.18 __res_hnok F
 GLIBC_2.18 __res_hostalias F
 GLIBC_2.18 __res_isourserver F
-GLIBC_2.18 __res_mailok F
 GLIBC_2.18 __res_mkquery F
 GLIBC_2.18 __res_nameinquery F
 GLIBC_2.18 __res_nmkquery F
@@ -35,7 +32,6 @@  GLIBC_2.18 __res_nquery F
 GLIBC_2.18 __res_nquerydomain F
 GLIBC_2.18 __res_nsearch F
 GLIBC_2.18 __res_nsend F
-GLIBC_2.18 __res_ownok F
 GLIBC_2.18 __res_queriesmatch F
 GLIBC_2.18 __res_query F
 GLIBC_2.18 __res_querydomain F
diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
index c44e6a8e57..5da6906e19 100644
--- a/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
@@ -381,9 +381,13 @@  GLIBC_2.18 __realpath_chk F
 GLIBC_2.18 __recv_chk F
 GLIBC_2.18 __recvfrom_chk F
 GLIBC_2.18 __register_atfork F
+GLIBC_2.18 __res_dnok F
+GLIBC_2.18 __res_hnok F
 GLIBC_2.18 __res_init F
+GLIBC_2.18 __res_mailok F
 GLIBC_2.18 __res_nclose F
 GLIBC_2.18 __res_ninit F
+GLIBC_2.18 __res_ownok F
 GLIBC_2.18 __res_randomid F
 GLIBC_2.18 __res_state F
 GLIBC_2.18 __rpc_thread_createerr F
@@ -2631,6 +2635,10 @@  GLIBC_2.34 pthread_spin_unlock F
 GLIBC_2.34 pthread_testcancel F
 GLIBC_2.34 pthread_timedjoin_np F
 GLIBC_2.34 pthread_tryjoin_np F
+GLIBC_2.34 res_dnok F
+GLIBC_2.34 res_hnok F
+GLIBC_2.34 res_mailok F
+GLIBC_2.34 res_ownok F
 GLIBC_2.34 sem_clockwait F
 GLIBC_2.34 sem_close F
 GLIBC_2.34 sem_destroy F
diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libresolv.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libresolv.abilist
index eeb54aff28..2e35f266cd 100644
--- a/sysdeps/unix/sysv/linux/microblaze/le/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/le/libresolv.abilist
@@ -23,11 +23,8 @@  GLIBC_2.18 __p_type_syms D 0x228
 GLIBC_2.18 __putlong F
 GLIBC_2.18 __putshort F
 GLIBC_2.18 __res_close F
-GLIBC_2.18 __res_dnok F
-GLIBC_2.18 __res_hnok F
 GLIBC_2.18 __res_hostalias F
 GLIBC_2.18 __res_isourserver F
-GLIBC_2.18 __res_mailok F
 GLIBC_2.18 __res_mkquery F
 GLIBC_2.18 __res_nameinquery F
 GLIBC_2.18 __res_nmkquery F
@@ -35,7 +32,6 @@  GLIBC_2.18 __res_nquery F
 GLIBC_2.18 __res_nquerydomain F
 GLIBC_2.18 __res_nsearch F
 GLIBC_2.18 __res_nsend F
-GLIBC_2.18 __res_ownok F
 GLIBC_2.18 __res_queriesmatch F
 GLIBC_2.18 __res_query F
 GLIBC_2.18 __res_querydomain F
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
index 14100354f2..36ff79120a 100644
--- a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
@@ -204,6 +204,10 @@  GLIBC_2.0 __register_frame F
 GLIBC_2.0 __register_frame_info F
 GLIBC_2.0 __register_frame_info_table F
 GLIBC_2.0 __register_frame_table F
+GLIBC_2.0 __res_dnok F
+GLIBC_2.0 __res_hnok F
+GLIBC_2.0 __res_mailok F
+GLIBC_2.0 __res_ownok F
 GLIBC_2.0 __res_randomid F
 GLIBC_2.0 __sbrk F
 GLIBC_2.0 __sched_get_priority_max F
@@ -2622,6 +2626,10 @@  GLIBC_2.34 pthread_spin_unlock F
 GLIBC_2.34 pthread_testcancel F
 GLIBC_2.34 pthread_timedjoin_np F
 GLIBC_2.34 pthread_tryjoin_np F
+GLIBC_2.34 res_dnok F
+GLIBC_2.34 res_hnok F
+GLIBC_2.34 res_mailok F
+GLIBC_2.34 res_ownok F
 GLIBC_2.34 sem_clockwait F
 GLIBC_2.34 sem_close F
 GLIBC_2.34 sem_destroy F
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/libresolv.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libresolv.abilist
index 48ff3bffa1..b6244e71e7 100644
--- a/sysdeps/unix/sysv/linux/mips/mips32/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips32/libresolv.abilist
@@ -22,12 +22,8 @@  GLIBC_2.0 __p_type_syms D 0x228
 GLIBC_2.0 __putlong F
 GLIBC_2.0 __putshort F
 GLIBC_2.0 __res_close F
-GLIBC_2.0 __res_dnok F
-GLIBC_2.0 __res_hnok F
 GLIBC_2.0 __res_isourserver F
-GLIBC_2.0 __res_mailok F
 GLIBC_2.0 __res_nameinquery F
-GLIBC_2.0 __res_ownok F
 GLIBC_2.0 __res_queriesmatch F
 GLIBC_2.0 __res_send F
 GLIBC_2.0 __sym_ntop F
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
index adea8343e8..262dafa1f3 100644
--- a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
@@ -204,6 +204,10 @@  GLIBC_2.0 __register_frame F
 GLIBC_2.0 __register_frame_info F
 GLIBC_2.0 __register_frame_info_table F
 GLIBC_2.0 __register_frame_table F
+GLIBC_2.0 __res_dnok F
+GLIBC_2.0 __res_hnok F
+GLIBC_2.0 __res_mailok F
+GLIBC_2.0 __res_ownok F
 GLIBC_2.0 __res_randomid F
 GLIBC_2.0 __sbrk F
 GLIBC_2.0 __sched_get_priority_max F
@@ -2620,6 +2624,10 @@  GLIBC_2.34 pthread_spin_unlock F
 GLIBC_2.34 pthread_testcancel F
 GLIBC_2.34 pthread_timedjoin_np F
 GLIBC_2.34 pthread_tryjoin_np F
+GLIBC_2.34 res_dnok F
+GLIBC_2.34 res_hnok F
+GLIBC_2.34 res_mailok F
+GLIBC_2.34 res_ownok F
 GLIBC_2.34 sem_clockwait F
 GLIBC_2.34 sem_close F
 GLIBC_2.34 sem_destroy F
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
index 2d0d0c6859..f213a1897f 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
@@ -204,6 +204,10 @@  GLIBC_2.0 __register_frame F
 GLIBC_2.0 __register_frame_info F
 GLIBC_2.0 __register_frame_info_table F
 GLIBC_2.0 __register_frame_table F
+GLIBC_2.0 __res_dnok F
+GLIBC_2.0 __res_hnok F
+GLIBC_2.0 __res_mailok F
+GLIBC_2.0 __res_ownok F
 GLIBC_2.0 __res_randomid F
 GLIBC_2.0 __sbrk F
 GLIBC_2.0 __sched_get_priority_max F
@@ -2628,6 +2632,10 @@  GLIBC_2.34 pthread_spin_unlock F
 GLIBC_2.34 pthread_testcancel F
 GLIBC_2.34 pthread_timedjoin_np F
 GLIBC_2.34 pthread_tryjoin_np F
+GLIBC_2.34 res_dnok F
+GLIBC_2.34 res_hnok F
+GLIBC_2.34 res_mailok F
+GLIBC_2.34 res_ownok F
 GLIBC_2.34 sem_clockwait F
 GLIBC_2.34 sem_close F
 GLIBC_2.34 sem_destroy F
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/libresolv.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libresolv.abilist
index 48ff3bffa1..b6244e71e7 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/n32/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips64/n32/libresolv.abilist
@@ -22,12 +22,8 @@  GLIBC_2.0 __p_type_syms D 0x228
 GLIBC_2.0 __putlong F
 GLIBC_2.0 __putshort F
 GLIBC_2.0 __res_close F
-GLIBC_2.0 __res_dnok F
-GLIBC_2.0 __res_hnok F
 GLIBC_2.0 __res_isourserver F
-GLIBC_2.0 __res_mailok F
 GLIBC_2.0 __res_nameinquery F
-GLIBC_2.0 __res_ownok F
 GLIBC_2.0 __res_queriesmatch F
 GLIBC_2.0 __res_send F
 GLIBC_2.0 __sym_ntop F
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
index 5f3ba65972..f5a432e96d 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
@@ -204,6 +204,10 @@  GLIBC_2.0 __register_frame F
 GLIBC_2.0 __register_frame_info F
 GLIBC_2.0 __register_frame_info_table F
 GLIBC_2.0 __register_frame_table F
+GLIBC_2.0 __res_dnok F
+GLIBC_2.0 __res_hnok F
+GLIBC_2.0 __res_mailok F
+GLIBC_2.0 __res_ownok F
 GLIBC_2.0 __res_randomid F
 GLIBC_2.0 __sbrk F
 GLIBC_2.0 __sched_get_priority_max F
@@ -2540,6 +2544,10 @@  GLIBC_2.34 pthread_spin_unlock F
 GLIBC_2.34 pthread_testcancel F
 GLIBC_2.34 pthread_timedjoin_np F
 GLIBC_2.34 pthread_tryjoin_np F
+GLIBC_2.34 res_dnok F
+GLIBC_2.34 res_hnok F
+GLIBC_2.34 res_mailok F
+GLIBC_2.34 res_ownok F
 GLIBC_2.34 sem_clockwait F
 GLIBC_2.34 sem_close F
 GLIBC_2.34 sem_destroy F
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/libresolv.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libresolv.abilist
index 7c80f1818a..abfaf8840f 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/n64/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/libresolv.abilist
@@ -22,12 +22,8 @@  GLIBC_2.0 __p_type_syms D 0x450
 GLIBC_2.0 __putlong F
 GLIBC_2.0 __putshort F
 GLIBC_2.0 __res_close F
-GLIBC_2.0 __res_dnok F
-GLIBC_2.0 __res_hnok F
 GLIBC_2.0 __res_isourserver F
-GLIBC_2.0 __res_mailok F
 GLIBC_2.0 __res_nameinquery F
-GLIBC_2.0 __res_ownok F
 GLIBC_2.0 __res_queriesmatch F
 GLIBC_2.0 __res_send F
 GLIBC_2.0 __sym_ntop F
diff --git a/sysdeps/unix/sysv/linux/nios2/libc.abilist b/sysdeps/unix/sysv/linux/nios2/libc.abilist
index ea9221aa8d..82162f919d 100644
--- a/sysdeps/unix/sysv/linux/nios2/libc.abilist
+++ b/sysdeps/unix/sysv/linux/nios2/libc.abilist
@@ -418,9 +418,13 @@  GLIBC_2.21 __realpath_chk F
 GLIBC_2.21 __recv_chk F
 GLIBC_2.21 __recvfrom_chk F
 GLIBC_2.21 __register_atfork F
+GLIBC_2.21 __res_dnok F
+GLIBC_2.21 __res_hnok F
 GLIBC_2.21 __res_init F
+GLIBC_2.21 __res_mailok F
 GLIBC_2.21 __res_nclose F
 GLIBC_2.21 __res_ninit F
+GLIBC_2.21 __res_ownok F
 GLIBC_2.21 __res_randomid F
 GLIBC_2.21 __res_state F
 GLIBC_2.21 __rpc_thread_createerr F
@@ -2673,6 +2677,10 @@  GLIBC_2.34 pthread_spin_unlock F
 GLIBC_2.34 pthread_testcancel F
 GLIBC_2.34 pthread_timedjoin_np F
 GLIBC_2.34 pthread_tryjoin_np F
+GLIBC_2.34 res_dnok F
+GLIBC_2.34 res_hnok F
+GLIBC_2.34 res_mailok F
+GLIBC_2.34 res_ownok F
 GLIBC_2.34 sem_clockwait F
 GLIBC_2.34 sem_close F
 GLIBC_2.34 sem_destroy F
diff --git a/sysdeps/unix/sysv/linux/nios2/libresolv.abilist b/sysdeps/unix/sysv/linux/nios2/libresolv.abilist
index c4fbc8c68b..14395d8bf4 100644
--- a/sysdeps/unix/sysv/linux/nios2/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/nios2/libresolv.abilist
@@ -23,11 +23,8 @@  GLIBC_2.21 __p_type_syms D 0x228
 GLIBC_2.21 __putlong F
 GLIBC_2.21 __putshort F
 GLIBC_2.21 __res_close F
-GLIBC_2.21 __res_dnok F
-GLIBC_2.21 __res_hnok F
 GLIBC_2.21 __res_hostalias F
 GLIBC_2.21 __res_isourserver F
-GLIBC_2.21 __res_mailok F
 GLIBC_2.21 __res_mkquery F
 GLIBC_2.21 __res_nameinquery F
 GLIBC_2.21 __res_nmkquery F
@@ -35,7 +32,6 @@  GLIBC_2.21 __res_nquery F
 GLIBC_2.21 __res_nquerydomain F
 GLIBC_2.21 __res_nsearch F
 GLIBC_2.21 __res_nsend F
-GLIBC_2.21 __res_ownok F
 GLIBC_2.21 __res_queriesmatch F
 GLIBC_2.21 __res_query F
 GLIBC_2.21 __res_querydomain F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
index 9d860c3de5..2afd685b07 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
@@ -215,6 +215,10 @@  GLIBC_2.0 __register_frame F
 GLIBC_2.0 __register_frame_info F
 GLIBC_2.0 __register_frame_info_table F
 GLIBC_2.0 __register_frame_table F
+GLIBC_2.0 __res_dnok F
+GLIBC_2.0 __res_hnok F
+GLIBC_2.0 __res_mailok F
+GLIBC_2.0 __res_ownok F
 GLIBC_2.0 __res_randomid F
 GLIBC_2.0 __sbrk F
 GLIBC_2.0 __sched_get_priority_max F
@@ -2684,6 +2688,10 @@  GLIBC_2.34 pthread_spin_unlock F
 GLIBC_2.34 pthread_testcancel F
 GLIBC_2.34 pthread_timedjoin_np F
 GLIBC_2.34 pthread_tryjoin_np F
+GLIBC_2.34 res_dnok F
+GLIBC_2.34 res_hnok F
+GLIBC_2.34 res_mailok F
+GLIBC_2.34 res_ownok F
 GLIBC_2.34 sem_clockwait F
 GLIBC_2.34 sem_close F
 GLIBC_2.34 sem_destroy F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libresolv.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libresolv.abilist
index 48ff3bffa1..b6244e71e7 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libresolv.abilist
@@ -22,12 +22,8 @@  GLIBC_2.0 __p_type_syms D 0x228
 GLIBC_2.0 __putlong F
 GLIBC_2.0 __putshort F
 GLIBC_2.0 __res_close F
-GLIBC_2.0 __res_dnok F
-GLIBC_2.0 __res_hnok F
 GLIBC_2.0 __res_isourserver F
-GLIBC_2.0 __res_mailok F
 GLIBC_2.0 __res_nameinquery F
-GLIBC_2.0 __res_ownok F
 GLIBC_2.0 __res_queriesmatch F
 GLIBC_2.0 __res_send F
 GLIBC_2.0 __sym_ntop F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
index 9469c6df2f..d7111c53a5 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
@@ -215,6 +215,10 @@  GLIBC_2.0 __register_frame F
 GLIBC_2.0 __register_frame_info F
 GLIBC_2.0 __register_frame_info_table F
 GLIBC_2.0 __register_frame_table F
+GLIBC_2.0 __res_dnok F
+GLIBC_2.0 __res_hnok F
+GLIBC_2.0 __res_mailok F
+GLIBC_2.0 __res_ownok F
 GLIBC_2.0 __res_randomid F
 GLIBC_2.0 __sbrk F
 GLIBC_2.0 __sched_get_priority_max F
@@ -2717,6 +2721,10 @@  GLIBC_2.34 pthread_spin_unlock F
 GLIBC_2.34 pthread_testcancel F
 GLIBC_2.34 pthread_timedjoin_np F
 GLIBC_2.34 pthread_tryjoin_np F
+GLIBC_2.34 res_dnok F
+GLIBC_2.34 res_hnok F
+GLIBC_2.34 res_mailok F
+GLIBC_2.34 res_ownok F
 GLIBC_2.34 sem_clockwait F
 GLIBC_2.34 sem_close F
 GLIBC_2.34 sem_destroy F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
index 5b2f1b809d..d27bc07919 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
@@ -464,9 +464,13 @@  GLIBC_2.3 __rawmemchr F
 GLIBC_2.3 __rcmd_errstr D 0x8
 GLIBC_2.3 __read F
 GLIBC_2.3 __realloc_hook D 0x8
+GLIBC_2.3 __res_dnok F
+GLIBC_2.3 __res_hnok F
 GLIBC_2.3 __res_init F
+GLIBC_2.3 __res_mailok F
 GLIBC_2.3 __res_nclose F
 GLIBC_2.3 __res_ninit F
+GLIBC_2.3 __res_ownok F
 GLIBC_2.3 __res_randomid F
 GLIBC_2.3 __res_state F
 GLIBC_2.3 __rpc_thread_createerr F
@@ -2452,6 +2456,10 @@  GLIBC_2.34 pthread_spin_unlock F
 GLIBC_2.34 pthread_testcancel F
 GLIBC_2.34 pthread_timedjoin_np F
 GLIBC_2.34 pthread_tryjoin_np F
+GLIBC_2.34 res_dnok F
+GLIBC_2.34 res_hnok F
+GLIBC_2.34 res_mailok F
+GLIBC_2.34 res_ownok F
 GLIBC_2.34 sem_clockwait F
 GLIBC_2.34 sem_close F
 GLIBC_2.34 sem_destroy F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libresolv.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libresolv.abilist
index b3d9c35c10..d48ab674cc 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libresolv.abilist
@@ -22,11 +22,8 @@  GLIBC_2.3 __p_type_syms D 0x450
 GLIBC_2.3 __putlong F
 GLIBC_2.3 __putshort F
 GLIBC_2.3 __res_close F
-GLIBC_2.3 __res_dnok F
-GLIBC_2.3 __res_hnok F
 GLIBC_2.3 __res_hostalias F
 GLIBC_2.3 __res_isourserver F
-GLIBC_2.3 __res_mailok F
 GLIBC_2.3 __res_mkquery F
 GLIBC_2.3 __res_nameinquery F
 GLIBC_2.3 __res_nmkquery F
@@ -34,7 +31,6 @@  GLIBC_2.3 __res_nquery F
 GLIBC_2.3 __res_nquerydomain F
 GLIBC_2.3 __res_nsearch F
 GLIBC_2.3 __res_nsend F
-GLIBC_2.3 __res_ownok F
 GLIBC_2.3 __res_queriesmatch F
 GLIBC_2.3 __res_query F
 GLIBC_2.3 __res_querydomain F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
index 1e6c82f7c4..20e1d587c3 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
@@ -466,9 +466,13 @@  GLIBC_2.17 __realpath_chk F
 GLIBC_2.17 __recv_chk F
 GLIBC_2.17 __recvfrom_chk F
 GLIBC_2.17 __register_atfork F
+GLIBC_2.17 __res_dnok F
+GLIBC_2.17 __res_hnok F
 GLIBC_2.17 __res_init F
+GLIBC_2.17 __res_mailok F
 GLIBC_2.17 __res_nclose F
 GLIBC_2.17 __res_ninit F
+GLIBC_2.17 __res_ownok F
 GLIBC_2.17 __res_randomid F
 GLIBC_2.17 __res_state F
 GLIBC_2.17 __rpc_thread_createerr F
@@ -2754,6 +2758,10 @@  GLIBC_2.34 pthread_spin_unlock F
 GLIBC_2.34 pthread_testcancel F
 GLIBC_2.34 pthread_timedjoin_np F
 GLIBC_2.34 pthread_tryjoin_np F
+GLIBC_2.34 res_dnok F
+GLIBC_2.34 res_hnok F
+GLIBC_2.34 res_mailok F
+GLIBC_2.34 res_ownok F
 GLIBC_2.34 sem_clockwait F
 GLIBC_2.34 sem_close F
 GLIBC_2.34 sem_destroy F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libresolv.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libresolv.abilist
index beb6e0efe3..613638f9ce 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libresolv.abilist
@@ -23,11 +23,8 @@  GLIBC_2.17 __p_type_syms D 0x450
 GLIBC_2.17 __putlong F
 GLIBC_2.17 __putshort F
 GLIBC_2.17 __res_close F
-GLIBC_2.17 __res_dnok F
-GLIBC_2.17 __res_hnok F
 GLIBC_2.17 __res_hostalias F
 GLIBC_2.17 __res_isourserver F
-GLIBC_2.17 __res_mailok F
 GLIBC_2.17 __res_mkquery F
 GLIBC_2.17 __res_nameinquery F
 GLIBC_2.17 __res_nmkquery F
@@ -35,7 +32,6 @@  GLIBC_2.17 __res_nquery F
 GLIBC_2.17 __res_nquerydomain F
 GLIBC_2.17 __res_nsearch F
 GLIBC_2.17 __res_nsend F
-GLIBC_2.17 __res_ownok F
 GLIBC_2.17 __res_queriesmatch F
 GLIBC_2.17 __res_query F
 GLIBC_2.17 __res_querydomain F
diff --git a/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist b/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
index 620dcfd62d..891ee06d45 100644
--- a/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
@@ -366,9 +366,13 @@  GLIBC_2.33 __realpath_chk F
 GLIBC_2.33 __recv_chk F
 GLIBC_2.33 __recvfrom_chk F
 GLIBC_2.33 __register_atfork F
+GLIBC_2.33 __res_dnok F
+GLIBC_2.33 __res_hnok F
 GLIBC_2.33 __res_init F
+GLIBC_2.33 __res_mailok F
 GLIBC_2.33 __res_nclose F
 GLIBC_2.33 __res_ninit F
+GLIBC_2.33 __res_ownok F
 GLIBC_2.33 __res_randomid F
 GLIBC_2.33 __res_state F
 GLIBC_2.33 __riscv_flush_icache F
@@ -2319,6 +2323,10 @@  GLIBC_2.34 pthread_spin_unlock F
 GLIBC_2.34 pthread_testcancel F
 GLIBC_2.34 pthread_timedjoin_np F
 GLIBC_2.34 pthread_tryjoin_np F
+GLIBC_2.34 res_dnok F
+GLIBC_2.34 res_hnok F
+GLIBC_2.34 res_mailok F
+GLIBC_2.34 res_ownok F
 GLIBC_2.34 sem_clockwait F
 GLIBC_2.34 sem_close F
 GLIBC_2.34 sem_destroy F
diff --git a/sysdeps/unix/sysv/linux/riscv/rv32/libresolv.abilist b/sysdeps/unix/sysv/linux/riscv/rv32/libresolv.abilist
index 768d103895..3b9691588e 100644
--- a/sysdeps/unix/sysv/linux/riscv/rv32/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/riscv/rv32/libresolv.abilist
@@ -22,11 +22,8 @@  GLIBC_2.33 __p_type_syms D 0x228
 GLIBC_2.33 __putlong F
 GLIBC_2.33 __putshort F
 GLIBC_2.33 __res_close F
-GLIBC_2.33 __res_dnok F
-GLIBC_2.33 __res_hnok F
 GLIBC_2.33 __res_hostalias F
 GLIBC_2.33 __res_isourserver F
-GLIBC_2.33 __res_mailok F
 GLIBC_2.33 __res_mkquery F
 GLIBC_2.33 __res_nameinquery F
 GLIBC_2.33 __res_nmkquery F
@@ -34,7 +31,6 @@  GLIBC_2.33 __res_nquery F
 GLIBC_2.33 __res_nquerydomain F
 GLIBC_2.33 __res_nsearch F
 GLIBC_2.33 __res_nsend F
-GLIBC_2.33 __res_ownok F
 GLIBC_2.33 __res_queriesmatch F
 GLIBC_2.33 __res_query F
 GLIBC_2.33 __res_querydomain F
diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
index ce3ef6c7a4..089c6b9de3 100644
--- a/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
@@ -377,9 +377,13 @@  GLIBC_2.27 __realpath_chk F
 GLIBC_2.27 __recv_chk F
 GLIBC_2.27 __recvfrom_chk F
 GLIBC_2.27 __register_atfork F
+GLIBC_2.27 __res_dnok F
+GLIBC_2.27 __res_hnok F
 GLIBC_2.27 __res_init F
+GLIBC_2.27 __res_mailok F
 GLIBC_2.27 __res_nclose F
 GLIBC_2.27 __res_ninit F
+GLIBC_2.27 __res_ownok F
 GLIBC_2.27 __res_randomid F
 GLIBC_2.27 __res_state F
 GLIBC_2.27 __riscv_flush_icache F
@@ -2519,6 +2523,10 @@  GLIBC_2.34 pthread_spin_unlock F
 GLIBC_2.34 pthread_testcancel F
 GLIBC_2.34 pthread_timedjoin_np F
 GLIBC_2.34 pthread_tryjoin_np F
+GLIBC_2.34 res_dnok F
+GLIBC_2.34 res_hnok F
+GLIBC_2.34 res_mailok F
+GLIBC_2.34 res_ownok F
 GLIBC_2.34 sem_clockwait F
 GLIBC_2.34 sem_close F
 GLIBC_2.34 sem_destroy F
diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libresolv.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libresolv.abilist
index 998b7a2105..4417916b78 100644
--- a/sysdeps/unix/sysv/linux/riscv/rv64/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/riscv/rv64/libresolv.abilist
@@ -22,11 +22,8 @@  GLIBC_2.27 __p_type_syms D 0x450
 GLIBC_2.27 __putlong F
 GLIBC_2.27 __putshort F
 GLIBC_2.27 __res_close F
-GLIBC_2.27 __res_dnok F
-GLIBC_2.27 __res_hnok F
 GLIBC_2.27 __res_hostalias F
 GLIBC_2.27 __res_isourserver F
-GLIBC_2.27 __res_mailok F
 GLIBC_2.27 __res_mkquery F
 GLIBC_2.27 __res_nameinquery F
 GLIBC_2.27 __res_nmkquery F
@@ -34,7 +31,6 @@  GLIBC_2.27 __res_nquery F
 GLIBC_2.27 __res_nquerydomain F
 GLIBC_2.27 __res_nsearch F
 GLIBC_2.27 __res_nsend F
-GLIBC_2.27 __res_ownok F
 GLIBC_2.27 __res_queriesmatch F
 GLIBC_2.27 __res_query F
 GLIBC_2.27 __res_querydomain F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
index 559a76b8f0..7c02785103 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
@@ -206,6 +206,10 @@  GLIBC_2.0 __register_frame F
 GLIBC_2.0 __register_frame_info F
 GLIBC_2.0 __register_frame_info_table F
 GLIBC_2.0 __register_frame_table F
+GLIBC_2.0 __res_dnok F
+GLIBC_2.0 __res_hnok F
+GLIBC_2.0 __res_mailok F
+GLIBC_2.0 __res_ownok F
 GLIBC_2.0 __res_randomid F
 GLIBC_2.0 __sbrk F
 GLIBC_2.0 __sched_get_priority_max F
@@ -2682,6 +2686,10 @@  GLIBC_2.34 pthread_spin_unlock F
 GLIBC_2.34 pthread_testcancel F
 GLIBC_2.34 pthread_timedjoin_np F
 GLIBC_2.34 pthread_tryjoin_np F
+GLIBC_2.34 res_dnok F
+GLIBC_2.34 res_hnok F
+GLIBC_2.34 res_mailok F
+GLIBC_2.34 res_ownok F
 GLIBC_2.34 sem_clockwait F
 GLIBC_2.34 sem_close F
 GLIBC_2.34 sem_destroy F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libresolv.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libresolv.abilist
index 48ff3bffa1..b6244e71e7 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/libresolv.abilist
@@ -22,12 +22,8 @@  GLIBC_2.0 __p_type_syms D 0x228
 GLIBC_2.0 __putlong F
 GLIBC_2.0 __putshort F
 GLIBC_2.0 __res_close F
-GLIBC_2.0 __res_dnok F
-GLIBC_2.0 __res_hnok F
 GLIBC_2.0 __res_isourserver F
-GLIBC_2.0 __res_mailok F
 GLIBC_2.0 __res_nameinquery F
-GLIBC_2.0 __res_ownok F
 GLIBC_2.0 __res_queriesmatch F
 GLIBC_2.0 __res_send F
 GLIBC_2.0 __sym_ntop F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
index 2580a329fe..d294d9af62 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
@@ -408,9 +408,13 @@  GLIBC_2.2 __register_frame F
 GLIBC_2.2 __register_frame_info F
 GLIBC_2.2 __register_frame_info_table F
 GLIBC_2.2 __register_frame_table F
+GLIBC_2.2 __res_dnok F
+GLIBC_2.2 __res_hnok F
 GLIBC_2.2 __res_init F
+GLIBC_2.2 __res_mailok F
 GLIBC_2.2 __res_nclose F
 GLIBC_2.2 __res_ninit F
+GLIBC_2.2 __res_ownok F
 GLIBC_2.2 __res_randomid F
 GLIBC_2.2 __res_state F
 GLIBC_2.2 __sbrk F
@@ -2489,6 +2493,10 @@  GLIBC_2.34 pthread_spin_unlock F
 GLIBC_2.34 pthread_testcancel F
 GLIBC_2.34 pthread_timedjoin_np F
 GLIBC_2.34 pthread_tryjoin_np F
+GLIBC_2.34 res_dnok F
+GLIBC_2.34 res_hnok F
+GLIBC_2.34 res_mailok F
+GLIBC_2.34 res_ownok F
 GLIBC_2.34 sem_clockwait F
 GLIBC_2.34 sem_close F
 GLIBC_2.34 sem_destroy F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libresolv.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libresolv.abilist
index 23e952fcac..07d7ef8935 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/libresolv.abilist
@@ -22,11 +22,8 @@  GLIBC_2.2 __p_type_syms D 0x450
 GLIBC_2.2 __putlong F
 GLIBC_2.2 __putshort F
 GLIBC_2.2 __res_close F
-GLIBC_2.2 __res_dnok F
-GLIBC_2.2 __res_hnok F
 GLIBC_2.2 __res_hostalias F
 GLIBC_2.2 __res_isourserver F
-GLIBC_2.2 __res_mailok F
 GLIBC_2.2 __res_mkquery F
 GLIBC_2.2 __res_nameinquery F
 GLIBC_2.2 __res_nmkquery F
@@ -34,7 +31,6 @@  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_queriesmatch F
 GLIBC_2.2 __res_query F
 GLIBC_2.2 __res_querydomain F
diff --git a/sysdeps/unix/sysv/linux/sh/be/libc.abilist b/sysdeps/unix/sysv/linux/sh/be/libc.abilist
index b7d1c17e93..a3e3845b3f 100644
--- a/sysdeps/unix/sysv/linux/sh/be/libc.abilist
+++ b/sysdeps/unix/sysv/linux/sh/be/libc.abilist
@@ -4,6 +4,10 @@  GCC_3.0 __register_frame_info_bases F
 GCC_3.0 __register_frame_info_table_bases F
 GLIBC_2.0 __dn_comp F
 GLIBC_2.0 __dn_skipname F
+GLIBC_2.0 __res_dnok F
+GLIBC_2.0 __res_hnok F
+GLIBC_2.0 __res_mailok F
+GLIBC_2.0 __res_ownok F
 GLIBC_2.0 dladdr F
 GLIBC_2.0 dlclose F
 GLIBC_2.0 dlerror F
@@ -2537,6 +2541,10 @@  GLIBC_2.34 pthread_spin_unlock F
 GLIBC_2.34 pthread_testcancel F
 GLIBC_2.34 pthread_timedjoin_np F
 GLIBC_2.34 pthread_tryjoin_np F
+GLIBC_2.34 res_dnok F
+GLIBC_2.34 res_hnok F
+GLIBC_2.34 res_mailok F
+GLIBC_2.34 res_ownok F
 GLIBC_2.34 sem_clockwait F
 GLIBC_2.34 sem_close F
 GLIBC_2.34 sem_destroy F
diff --git a/sysdeps/unix/sysv/linux/sh/be/libresolv.abilist b/sysdeps/unix/sysv/linux/sh/be/libresolv.abilist
index 48ff3bffa1..b6244e71e7 100644
--- a/sysdeps/unix/sysv/linux/sh/be/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/sh/be/libresolv.abilist
@@ -22,12 +22,8 @@  GLIBC_2.0 __p_type_syms D 0x228
 GLIBC_2.0 __putlong F
 GLIBC_2.0 __putshort F
 GLIBC_2.0 __res_close F
-GLIBC_2.0 __res_dnok F
-GLIBC_2.0 __res_hnok F
 GLIBC_2.0 __res_isourserver F
-GLIBC_2.0 __res_mailok F
 GLIBC_2.0 __res_nameinquery F
-GLIBC_2.0 __res_ownok F
 GLIBC_2.0 __res_queriesmatch F
 GLIBC_2.0 __res_send F
 GLIBC_2.0 __sym_ntop F
diff --git a/sysdeps/unix/sysv/linux/sh/le/libc.abilist b/sysdeps/unix/sysv/linux/sh/le/libc.abilist
index 74919e98e2..3a7ca365c8 100644
--- a/sysdeps/unix/sysv/linux/sh/le/libc.abilist
+++ b/sysdeps/unix/sysv/linux/sh/le/libc.abilist
@@ -4,6 +4,10 @@  GCC_3.0 __register_frame_info_bases F
 GCC_3.0 __register_frame_info_table_bases F
 GLIBC_2.0 __dn_comp F
 GLIBC_2.0 __dn_skipname F
+GLIBC_2.0 __res_dnok F
+GLIBC_2.0 __res_hnok F
+GLIBC_2.0 __res_mailok F
+GLIBC_2.0 __res_ownok F
 GLIBC_2.0 dladdr F
 GLIBC_2.0 dlclose F
 GLIBC_2.0 dlerror F
@@ -2534,6 +2538,10 @@  GLIBC_2.34 pthread_spin_unlock F
 GLIBC_2.34 pthread_testcancel F
 GLIBC_2.34 pthread_timedjoin_np F
 GLIBC_2.34 pthread_tryjoin_np F
+GLIBC_2.34 res_dnok F
+GLIBC_2.34 res_hnok F
+GLIBC_2.34 res_mailok F
+GLIBC_2.34 res_ownok F
 GLIBC_2.34 sem_clockwait F
 GLIBC_2.34 sem_close F
 GLIBC_2.34 sem_destroy F
diff --git a/sysdeps/unix/sysv/linux/sh/le/libresolv.abilist b/sysdeps/unix/sysv/linux/sh/le/libresolv.abilist
index 48ff3bffa1..b6244e71e7 100644
--- a/sysdeps/unix/sysv/linux/sh/le/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/sh/le/libresolv.abilist
@@ -22,12 +22,8 @@  GLIBC_2.0 __p_type_syms D 0x228
 GLIBC_2.0 __putlong F
 GLIBC_2.0 __putshort F
 GLIBC_2.0 __res_close F
-GLIBC_2.0 __res_dnok F
-GLIBC_2.0 __res_hnok F
 GLIBC_2.0 __res_isourserver F
-GLIBC_2.0 __res_mailok F
 GLIBC_2.0 __res_nameinquery F
-GLIBC_2.0 __res_ownok F
 GLIBC_2.0 __res_queriesmatch F
 GLIBC_2.0 __res_send F
 GLIBC_2.0 __sym_ntop F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
index 4d4d5b1129..61ebc732dd 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
@@ -210,6 +210,10 @@  GLIBC_2.0 __register_frame F
 GLIBC_2.0 __register_frame_info F
 GLIBC_2.0 __register_frame_info_table F
 GLIBC_2.0 __register_frame_table F
+GLIBC_2.0 __res_dnok F
+GLIBC_2.0 __res_hnok F
+GLIBC_2.0 __res_mailok F
+GLIBC_2.0 __res_ownok F
 GLIBC_2.0 __res_randomid F
 GLIBC_2.0 __sbrk F
 GLIBC_2.0 __sched_get_priority_max F
@@ -2677,6 +2681,10 @@  GLIBC_2.34 pthread_spin_unlock F
 GLIBC_2.34 pthread_testcancel F
 GLIBC_2.34 pthread_timedjoin_np F
 GLIBC_2.34 pthread_tryjoin_np F
+GLIBC_2.34 res_dnok F
+GLIBC_2.34 res_hnok F
+GLIBC_2.34 res_mailok F
+GLIBC_2.34 res_ownok F
 GLIBC_2.34 sem_clockwait F
 GLIBC_2.34 sem_close F
 GLIBC_2.34 sem_destroy F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libresolv.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libresolv.abilist
index 48ff3bffa1..b6244e71e7 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libresolv.abilist
@@ -22,12 +22,8 @@  GLIBC_2.0 __p_type_syms D 0x228
 GLIBC_2.0 __putlong F
 GLIBC_2.0 __putshort F
 GLIBC_2.0 __res_close F
-GLIBC_2.0 __res_dnok F
-GLIBC_2.0 __res_hnok F
 GLIBC_2.0 __res_isourserver F
-GLIBC_2.0 __res_mailok F
 GLIBC_2.0 __res_nameinquery F
-GLIBC_2.0 __res_ownok F
 GLIBC_2.0 __res_queriesmatch F
 GLIBC_2.0 __res_send F
 GLIBC_2.0 __sym_ntop F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
index 836e95bca8..8417c58ddd 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
@@ -4,6 +4,10 @@  GCC_3.0 __register_frame_info_bases F
 GCC_3.0 __register_frame_info_table_bases F
 GLIBC_2.0 __dn_comp F
 GLIBC_2.0 __dn_skipname F
+GLIBC_2.0 __res_dnok F
+GLIBC_2.0 __res_hnok F
+GLIBC_2.0 __res_mailok F
+GLIBC_2.0 __res_ownok F
 GLIBC_2.0 dladdr F
 GLIBC_2.0 dlclose F
 GLIBC_2.0 dlerror F
@@ -2512,6 +2516,10 @@  GLIBC_2.34 pthread_spin_unlock F
 GLIBC_2.34 pthread_testcancel F
 GLIBC_2.34 pthread_timedjoin_np F
 GLIBC_2.34 pthread_tryjoin_np F
+GLIBC_2.34 res_dnok F
+GLIBC_2.34 res_hnok F
+GLIBC_2.34 res_mailok F
+GLIBC_2.34 res_ownok F
 GLIBC_2.34 sem_clockwait F
 GLIBC_2.34 sem_close F
 GLIBC_2.34 sem_destroy F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libresolv.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libresolv.abilist
index 7c80f1818a..abfaf8840f 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libresolv.abilist
@@ -22,12 +22,8 @@  GLIBC_2.0 __p_type_syms D 0x450
 GLIBC_2.0 __putlong F
 GLIBC_2.0 __putshort F
 GLIBC_2.0 __res_close F
-GLIBC_2.0 __res_dnok F
-GLIBC_2.0 __res_hnok F
 GLIBC_2.0 __res_isourserver F
-GLIBC_2.0 __res_mailok F
 GLIBC_2.0 __res_nameinquery F
-GLIBC_2.0 __res_ownok F
 GLIBC_2.0 __res_queriesmatch F
 GLIBC_2.0 __res_send F
 GLIBC_2.0 __sym_ntop F
diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
index 65b3a9c04a..d50726c678 100644
--- a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
@@ -392,9 +392,13 @@  GLIBC_2.2.5 __rawmemchr F
 GLIBC_2.2.5 __rcmd_errstr D 0x8
 GLIBC_2.2.5 __read F
 GLIBC_2.2.5 __realloc_hook D 0x8
+GLIBC_2.2.5 __res_dnok F
+GLIBC_2.2.5 __res_hnok F
 GLIBC_2.2.5 __res_init F
+GLIBC_2.2.5 __res_mailok F
 GLIBC_2.2.5 __res_nclose F
 GLIBC_2.2.5 __res_ninit F
+GLIBC_2.2.5 __res_ownok F
 GLIBC_2.2.5 __res_randomid F
 GLIBC_2.2.5 __res_state F
 GLIBC_2.2.5 __rpc_thread_createerr F
@@ -2467,6 +2471,10 @@  GLIBC_2.34 pthread_spin_unlock F
 GLIBC_2.34 pthread_testcancel F
 GLIBC_2.34 pthread_timedjoin_np F
 GLIBC_2.34 pthread_tryjoin_np F
+GLIBC_2.34 res_dnok F
+GLIBC_2.34 res_hnok F
+GLIBC_2.34 res_mailok F
+GLIBC_2.34 res_ownok F
 GLIBC_2.34 sem_clockwait F
 GLIBC_2.34 sem_close F
 GLIBC_2.34 sem_destroy F
diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libresolv.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libresolv.abilist
index 93c5e8111c..3375dd6380 100644
--- a/sysdeps/unix/sysv/linux/x86_64/64/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/64/libresolv.abilist
@@ -22,11 +22,8 @@  GLIBC_2.2.5 __p_type_syms D 0x450
 GLIBC_2.2.5 __putlong F
 GLIBC_2.2.5 __putshort F
 GLIBC_2.2.5 __res_close F
-GLIBC_2.2.5 __res_dnok F
-GLIBC_2.2.5 __res_hnok F
 GLIBC_2.2.5 __res_hostalias F
 GLIBC_2.2.5 __res_isourserver F
-GLIBC_2.2.5 __res_mailok F
 GLIBC_2.2.5 __res_mkquery F
 GLIBC_2.2.5 __res_nameinquery F
 GLIBC_2.2.5 __res_nmkquery F
@@ -34,7 +31,6 @@  GLIBC_2.2.5 __res_nquery F
 GLIBC_2.2.5 __res_nquerydomain F
 GLIBC_2.2.5 __res_nsearch F
 GLIBC_2.2.5 __res_nsend F
-GLIBC_2.2.5 __res_ownok F
 GLIBC_2.2.5 __res_queriesmatch F
 GLIBC_2.2.5 __res_query F
 GLIBC_2.2.5 __res_querydomain F
diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
index f1d9779f5c..1e92ea4ce4 100644
--- a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
@@ -381,9 +381,13 @@  GLIBC_2.16 __realpath_chk F
 GLIBC_2.16 __recv_chk F
 GLIBC_2.16 __recvfrom_chk F
 GLIBC_2.16 __register_atfork F
+GLIBC_2.16 __res_dnok F
+GLIBC_2.16 __res_hnok F
 GLIBC_2.16 __res_init F
+GLIBC_2.16 __res_mailok F
 GLIBC_2.16 __res_nclose F
 GLIBC_2.16 __res_ninit F
+GLIBC_2.16 __res_ownok F
 GLIBC_2.16 __res_randomid F
 GLIBC_2.16 __res_state F
 GLIBC_2.16 __rpc_thread_createerr F
@@ -2573,6 +2577,10 @@  GLIBC_2.34 pthread_spin_unlock F
 GLIBC_2.34 pthread_testcancel F
 GLIBC_2.34 pthread_timedjoin_np F
 GLIBC_2.34 pthread_tryjoin_np F
+GLIBC_2.34 res_dnok F
+GLIBC_2.34 res_hnok F
+GLIBC_2.34 res_mailok F
+GLIBC_2.34 res_ownok F
 GLIBC_2.34 sem_clockwait F
 GLIBC_2.34 sem_close F
 GLIBC_2.34 sem_destroy F
diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libresolv.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libresolv.abilist
index 5c84955527..99db09f022 100644
--- a/sysdeps/unix/sysv/linux/x86_64/x32/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/x32/libresolv.abilist
@@ -23,11 +23,8 @@  GLIBC_2.16 __p_type_syms D 0x228
 GLIBC_2.16 __putlong F
 GLIBC_2.16 __putshort F
 GLIBC_2.16 __res_close F
-GLIBC_2.16 __res_dnok F
-GLIBC_2.16 __res_hnok F
 GLIBC_2.16 __res_hostalias F
 GLIBC_2.16 __res_isourserver F
-GLIBC_2.16 __res_mailok F
 GLIBC_2.16 __res_mkquery F
 GLIBC_2.16 __res_nameinquery F
 GLIBC_2.16 __res_nmkquery F
@@ -35,7 +32,6 @@  GLIBC_2.16 __res_nquery F
 GLIBC_2.16 __res_nquerydomain F
 GLIBC_2.16 __res_nsearch F
 GLIBC_2.16 __res_nsend F
-GLIBC_2.16 __res_ownok F
 GLIBC_2.16 __res_queriesmatch F
 GLIBC_2.16 __res_query F
 GLIBC_2.16 __res_querydomain F