diff mbox series

[27/30] resolv: Move res_mkquery, res_nmkquery into libc

Message ID 9f1e729e88598bc3de8daabca1074dca2c625848.1625755446.git.fweimer@redhat.com
State Superseded
Headers
Series nss_dns move into libc |

Checks

Context Check Description
dj/TryBot-apply_patch success Patch applied to master at the time it was sent

Commit Message

Florian Weimer July 8, 2021, 3:06 p.m. UTC 
  This switches to public symbols without __ prefixes, due to improved
namespace management in glibc.

The symbols res_mkquery, __res_mkquery, __res_nmkquery were
moved with the script (using --no-new-version).
res_mkquery@@GLIBC_2.34, res_nmkquery@@GLIBC_2.34 were added using
make update-all-abi.
---
 resolv/Makefile                               |  2 +-
 resolv/Versions                               | 10 ++--
 resolv/res_mkquery.c                          | 48 +++++++++++--------
 resolv/resolv-internal.h                      |  6 ++-
 resolv/resolv.h                               |  2 -
 sysdeps/mach/hurd/i386/libc.abilist           |  4 ++
 sysdeps/mach/hurd/i386/libresolv.abilist      |  2 -
 sysdeps/unix/sysv/linux/aarch64/libc.abilist  |  4 ++
 .../unix/sysv/linux/aarch64/libresolv.abilist |  2 -
 sysdeps/unix/sysv/linux/alpha/libc.abilist    |  5 ++
 .../unix/sysv/linux/alpha/libresolv.abilist   |  3 --
 sysdeps/unix/sysv/linux/arc/libc.abilist      |  4 ++
 sysdeps/unix/sysv/linux/arc/libresolv.abilist |  2 -
 sysdeps/unix/sysv/linux/arm/be/libc.abilist   |  4 ++
 .../unix/sysv/linux/arm/be/libresolv.abilist  |  2 -
 sysdeps/unix/sysv/linux/arm/le/libc.abilist   |  4 ++
 .../unix/sysv/linux/arm/le/libresolv.abilist  |  2 -
 sysdeps/unix/sysv/linux/csky/libc.abilist     |  4 ++
 .../unix/sysv/linux/csky/libresolv.abilist    |  2 -
 sysdeps/unix/sysv/linux/hppa/libc.abilist     |  5 ++
 .../unix/sysv/linux/hppa/libresolv.abilist    |  3 --
 sysdeps/unix/sysv/linux/i386/libc.abilist     |  5 ++
 .../unix/sysv/linux/i386/libresolv.abilist    |  3 --
 sysdeps/unix/sysv/linux/ia64/libc.abilist     |  5 ++
 .../unix/sysv/linux/ia64/libresolv.abilist    |  3 --
 .../sysv/linux/m68k/coldfire/libc.abilist     |  4 ++
 .../linux/m68k/coldfire/libresolv.abilist     |  2 -
 .../unix/sysv/linux/m68k/m680x0/libc.abilist  |  5 ++
 .../sysv/linux/m68k/m680x0/libresolv.abilist  |  3 --
 .../sysv/linux/microblaze/be/libc.abilist     |  4 ++
 .../linux/microblaze/be/libresolv.abilist     |  2 -
 .../sysv/linux/microblaze/le/libc.abilist     |  4 ++
 .../linux/microblaze/le/libresolv.abilist     |  2 -
 .../sysv/linux/mips/mips32/fpu/libc.abilist   |  5 ++
 .../sysv/linux/mips/mips32/libresolv.abilist  |  3 --
 .../sysv/linux/mips/mips32/nofpu/libc.abilist |  5 ++
 .../sysv/linux/mips/mips64/n32/libc.abilist   |  5 ++
 .../linux/mips/mips64/n32/libresolv.abilist   |  3 --
 .../sysv/linux/mips/mips64/n64/libc.abilist   |  5 ++
 .../linux/mips/mips64/n64/libresolv.abilist   |  3 --
 sysdeps/unix/sysv/linux/nios2/libc.abilist    |  4 ++
 .../unix/sysv/linux/nios2/libresolv.abilist   |  2 -
 .../linux/powerpc/powerpc32/fpu/libc.abilist  |  5 ++
 .../linux/powerpc/powerpc32/libresolv.abilist |  3 --
 .../powerpc/powerpc32/nofpu/libc.abilist      |  5 ++
 .../linux/powerpc/powerpc64/be/libc.abilist   |  4 ++
 .../powerpc/powerpc64/be/libresolv.abilist    |  2 -
 .../linux/powerpc/powerpc64/le/libc.abilist   |  4 ++
 .../powerpc/powerpc64/le/libresolv.abilist    |  2 -
 .../unix/sysv/linux/riscv/rv32/libc.abilist   |  4 ++
 .../sysv/linux/riscv/rv32/libresolv.abilist   |  2 -
 .../unix/sysv/linux/riscv/rv64/libc.abilist   |  4 ++
 .../sysv/linux/riscv/rv64/libresolv.abilist   |  2 -
 .../unix/sysv/linux/s390/s390-32/libc.abilist |  5 ++
 .../sysv/linux/s390/s390-32/libresolv.abilist |  3 --
 .../unix/sysv/linux/s390/s390-64/libc.abilist |  4 ++
 .../sysv/linux/s390/s390-64/libresolv.abilist |  2 -
 sysdeps/unix/sysv/linux/sh/be/libc.abilist    |  5 ++
 .../unix/sysv/linux/sh/be/libresolv.abilist   |  3 --
 sysdeps/unix/sysv/linux/sh/le/libc.abilist    |  5 ++
 .../unix/sysv/linux/sh/le/libresolv.abilist   |  3 --
 .../sysv/linux/sparc/sparc32/libc.abilist     |  5 ++
 .../linux/sparc/sparc32/libresolv.abilist     |  3 --
 .../sysv/linux/sparc/sparc64/libc.abilist     |  5 ++
 .../linux/sparc/sparc64/libresolv.abilist     |  3 --
 .../unix/sysv/linux/x86_64/64/libc.abilist    |  4 ++
 .../sysv/linux/x86_64/64/libresolv.abilist    |  2 -
 .../unix/sysv/linux/x86_64/x32/libc.abilist   |  4 ++
 .../sysv/linux/x86_64/x32/libresolv.abilist   |  2 -
 69 files changed, 188 insertions(+), 104 deletions(-)

Comments

Carlos O'Donell July 15, 2021, 5:02 a.m. UTC | #1 
On 7/8/21 11:06 AM, Florian Weimer via Libc-alpha wrote:
> This switches to public symbols without __ prefixes, due to improved
> namespace management in glibc.

OK for glibc 2.34.

Tested without regression on x86_64 and i686.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Tested-by: Carlos O'Donell <carlos@redhat.com>
 
> The symbols res_mkquery, __res_mkquery, __res_nmkquery were
> moved with the script (using --no-new-version).
> res_mkquery@@GLIBC_2.34, res_nmkquery@@GLIBC_2.34 were added using
> make update-all-abi.
> ---
>  resolv/Makefile                               |  2 +-
>  resolv/Versions                               | 10 ++--
>  resolv/res_mkquery.c                          | 48 +++++++++++--------
>  resolv/resolv-internal.h                      |  6 ++-
>  resolv/resolv.h                               |  2 -
>  sysdeps/mach/hurd/i386/libc.abilist           |  4 ++
>  sysdeps/mach/hurd/i386/libresolv.abilist      |  2 -
>  sysdeps/unix/sysv/linux/aarch64/libc.abilist  |  4 ++
>  .../unix/sysv/linux/aarch64/libresolv.abilist |  2 -
>  sysdeps/unix/sysv/linux/alpha/libc.abilist    |  5 ++
>  .../unix/sysv/linux/alpha/libresolv.abilist   |  3 --
>  sysdeps/unix/sysv/linux/arc/libc.abilist      |  4 ++
>  sysdeps/unix/sysv/linux/arc/libresolv.abilist |  2 -
>  sysdeps/unix/sysv/linux/arm/be/libc.abilist   |  4 ++
>  .../unix/sysv/linux/arm/be/libresolv.abilist  |  2 -
>  sysdeps/unix/sysv/linux/arm/le/libc.abilist   |  4 ++
>  .../unix/sysv/linux/arm/le/libresolv.abilist  |  2 -
>  sysdeps/unix/sysv/linux/csky/libc.abilist     |  4 ++
>  .../unix/sysv/linux/csky/libresolv.abilist    |  2 -
>  sysdeps/unix/sysv/linux/hppa/libc.abilist     |  5 ++
>  .../unix/sysv/linux/hppa/libresolv.abilist    |  3 --
>  sysdeps/unix/sysv/linux/i386/libc.abilist     |  5 ++
>  .../unix/sysv/linux/i386/libresolv.abilist    |  3 --
>  sysdeps/unix/sysv/linux/ia64/libc.abilist     |  5 ++
>  .../unix/sysv/linux/ia64/libresolv.abilist    |  3 --
>  .../sysv/linux/m68k/coldfire/libc.abilist     |  4 ++
>  .../linux/m68k/coldfire/libresolv.abilist     |  2 -
>  .../unix/sysv/linux/m68k/m680x0/libc.abilist  |  5 ++
>  .../sysv/linux/m68k/m680x0/libresolv.abilist  |  3 --
>  .../sysv/linux/microblaze/be/libc.abilist     |  4 ++
>  .../linux/microblaze/be/libresolv.abilist     |  2 -
>  .../sysv/linux/microblaze/le/libc.abilist     |  4 ++
>  .../linux/microblaze/le/libresolv.abilist     |  2 -
>  .../sysv/linux/mips/mips32/fpu/libc.abilist   |  5 ++
>  .../sysv/linux/mips/mips32/libresolv.abilist  |  3 --
>  .../sysv/linux/mips/mips32/nofpu/libc.abilist |  5 ++
>  .../sysv/linux/mips/mips64/n32/libc.abilist   |  5 ++
>  .../linux/mips/mips64/n32/libresolv.abilist   |  3 --
>  .../sysv/linux/mips/mips64/n64/libc.abilist   |  5 ++
>  .../linux/mips/mips64/n64/libresolv.abilist   |  3 --
>  sysdeps/unix/sysv/linux/nios2/libc.abilist    |  4 ++
>  .../unix/sysv/linux/nios2/libresolv.abilist   |  2 -
>  .../linux/powerpc/powerpc32/fpu/libc.abilist  |  5 ++
>  .../linux/powerpc/powerpc32/libresolv.abilist |  3 --
>  .../powerpc/powerpc32/nofpu/libc.abilist      |  5 ++
>  .../linux/powerpc/powerpc64/be/libc.abilist   |  4 ++
>  .../powerpc/powerpc64/be/libresolv.abilist    |  2 -
>  .../linux/powerpc/powerpc64/le/libc.abilist   |  4 ++
>  .../powerpc/powerpc64/le/libresolv.abilist    |  2 -
>  .../unix/sysv/linux/riscv/rv32/libc.abilist   |  4 ++
>  .../sysv/linux/riscv/rv32/libresolv.abilist   |  2 -
>  .../unix/sysv/linux/riscv/rv64/libc.abilist   |  4 ++
>  .../sysv/linux/riscv/rv64/libresolv.abilist   |  2 -
>  .../unix/sysv/linux/s390/s390-32/libc.abilist |  5 ++
>  .../sysv/linux/s390/s390-32/libresolv.abilist |  3 --
>  .../unix/sysv/linux/s390/s390-64/libc.abilist |  4 ++
>  .../sysv/linux/s390/s390-64/libresolv.abilist |  2 -
>  sysdeps/unix/sysv/linux/sh/be/libc.abilist    |  5 ++
>  .../unix/sysv/linux/sh/be/libresolv.abilist   |  3 --
>  sysdeps/unix/sysv/linux/sh/le/libc.abilist    |  5 ++
>  .../unix/sysv/linux/sh/le/libresolv.abilist   |  3 --
>  .../sysv/linux/sparc/sparc32/libc.abilist     |  5 ++
>  .../linux/sparc/sparc32/libresolv.abilist     |  3 --
>  .../sysv/linux/sparc/sparc64/libc.abilist     |  5 ++
>  .../linux/sparc/sparc64/libresolv.abilist     |  3 --
>  .../unix/sysv/linux/x86_64/64/libc.abilist    |  4 ++
>  .../sysv/linux/x86_64/64/libresolv.abilist    |  2 -
>  .../unix/sysv/linux/x86_64/x32/libc.abilist   |  4 ++
>  .../sysv/linux/x86_64/x32/libresolv.abilist   |  2 -
>  69 files changed, 188 insertions(+), 104 deletions(-)
> 
> diff --git a/resolv/Makefile b/resolv/Makefile
> index e9689f7e2c..31658202d3 100644
> --- a/resolv/Makefile
> +++ b/resolv/Makefile
> @@ -54,6 +54,7 @@ routines := \
>    res_hconf \
>    res_init \
>    res_libc \
> +  res_mkquery \

OK.

>    res_nameinquery \
>    res_queriesmatch \
>    res_randomid \
> @@ -155,7 +156,6 @@ libresolv-routines := \
>    res_debug \
>    res_hostalias \
>    res_isourserver \
> -  res_mkquery \

OK.

>    res_query \
>    resolv-deprecated \
>    # libresolv-routines
> diff --git a/resolv/Versions b/resolv/Versions
> index 21b7af73c5..fcaf9fada7 100644
> --- a/resolv/Versions
> +++ b/resolv/Versions
> @@ -17,12 +17,15 @@ libc {
>      herror;
>      hstrerror;
>      res_init;
> +    res_mkquery;

OK.

>    }
>    GLIBC_2.2 {
>      __dn_expand;
>      __res_init;
> +    __res_mkquery;
>      __res_nclose;
>      __res_ninit;
> +    __res_nmkquery;

OK.

>      __res_nsend;
>      __res_state;
>      _res_hconf;
> @@ -64,6 +67,8 @@ libc {
>      res_dnok;
>      res_hnok;
>      res_mailok;
> +    res_mkquery;
> +    res_nmkquery;

OK.

>      res_nsend;
>      res_ownok;
>      res_send;
> @@ -91,10 +96,12 @@ libc {
>      __ns_name_uncompress;
>      __ns_name_unpack;
>      __res_context_hostalias;
> +    __res_context_mkquery;
>      __res_context_send;
>      __res_context_send;
>      __res_get_nsaddr;
>      __res_iclose;
> +    __res_nopt;

OK.

>      __resolv_context_get;
>      __resolv_context_get_override;
>      __resolv_context_get_preinit;
> @@ -151,7 +158,6 @@ libresolv {
>      res_gethostbyaddr;
>      res_gethostbyname2;
>      res_gethostbyname;
> -    res_mkquery;

OK.

>      res_query;
>      res_querydomain;
>      res_search;
> @@ -160,8 +166,6 @@ libresolv {
>    }
>    GLIBC_2.2 {
>      __res_hostalias;
> -    __res_mkquery;
> -    __res_nmkquery;

OK.

>      __res_nquery;
>      __res_nquerydomain;
>      __res_nsearch;
> diff --git a/resolv/res_mkquery.c b/resolv/res_mkquery.c
> index 07c34d1340..ba6c983b58 100644
> --- a/resolv/res_mkquery.c
> +++ b/resolv/res_mkquery.c
> @@ -141,9 +141,9 @@ __res_context_mkquery (struct resolv_context *ctx, int op, const char *dname,
>        if ((buflen -= QFIXEDSZ) < 0)
>          return -1;
>      compose:
> -      n = ns_name_compress (dname, cp, buflen,
> -                            (const unsigned char **) dnptrs,
> -                            (const unsigned char **) lastdnptr);
> +      n = __ns_name_compress (dname, cp, buflen,
> +                              (const unsigned char **) dnptrs,
> +                              (const unsigned char **) lastdnptr);

OK.

>        if (n < 0)
>          return -1;
>        cp += n;
> @@ -155,9 +155,9 @@ __res_context_mkquery (struct resolv_context *ctx, int op, const char *dname,
>          break;
>  
>        /* Make an additional record for completion domain.  */
> -      n = ns_name_compress ((char *)data, cp, buflen,
> -                            (const unsigned char **) dnptrs,
> -                            (const unsigned char **) lastdnptr);
> +      n = __ns_name_compress ((char *)data, cp, buflen,
> +                              (const unsigned char **) dnptrs,
> +                              (const unsigned char **) lastdnptr);

OK.

>        if (__glibc_unlikely (n < 0))
>          return -1;
>        cp += n;
> @@ -174,6 +174,7 @@ __res_context_mkquery (struct resolv_context *ctx, int op, const char *dname,
>      }
>    return cp - buf;
>  }
> +libc_hidden_def (__res_context_mkquery)

OK.

>  
>  /* Common part of res_nmkquery and res_mkquery.  */
>  static int
> @@ -203,27 +204,38 @@ context_mkquery_common (struct resolv_context *ctx,
>  
>     DATALEN and NEWRR_IN are currently ignored.  */
>  int
> -res_nmkquery (res_state statp, int op, const char *dname,
> -              int class, int type,
> -              const unsigned char *data, int datalen,
> -              const unsigned char *newrr_in,
> -              unsigned char *buf, int buflen)
> +___res_nmkquery (res_state statp, int op, const char *dname,
> +                 int class, int type,
> +                 const unsigned char *data, int datalen,
> +                 const unsigned char *newrr_in,
> +                 unsigned char *buf, int buflen)

OK.

>  {
>    return context_mkquery_common
>      (__resolv_context_get_override (statp),
>       op, dname, class, type, data, buf, buflen);
>  }
> +versioned_symbol (libc, ___res_nmkquery, res_nmkquery, GLIBC_2_34);
> +#if OTHER_SHLIB_COMPAT (libresolv, GLIBC_2_2, GLIBC_2_34)
> +compat_symbol (libresolv, ___res_nmkquery, __res_nmkquery, GLIBC_2_2);
> +#endif

OK.

>  
>  int
> -res_mkquery (int op, const char *dname, int class, int type,
> -             const unsigned char *data, int datalen,
> -             const unsigned char *newrr_in,
> -             unsigned char *buf, int buflen)
> +___res_mkquery (int op, const char *dname, int class, int type,
> +                const unsigned char *data, int datalen,
> +                const unsigned char *newrr_in,
> +                unsigned char *buf, int buflen)
>  {
>    return context_mkquery_common
>      (__resolv_context_get_preinit (),
>       op, dname, class, type, data, buf, buflen);
>  }
> +versioned_symbol (libc, ___res_mkquery, res_mkquery, GLIBC_2_34);
> +#if OTHER_SHLIB_COMPAT (libresolv, GLIBC_2_0, GLIBC_2_2)
> +compat_symbol (libresolv, ___res_mkquery, res_mkquery, GLIBC_2_0);
> +#endif
> +#if OTHER_SHLIB_COMPAT (libresolv, GLIBC_2_2, GLIBC_2_34)
> +compat_symbol (libresolv, ___res_mkquery, __res_mkquery, GLIBC_2_2);
> +#endif

OK.

>  
>  /* Create an OPT resource record.  Return the length of the final
>     packet, or -1 on error.
> @@ -285,8 +297,4 @@ __res_nopt (struct resolv_context *ctx,
>  
>    return cp - buf;
>  }
> -
> -#if SHLIB_COMPAT (libresolv, GLIBC_2_0, GLIBC_2_2)
> -# undef res_mkquery
> -weak_alias (__res_mkquery, res_mkquery);
> -#endif
> +libc_hidden_def (__res_nopt)

OK.

> diff --git a/resolv/resolv-internal.h b/resolv/resolv-internal.h
> index 1e21c38cc7..3cf8a77698 100644
> --- a/resolv/resolv-internal.h
> +++ b/resolv/resolv-internal.h
> @@ -55,7 +55,8 @@ struct resolv_context;
>     Also used by __res_context_query.  */
>  int __res_context_mkquery (struct resolv_context *, int op, const char *dname,
>                             int class, int type, const unsigned char *data,
> -                           unsigned char *buf, int buflen) attribute_hidden;
> +                           unsigned char *buf, int buflen);
> +libc_hidden_proto (__res_context_mkquery)

OK.

>  
>  /* Main resolver query function for use within glibc.  */
>  int __res_context_search (struct resolv_context *, const char *, int, int,
> @@ -84,7 +85,8 @@ libc_hidden_proto (__res_context_hostalias);
>  
>  /* Add an OPT record to a DNS query.  */
>  int __res_nopt (struct resolv_context *, int n0,
> -                unsigned char *buf, int buflen, int anslen) attribute_hidden;
> +                unsigned char *buf, int buflen, int anslen);
> +libc_hidden_proto (__res_nopt)

OK.

>  
>  /* Convert from presentation format (which usually means ASCII
>     printable) to network format (which is usually some kind of binary
> diff --git a/resolv/resolv.h b/resolv/resolv.h
> index 66944008fd..e50b8d08d7 100644
> --- a/resolv/resolv.h
> +++ b/resolv/resolv.h
> @@ -168,7 +168,6 @@ __END_DECLS
>  #define res_close		__res_close
>  #define res_init		__res_init
>  #define res_isourserver		__res_isourserver
> -#define res_mkquery		__res_mkquery

OK.

>  #define res_query		__res_query
>  #define res_querydomain		__res_querydomain
>  #define res_search		__res_search
> @@ -228,7 +227,6 @@ __END_DECLS
>  #define res_nameinquery		__res_nameinquery
>  #define res_nclose		__res_nclose
>  #define res_ninit		__res_ninit
> -#define res_nmkquery		__res_nmkquery

OK.

>  #define res_nquery		__res_nquery
>  #define res_nquerydomain	__res_nquerydomain
>  #define res_nsearch		__res_nsearch
> diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist
> index 956c92182b..092f1b8ffb 100644
> --- a/sysdeps/mach/hurd/i386/libc.abilist
> +++ b/sysdeps/mach/hurd/i386/libc.abilist
> @@ -405,8 +405,10 @@ 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_mkquery F
>  GLIBC_2.2.6 __res_nclose F
>  GLIBC_2.2.6 __res_ninit F
> +GLIBC_2.2.6 __res_nmkquery F
>  GLIBC_2.2.6 __res_nsend F
>  GLIBC_2.2.6 __res_ownok F
>  GLIBC_2.2.6 __res_randomid F
> @@ -2263,6 +2265,8 @@ 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_mkquery F
> +GLIBC_2.34 res_nmkquery F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
>  GLIBC_2.34 res_send F
> diff --git a/sysdeps/mach/hurd/i386/libresolv.abilist b/sysdeps/mach/hurd/i386/libresolv.abilist
> index 2e772ae4e1..3ef54cc28e 100644
> --- a/sysdeps/mach/hurd/i386/libresolv.abilist
> +++ b/sysdeps/mach/hurd/i386/libresolv.abilist
> @@ -24,9 +24,7 @@ GLIBC_2.2.6 __putshort F
>  GLIBC_2.2.6 __res_close F
>  GLIBC_2.2.6 __res_hostalias F
>  GLIBC_2.2.6 __res_isourserver F
> -GLIBC_2.2.6 __res_mkquery F
>  GLIBC_2.2.6 __res_nameinquery F
> -GLIBC_2.2.6 __res_nmkquery F
>  GLIBC_2.2.6 __res_nquery F
>  GLIBC_2.2.6 __res_nquerydomain F
>  GLIBC_2.2.6 __res_nsearch F
> diff --git a/sysdeps/unix/sysv/linux/aarch64/libc.abilist b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
> index 21e768c926..7e1529bd90 100644
> --- a/sysdeps/unix/sysv/linux/aarch64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
> @@ -384,8 +384,10 @@ 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_mkquery F
>  GLIBC_2.17 __res_nclose F
>  GLIBC_2.17 __res_ninit F
> +GLIBC_2.17 __res_nmkquery F
>  GLIBC_2.17 __res_nsend F
>  GLIBC_2.17 __res_ownok F
>  GLIBC_2.17 __res_randomid F
> @@ -2565,6 +2567,8 @@ 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_mkquery F
> +GLIBC_2.34 res_nmkquery F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
>  GLIBC_2.34 res_send F
> diff --git a/sysdeps/unix/sysv/linux/aarch64/libresolv.abilist b/sysdeps/unix/sysv/linux/aarch64/libresolv.abilist
> index d071a2c5ef..702d13c633 100644
> --- a/sysdeps/unix/sysv/linux/aarch64/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/aarch64/libresolv.abilist
> @@ -25,9 +25,7 @@ GLIBC_2.17 __putshort F
>  GLIBC_2.17 __res_close F
>  GLIBC_2.17 __res_hostalias F
>  GLIBC_2.17 __res_isourserver F
> -GLIBC_2.17 __res_mkquery F
>  GLIBC_2.17 __res_nameinquery F
> -GLIBC_2.17 __res_nmkquery F
>  GLIBC_2.17 __res_nquery F
>  GLIBC_2.17 __res_nquerydomain F
>  GLIBC_2.17 __res_nsearch F
> diff --git a/sysdeps/unix/sysv/linux/alpha/libc.abilist b/sysdeps/unix/sysv/linux/alpha/libc.abilist
> index b0a70022dd..89ee2ed645 100644
> --- a/sysdeps/unix/sysv/linux/alpha/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist
> @@ -1004,6 +1004,7 @@ GLIBC_2.0 remove F
>  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 revoke F
>  GLIBC_2.0 rewind F
>  GLIBC_2.0 rewinddir F
> @@ -1977,8 +1978,10 @@ GLIBC_2.2 __pthread_rwlock_unlock F
>  GLIBC_2.2 __pthread_rwlock_wrlock F
>  GLIBC_2.2 __pwrite64 F
>  GLIBC_2.2 __res_init F
> +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_nsend F
>  GLIBC_2.2 __res_state F
>  GLIBC_2.2 __setmntent F
> @@ -2658,6 +2661,8 @@ 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_mkquery F
> +GLIBC_2.34 res_nmkquery F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
>  GLIBC_2.34 res_send F
> diff --git a/sysdeps/unix/sysv/linux/alpha/libresolv.abilist b/sysdeps/unix/sysv/linux/alpha/libresolv.abilist
> index 9e3b8f8c31..4f5160f474 100644
> --- a/sysdeps/unix/sysv/linux/alpha/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/alpha/libresolv.abilist
> @@ -42,15 +42,12 @@ 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_mkquery 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_mkquery 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
> diff --git a/sysdeps/unix/sysv/linux/arc/libc.abilist b/sysdeps/unix/sysv/linux/arc/libc.abilist
> index 66620e2f33..cf320c4bce 100644
> --- a/sysdeps/unix/sysv/linux/arc/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/arc/libc.abilist
> @@ -373,8 +373,10 @@ 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_mkquery F
>  GLIBC_2.32 __res_nclose F
>  GLIBC_2.32 __res_ninit F
> +GLIBC_2.32 __res_nmkquery F
>  GLIBC_2.32 __res_nsend F
>  GLIBC_2.32 __res_ownok F
>  GLIBC_2.32 __res_randomid F
> @@ -2324,6 +2326,8 @@ 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_mkquery F
> +GLIBC_2.34 res_nmkquery F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
>  GLIBC_2.34 res_send F
> diff --git a/sysdeps/unix/sysv/linux/arc/libresolv.abilist b/sysdeps/unix/sysv/linux/arc/libresolv.abilist
> index a9599afe6d..ee92f2ae58 100644
> --- a/sysdeps/unix/sysv/linux/arc/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/arc/libresolv.abilist
> @@ -24,9 +24,7 @@ GLIBC_2.32 __putshort F
>  GLIBC_2.32 __res_close F
>  GLIBC_2.32 __res_hostalias F
>  GLIBC_2.32 __res_isourserver F
> -GLIBC_2.32 __res_mkquery F
>  GLIBC_2.32 __res_nameinquery F
> -GLIBC_2.32 __res_nmkquery F
>  GLIBC_2.32 __res_nquery F
>  GLIBC_2.32 __res_nquerydomain F
>  GLIBC_2.32 __res_nsearch F
> diff --git a/sysdeps/unix/sysv/linux/arm/be/libc.abilist b/sysdeps/unix/sysv/linux/arm/be/libc.abilist
> index 571dc4fcc0..7b395d2683 100644
> --- a/sysdeps/unix/sysv/linux/arm/be/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/arm/be/libc.abilist
> @@ -442,6 +442,8 @@ 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_mkquery F
> +GLIBC_2.34 res_nmkquery F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
>  GLIBC_2.34 res_send F
> @@ -843,8 +845,10 @@ 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_mkquery F
>  GLIBC_2.4 __res_nclose F
>  GLIBC_2.4 __res_ninit F
> +GLIBC_2.4 __res_nmkquery F
>  GLIBC_2.4 __res_nsend F
>  GLIBC_2.4 __res_ownok F
>  GLIBC_2.4 __res_randomid F
> diff --git a/sysdeps/unix/sysv/linux/arm/be/libresolv.abilist b/sysdeps/unix/sysv/linux/arm/be/libresolv.abilist
> index 722feb80b6..ee4f6a36e9 100644
> --- a/sysdeps/unix/sysv/linux/arm/be/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/arm/be/libresolv.abilist
> @@ -25,9 +25,7 @@ GLIBC_2.4 __putshort F
>  GLIBC_2.4 __res_close F
>  GLIBC_2.4 __res_hostalias F
>  GLIBC_2.4 __res_isourserver F
> -GLIBC_2.4 __res_mkquery F
>  GLIBC_2.4 __res_nameinquery F
> -GLIBC_2.4 __res_nmkquery F
>  GLIBC_2.4 __res_nquery F
>  GLIBC_2.4 __res_nquerydomain F
>  GLIBC_2.4 __res_nsearch F
> diff --git a/sysdeps/unix/sysv/linux/arm/le/libc.abilist b/sysdeps/unix/sysv/linux/arm/le/libc.abilist
> index fdeb5940bb..9a2aefac45 100644
> --- a/sysdeps/unix/sysv/linux/arm/le/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/arm/le/libc.abilist
> @@ -439,6 +439,8 @@ 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_mkquery F
> +GLIBC_2.34 res_nmkquery F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
>  GLIBC_2.34 res_send F
> @@ -840,8 +842,10 @@ 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_mkquery F
>  GLIBC_2.4 __res_nclose F
>  GLIBC_2.4 __res_ninit F
> +GLIBC_2.4 __res_nmkquery F
>  GLIBC_2.4 __res_nsend F
>  GLIBC_2.4 __res_ownok F
>  GLIBC_2.4 __res_randomid F
> diff --git a/sysdeps/unix/sysv/linux/arm/le/libresolv.abilist b/sysdeps/unix/sysv/linux/arm/le/libresolv.abilist
> index 722feb80b6..ee4f6a36e9 100644
> --- a/sysdeps/unix/sysv/linux/arm/le/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/arm/le/libresolv.abilist
> @@ -25,9 +25,7 @@ GLIBC_2.4 __putshort F
>  GLIBC_2.4 __res_close F
>  GLIBC_2.4 __res_hostalias F
>  GLIBC_2.4 __res_isourserver F
> -GLIBC_2.4 __res_mkquery F
>  GLIBC_2.4 __res_nameinquery F
> -GLIBC_2.4 __res_nmkquery F
>  GLIBC_2.4 __res_nquery F
>  GLIBC_2.4 __res_nquerydomain F
>  GLIBC_2.4 __res_nsearch F
> diff --git a/sysdeps/unix/sysv/linux/csky/libc.abilist b/sysdeps/unix/sysv/linux/csky/libc.abilist
> index 4c0e79592e..eb8efa378b 100644
> --- a/sysdeps/unix/sysv/linux/csky/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/csky/libc.abilist
> @@ -377,8 +377,10 @@ 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_mkquery F
>  GLIBC_2.29 __res_nclose F
>  GLIBC_2.29 __res_ninit F
> +GLIBC_2.29 __res_nmkquery F
>  GLIBC_2.29 __res_nsend F
>  GLIBC_2.29 __res_ownok F
>  GLIBC_2.29 __res_randomid F
> @@ -2590,6 +2592,8 @@ 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_mkquery F
> +GLIBC_2.34 res_nmkquery F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
>  GLIBC_2.34 res_send F
> diff --git a/sysdeps/unix/sysv/linux/csky/libresolv.abilist b/sysdeps/unix/sysv/linux/csky/libresolv.abilist
> index d94fe24625..f4ae402b6f 100644
> --- a/sysdeps/unix/sysv/linux/csky/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/csky/libresolv.abilist
> @@ -24,9 +24,7 @@ GLIBC_2.29 __putshort F
>  GLIBC_2.29 __res_close F
>  GLIBC_2.29 __res_hostalias F
>  GLIBC_2.29 __res_isourserver F
> -GLIBC_2.29 __res_mkquery F
>  GLIBC_2.29 __res_nameinquery F
> -GLIBC_2.29 __res_nmkquery F
>  GLIBC_2.29 __res_nquery F
>  GLIBC_2.29 __res_nquerydomain F
>  GLIBC_2.29 __res_nsearch F
> diff --git a/sysdeps/unix/sysv/linux/hppa/libc.abilist b/sysdeps/unix/sysv/linux/hppa/libc.abilist
> index 813fb7cdda..4c3d7674ff 100644
> --- a/sysdeps/unix/sysv/linux/hppa/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/hppa/libc.abilist
> @@ -17,6 +17,7 @@ GLIBC_2.0 login_tty F
>  GLIBC_2.0 logout F
>  GLIBC_2.0 logwtmp F
>  GLIBC_2.0 openpty F
> +GLIBC_2.0 res_mkquery F
>  GLIBC_2.1 aio_cancel F
>  GLIBC_2.1 aio_cancel64 F
>  GLIBC_2.1 aio_error F
> @@ -427,8 +428,10 @@ GLIBC_2.2 __rcmd_errstr D 0x4
>  GLIBC_2.2 __read F
>  GLIBC_2.2 __realloc_hook D 0x4
>  GLIBC_2.2 __res_init F
> +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_nsend F
>  GLIBC_2.2 __res_randomid F
>  GLIBC_2.2 __res_state F
> @@ -2537,6 +2540,8 @@ 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_mkquery F
> +GLIBC_2.34 res_nmkquery F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
>  GLIBC_2.34 res_send F
> diff --git a/sysdeps/unix/sysv/linux/hppa/libresolv.abilist b/sysdeps/unix/sysv/linux/hppa/libresolv.abilist
> index 87c1434919..f2707204ed 100644
> --- a/sysdeps/unix/sysv/linux/hppa/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/hppa/libresolv.abilist
> @@ -42,15 +42,12 @@ 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_mkquery 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_mkquery 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
> diff --git a/sysdeps/unix/sysv/linux/i386/libc.abilist b/sysdeps/unix/sysv/linux/i386/libc.abilist
> index f09c7af651..9f44807e02 100644
> --- a/sysdeps/unix/sysv/linux/i386/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/i386/libc.abilist
> @@ -981,6 +981,7 @@ GLIBC_2.0 remove F
>  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 revoke F
>  GLIBC_2.0 rewind F
>  GLIBC_2.0 rewinddir F
> @@ -1981,8 +1982,10 @@ GLIBC_2.2 __pthread_rwlock_unlock F
>  GLIBC_2.2 __pthread_rwlock_wrlock F
>  GLIBC_2.2 __pwrite64 F
>  GLIBC_2.2 __res_init F
> +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_nsend F
>  GLIBC_2.2 __res_state F
>  GLIBC_2.2 __setmntent F
> @@ -2721,6 +2724,8 @@ 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_mkquery F
> +GLIBC_2.34 res_nmkquery F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
>  GLIBC_2.34 res_send F
> diff --git a/sysdeps/unix/sysv/linux/i386/libresolv.abilist b/sysdeps/unix/sysv/linux/i386/libresolv.abilist
> index 87c1434919..f2707204ed 100644
> --- a/sysdeps/unix/sysv/linux/i386/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/i386/libresolv.abilist
> @@ -42,15 +42,12 @@ 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_mkquery 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_mkquery 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
> diff --git a/sysdeps/unix/sysv/linux/ia64/libc.abilist b/sysdeps/unix/sysv/linux/ia64/libc.abilist
> index 8fa8b1094e..63a3fa22ef 100644
> --- a/sysdeps/unix/sysv/linux/ia64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/ia64/libc.abilist
> @@ -17,6 +17,7 @@ GLIBC_2.0 login_tty F
>  GLIBC_2.0 logout F
>  GLIBC_2.0 logwtmp F
>  GLIBC_2.0 openpty F
> +GLIBC_2.0 res_mkquery F
>  GLIBC_2.1 aio_cancel F
>  GLIBC_2.1 aio_cancel64 F
>  GLIBC_2.1 aio_error F
> @@ -431,8 +432,10 @@ GLIBC_2.2 __rcmd_errstr D 0x8
>  GLIBC_2.2 __read F
>  GLIBC_2.2 __realloc_hook D 0x8
>  GLIBC_2.2 __res_init F
> +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_nsend F
>  GLIBC_2.2 __res_randomid F
>  GLIBC_2.2 __res_state F
> @@ -2496,6 +2499,8 @@ 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_mkquery F
> +GLIBC_2.34 res_nmkquery F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
>  GLIBC_2.34 res_send F
> diff --git a/sysdeps/unix/sysv/linux/ia64/libresolv.abilist b/sysdeps/unix/sysv/linux/ia64/libresolv.abilist
> index 9e3b8f8c31..4f5160f474 100644
> --- a/sysdeps/unix/sysv/linux/ia64/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/ia64/libresolv.abilist
> @@ -42,15 +42,12 @@ 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_mkquery 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_mkquery 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
> diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
> index dd5d58b386..37bbdde23b 100644
> --- a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
> @@ -443,6 +443,8 @@ 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_mkquery F
> +GLIBC_2.34 res_nmkquery F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
>  GLIBC_2.34 res_send F
> @@ -829,8 +831,10 @@ 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_mkquery F
>  GLIBC_2.4 __res_nclose F
>  GLIBC_2.4 __res_ninit F
> +GLIBC_2.4 __res_nmkquery F
>  GLIBC_2.4 __res_nsend F
>  GLIBC_2.4 __res_ownok F
>  GLIBC_2.4 __res_randomid F
> diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libresolv.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libresolv.abilist
> index 722feb80b6..ee4f6a36e9 100644
> --- a/sysdeps/unix/sysv/linux/m68k/coldfire/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libresolv.abilist
> @@ -25,9 +25,7 @@ GLIBC_2.4 __putshort F
>  GLIBC_2.4 __res_close F
>  GLIBC_2.4 __res_hostalias F
>  GLIBC_2.4 __res_isourserver F
> -GLIBC_2.4 __res_mkquery F
>  GLIBC_2.4 __res_nameinquery F
> -GLIBC_2.4 __res_nmkquery F
>  GLIBC_2.4 __res_nquery F
>  GLIBC_2.4 __res_nquerydomain F
>  GLIBC_2.4 __res_nsearch F
> diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
> index 7feb85b86d..bf0eb6e976 100644
> --- a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
> @@ -980,6 +980,7 @@ GLIBC_2.0 remove F
>  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 revoke F
>  GLIBC_2.0 rewind F
>  GLIBC_2.0 rewinddir F
> @@ -1937,8 +1938,10 @@ GLIBC_2.2 __pthread_rwlock_unlock F
>  GLIBC_2.2 __pthread_rwlock_wrlock F
>  GLIBC_2.2 __pwrite64 F
>  GLIBC_2.2 __res_init F
> +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_nsend F
>  GLIBC_2.2 __res_state F
>  GLIBC_2.2 __setmntent F
> @@ -2664,6 +2667,8 @@ 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_mkquery F
> +GLIBC_2.34 res_nmkquery F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
>  GLIBC_2.34 res_send F
> diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libresolv.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libresolv.abilist
> index 87c1434919..f2707204ed 100644
> --- a/sysdeps/unix/sysv/linux/m68k/m680x0/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libresolv.abilist
> @@ -42,15 +42,12 @@ 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_mkquery 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_mkquery 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
> diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
> index 469153ade3..d5d5771708 100644
> --- a/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
> @@ -385,8 +385,10 @@ 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_mkquery F
>  GLIBC_2.18 __res_nclose F
>  GLIBC_2.18 __res_ninit F
> +GLIBC_2.18 __res_nmkquery F
>  GLIBC_2.18 __res_nsend F
>  GLIBC_2.18 __res_ownok F
>  GLIBC_2.18 __res_randomid F
> @@ -2641,6 +2643,8 @@ 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_mkquery F
> +GLIBC_2.34 res_nmkquery F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
>  GLIBC_2.34 res_send F
> diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libresolv.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libresolv.abilist
> index a3350181fe..9550bc22e1 100644
> --- a/sysdeps/unix/sysv/linux/microblaze/be/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/microblaze/be/libresolv.abilist
> @@ -25,9 +25,7 @@ GLIBC_2.18 __putshort F
>  GLIBC_2.18 __res_close F
>  GLIBC_2.18 __res_hostalias F
>  GLIBC_2.18 __res_isourserver F
> -GLIBC_2.18 __res_mkquery F
>  GLIBC_2.18 __res_nameinquery F
> -GLIBC_2.18 __res_nmkquery F
>  GLIBC_2.18 __res_nquery F
>  GLIBC_2.18 __res_nquerydomain F
>  GLIBC_2.18 __res_nsearch F
> diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
> index 99d43fe009..2f05d61c21 100644
> --- a/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
> @@ -385,8 +385,10 @@ 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_mkquery F
>  GLIBC_2.18 __res_nclose F
>  GLIBC_2.18 __res_ninit F
> +GLIBC_2.18 __res_nmkquery F
>  GLIBC_2.18 __res_nsend F
>  GLIBC_2.18 __res_ownok F
>  GLIBC_2.18 __res_randomid F
> @@ -2638,6 +2640,8 @@ 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_mkquery F
> +GLIBC_2.34 res_nmkquery F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
>  GLIBC_2.34 res_send F
> diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libresolv.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libresolv.abilist
> index a3350181fe..9550bc22e1 100644
> --- a/sysdeps/unix/sysv/linux/microblaze/le/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/microblaze/le/libresolv.abilist
> @@ -25,9 +25,7 @@ GLIBC_2.18 __putshort F
>  GLIBC_2.18 __res_close F
>  GLIBC_2.18 __res_hostalias F
>  GLIBC_2.18 __res_isourserver F
> -GLIBC_2.18 __res_mkquery F
>  GLIBC_2.18 __res_nameinquery F
> -GLIBC_2.18 __res_nmkquery F
>  GLIBC_2.18 __res_nquery F
>  GLIBC_2.18 __res_nquerydomain F
>  GLIBC_2.18 __res_nsearch F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
> index 96edb00531..8d62d76ca5 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
> @@ -977,6 +977,7 @@ GLIBC_2.0 remove F
>  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 revoke F
>  GLIBC_2.0 rewind F
>  GLIBC_2.0 rewinddir F
> @@ -1590,8 +1591,10 @@ GLIBC_2.2 __pthread_rwlock_wrlock F
>  GLIBC_2.2 __pwrite64 F
>  GLIBC_2.2 __rawmemchr F
>  GLIBC_2.2 __res_init F
> +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_nsend F
>  GLIBC_2.2 __res_state F
>  GLIBC_2.2 __setmntent F
> @@ -2629,6 +2632,8 @@ 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_mkquery F
> +GLIBC_2.34 res_nmkquery F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
>  GLIBC_2.34 res_send F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips32/libresolv.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libresolv.abilist
> index 87c1434919..f2707204ed 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips32/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips32/libresolv.abilist
> @@ -42,15 +42,12 @@ 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_mkquery 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_mkquery 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
> diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
> index bfb2cec7f6..68e086d203 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
> @@ -977,6 +977,7 @@ GLIBC_2.0 remove F
>  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 revoke F
>  GLIBC_2.0 rewind F
>  GLIBC_2.0 rewinddir F
> @@ -1588,8 +1589,10 @@ GLIBC_2.2 __pthread_rwlock_wrlock F
>  GLIBC_2.2 __pwrite64 F
>  GLIBC_2.2 __rawmemchr F
>  GLIBC_2.2 __res_init F
> +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_nsend F
>  GLIBC_2.2 __res_state F
>  GLIBC_2.2 __setmntent F
> @@ -2627,6 +2630,8 @@ 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_mkquery F
> +GLIBC_2.34 res_nmkquery F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
>  GLIBC_2.34 res_send F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
> index aad391e36c..14c19658c6 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
> @@ -977,6 +977,7 @@ GLIBC_2.0 remove F
>  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 revoke F
>  GLIBC_2.0 rewind F
>  GLIBC_2.0 rewinddir F
> @@ -1588,8 +1589,10 @@ GLIBC_2.2 __pthread_rwlock_wrlock F
>  GLIBC_2.2 __pwrite64 F
>  GLIBC_2.2 __rawmemchr F
>  GLIBC_2.2 __res_init F
> +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_nsend F
>  GLIBC_2.2 __res_state F
>  GLIBC_2.2 __setmntent F
> @@ -2635,6 +2638,8 @@ 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_mkquery F
> +GLIBC_2.34 res_nmkquery F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
>  GLIBC_2.34 res_send F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/libresolv.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libresolv.abilist
> index 87c1434919..f2707204ed 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips64/n32/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips64/n32/libresolv.abilist
> @@ -42,15 +42,12 @@ 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_mkquery 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_mkquery 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
> diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
> index 9bf9d868ce..479115297c 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
> @@ -975,6 +975,7 @@ GLIBC_2.0 remove F
>  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 revoke F
>  GLIBC_2.0 rewind F
>  GLIBC_2.0 rewinddir F
> @@ -1584,8 +1585,10 @@ GLIBC_2.2 __pthread_rwlock_wrlock F
>  GLIBC_2.2 __pwrite64 F
>  GLIBC_2.2 __rawmemchr F
>  GLIBC_2.2 __res_init F
> +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_nsend F
>  GLIBC_2.2 __res_state F
>  GLIBC_2.2 __setmntent F
> @@ -2547,6 +2550,8 @@ 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_mkquery F
> +GLIBC_2.34 res_nmkquery F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
>  GLIBC_2.34 res_send F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/libresolv.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libresolv.abilist
> index 9e3b8f8c31..4f5160f474 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips64/n64/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/libresolv.abilist
> @@ -42,15 +42,12 @@ 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_mkquery 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_mkquery 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
> diff --git a/sysdeps/unix/sysv/linux/nios2/libc.abilist b/sysdeps/unix/sysv/linux/nios2/libc.abilist
> index e6304726fd..b98437e5fc 100644
> --- a/sysdeps/unix/sysv/linux/nios2/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/nios2/libc.abilist
> @@ -422,8 +422,10 @@ 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_mkquery F
>  GLIBC_2.21 __res_nclose F
>  GLIBC_2.21 __res_ninit F
> +GLIBC_2.21 __res_nmkquery F
>  GLIBC_2.21 __res_nsend F
>  GLIBC_2.21 __res_ownok F
>  GLIBC_2.21 __res_randomid F
> @@ -2680,6 +2682,8 @@ 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_mkquery F
> +GLIBC_2.34 res_nmkquery F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
>  GLIBC_2.34 res_send F
> diff --git a/sysdeps/unix/sysv/linux/nios2/libresolv.abilist b/sysdeps/unix/sysv/linux/nios2/libresolv.abilist
> index 48cf067b8b..23c5250a0c 100644
> --- a/sysdeps/unix/sysv/linux/nios2/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/nios2/libresolv.abilist
> @@ -25,9 +25,7 @@ GLIBC_2.21 __putshort F
>  GLIBC_2.21 __res_close F
>  GLIBC_2.21 __res_hostalias F
>  GLIBC_2.21 __res_isourserver F
> -GLIBC_2.21 __res_mkquery F
>  GLIBC_2.21 __res_nameinquery F
> -GLIBC_2.21 __res_nmkquery F
>  GLIBC_2.21 __res_nquery F
>  GLIBC_2.21 __res_nquerydomain F
>  GLIBC_2.21 __res_nsearch F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
> index 3ade7dce04..6c311d2a5f 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
> @@ -988,6 +988,7 @@ GLIBC_2.0 remove F
>  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 revoke F
>  GLIBC_2.0 rewind F
>  GLIBC_2.0 rewinddir F
> @@ -1943,8 +1944,10 @@ GLIBC_2.2 __pthread_rwlock_unlock F
>  GLIBC_2.2 __pthread_rwlock_wrlock F
>  GLIBC_2.2 __pwrite64 F
>  GLIBC_2.2 __res_init F
> +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_nsend F
>  GLIBC_2.2 __res_state F
>  GLIBC_2.2 __setmntent F
> @@ -2691,6 +2694,8 @@ 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_mkquery F
> +GLIBC_2.34 res_nmkquery F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
>  GLIBC_2.34 res_send F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libresolv.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libresolv.abilist
> index 87c1434919..f2707204ed 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libresolv.abilist
> @@ -42,15 +42,12 @@ 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_mkquery 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_mkquery 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
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
> index 3c68153771..c6d7f1cff4 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
> @@ -988,6 +988,7 @@ GLIBC_2.0 remove F
>  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 revoke F
>  GLIBC_2.0 rewind F
>  GLIBC_2.0 rewinddir F
> @@ -1947,8 +1948,10 @@ GLIBC_2.2 __pthread_rwlock_unlock F
>  GLIBC_2.2 __pthread_rwlock_wrlock F
>  GLIBC_2.2 __pwrite64 F
>  GLIBC_2.2 __res_init F
> +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_nsend F
>  GLIBC_2.2 __res_state F
>  GLIBC_2.2 __setmntent F
> @@ -2724,6 +2727,8 @@ 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_mkquery F
> +GLIBC_2.34 res_nmkquery F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
>  GLIBC_2.34 res_send F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
> index 0c8d700ed8..f8e69c7fd3 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
> @@ -468,8 +468,10 @@ 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_mkquery F
>  GLIBC_2.3 __res_nclose F
>  GLIBC_2.3 __res_ninit F
> +GLIBC_2.3 __res_nmkquery F
>  GLIBC_2.3 __res_nsend F
>  GLIBC_2.3 __res_ownok F
>  GLIBC_2.3 __res_randomid F
> @@ -2459,6 +2461,8 @@ 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_mkquery F
> +GLIBC_2.34 res_nmkquery F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
>  GLIBC_2.34 res_send F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libresolv.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libresolv.abilist
> index 708f9cd1d8..4d1fb69bc6 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libresolv.abilist
> @@ -24,9 +24,7 @@ GLIBC_2.3 __putshort F
>  GLIBC_2.3 __res_close F
>  GLIBC_2.3 __res_hostalias F
>  GLIBC_2.3 __res_isourserver F
> -GLIBC_2.3 __res_mkquery F
>  GLIBC_2.3 __res_nameinquery F
> -GLIBC_2.3 __res_nmkquery F
>  GLIBC_2.3 __res_nquery F
>  GLIBC_2.3 __res_nquerydomain F
>  GLIBC_2.3 __res_nsearch F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
> index 37c7b53452..6b0a84c8f6 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
> @@ -470,8 +470,10 @@ 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_mkquery F
>  GLIBC_2.17 __res_nclose F
>  GLIBC_2.17 __res_ninit F
> +GLIBC_2.17 __res_nmkquery F
>  GLIBC_2.17 __res_nsend F
>  GLIBC_2.17 __res_ownok F
>  GLIBC_2.17 __res_randomid F
> @@ -2761,6 +2763,8 @@ 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_mkquery F
> +GLIBC_2.34 res_nmkquery F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
>  GLIBC_2.34 res_send F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libresolv.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libresolv.abilist
> index d071a2c5ef..702d13c633 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libresolv.abilist
> @@ -25,9 +25,7 @@ GLIBC_2.17 __putshort F
>  GLIBC_2.17 __res_close F
>  GLIBC_2.17 __res_hostalias F
>  GLIBC_2.17 __res_isourserver F
> -GLIBC_2.17 __res_mkquery F
>  GLIBC_2.17 __res_nameinquery F
> -GLIBC_2.17 __res_nmkquery F
>  GLIBC_2.17 __res_nquery F
>  GLIBC_2.17 __res_nquerydomain F
>  GLIBC_2.17 __res_nsearch F
> diff --git a/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist b/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
> index 2f00ab943c..080d87a80b 100644
> --- a/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
> @@ -370,8 +370,10 @@ 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_mkquery F
>  GLIBC_2.33 __res_nclose F
>  GLIBC_2.33 __res_ninit F
> +GLIBC_2.33 __res_nmkquery F
>  GLIBC_2.33 __res_nsend F
>  GLIBC_2.33 __res_ownok F
>  GLIBC_2.33 __res_randomid F
> @@ -2326,6 +2328,8 @@ 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_mkquery F
> +GLIBC_2.34 res_nmkquery F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
>  GLIBC_2.34 res_send F
> diff --git a/sysdeps/unix/sysv/linux/riscv/rv32/libresolv.abilist b/sysdeps/unix/sysv/linux/riscv/rv32/libresolv.abilist
> index bd9a317d8d..50daff9908 100644
> --- a/sysdeps/unix/sysv/linux/riscv/rv32/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/riscv/rv32/libresolv.abilist
> @@ -24,9 +24,7 @@ GLIBC_2.33 __putshort F
>  GLIBC_2.33 __res_close F
>  GLIBC_2.33 __res_hostalias F
>  GLIBC_2.33 __res_isourserver F
> -GLIBC_2.33 __res_mkquery F
>  GLIBC_2.33 __res_nameinquery F
> -GLIBC_2.33 __res_nmkquery F
>  GLIBC_2.33 __res_nquery F
>  GLIBC_2.33 __res_nquerydomain F
>  GLIBC_2.33 __res_nsearch F
> diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
> index 02e82a02c3..53b33d1504 100644
> --- a/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
> @@ -381,8 +381,10 @@ 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_mkquery F
>  GLIBC_2.27 __res_nclose F
>  GLIBC_2.27 __res_ninit F
> +GLIBC_2.27 __res_nmkquery F
>  GLIBC_2.27 __res_nsend F
>  GLIBC_2.27 __res_ownok F
>  GLIBC_2.27 __res_randomid F
> @@ -2526,6 +2528,8 @@ 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_mkquery F
> +GLIBC_2.34 res_nmkquery F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
>  GLIBC_2.34 res_send F
> diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libresolv.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libresolv.abilist
> index e40b11fe0f..050ca355e2 100644
> --- a/sysdeps/unix/sysv/linux/riscv/rv64/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/riscv/rv64/libresolv.abilist
> @@ -24,9 +24,7 @@ GLIBC_2.27 __putshort F
>  GLIBC_2.27 __res_close F
>  GLIBC_2.27 __res_hostalias F
>  GLIBC_2.27 __res_isourserver F
> -GLIBC_2.27 __res_mkquery F
>  GLIBC_2.27 __res_nameinquery F
> -GLIBC_2.27 __res_nmkquery F
>  GLIBC_2.27 __res_nquery F
>  GLIBC_2.27 __res_nquerydomain F
>  GLIBC_2.27 __res_nsearch F
> diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
> index dcb20fbe4f..d1d59f0021 100644
> --- a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
> @@ -979,6 +979,7 @@ GLIBC_2.0 remove F
>  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 revoke F
>  GLIBC_2.0 rewind F
>  GLIBC_2.0 rewinddir F
> @@ -1941,8 +1942,10 @@ GLIBC_2.2 __pthread_rwlock_unlock F
>  GLIBC_2.2 __pthread_rwlock_wrlock F
>  GLIBC_2.2 __pwrite64 F
>  GLIBC_2.2 __res_init F
> +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_nsend F
>  GLIBC_2.2 __res_state F
>  GLIBC_2.2 __setmntent F
> @@ -2689,6 +2692,8 @@ 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_mkquery F
> +GLIBC_2.34 res_nmkquery F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
>  GLIBC_2.34 res_send F
> diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libresolv.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libresolv.abilist
> index 87c1434919..f2707204ed 100644
> --- a/sysdeps/unix/sysv/linux/s390/s390-32/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/s390/s390-32/libresolv.abilist
> @@ -42,15 +42,12 @@ 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_mkquery 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_mkquery 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
> diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
> index 2c12049d08..ca3e7ebc6d 100644
> --- a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
> @@ -412,8 +412,10 @@ 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_mkquery F
>  GLIBC_2.2 __res_nclose F
>  GLIBC_2.2 __res_ninit F
> +GLIBC_2.2 __res_nmkquery F
>  GLIBC_2.2 __res_nsend F
>  GLIBC_2.2 __res_ownok F
>  GLIBC_2.2 __res_randomid F
> @@ -2496,6 +2498,8 @@ 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_mkquery F
> +GLIBC_2.34 res_nmkquery F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
>  GLIBC_2.34 res_send F
> diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libresolv.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libresolv.abilist
> index f1c523177b..3b8ffd2766 100644
> --- a/sysdeps/unix/sysv/linux/s390/s390-64/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/s390/s390-64/libresolv.abilist
> @@ -24,9 +24,7 @@ GLIBC_2.2 __putshort F
>  GLIBC_2.2 __res_close F
>  GLIBC_2.2 __res_hostalias F
>  GLIBC_2.2 __res_isourserver F
> -GLIBC_2.2 __res_mkquery F
>  GLIBC_2.2 __res_nameinquery 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
> diff --git a/sysdeps/unix/sysv/linux/sh/be/libc.abilist b/sysdeps/unix/sysv/linux/sh/be/libc.abilist
> index b11d407e33..fcde356a18 100644
> --- a/sysdeps/unix/sysv/linux/sh/be/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/sh/be/libc.abilist
> @@ -21,6 +21,7 @@ GLIBC_2.0 login_tty F
>  GLIBC_2.0 logout F
>  GLIBC_2.0 logwtmp F
>  GLIBC_2.0 openpty F
> +GLIBC_2.0 res_mkquery F
>  GLIBC_2.1 aio_cancel F
>  GLIBC_2.1 aio_cancel64 F
>  GLIBC_2.1 aio_error F
> @@ -431,8 +432,10 @@ GLIBC_2.2 __read F
>  GLIBC_2.2 __realloc_hook D 0x4
>  GLIBC_2.2 __register_frame_info F
>  GLIBC_2.2 __res_init F
> +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_nsend F
>  GLIBC_2.2 __res_randomid F
>  GLIBC_2.2 __res_state F
> @@ -2544,6 +2547,8 @@ 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_mkquery F
> +GLIBC_2.34 res_nmkquery F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
>  GLIBC_2.34 res_send F
> diff --git a/sysdeps/unix/sysv/linux/sh/be/libresolv.abilist b/sysdeps/unix/sysv/linux/sh/be/libresolv.abilist
> index 87c1434919..f2707204ed 100644
> --- a/sysdeps/unix/sysv/linux/sh/be/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/sh/be/libresolv.abilist
> @@ -42,15 +42,12 @@ 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_mkquery 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_mkquery 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
> diff --git a/sysdeps/unix/sysv/linux/sh/le/libc.abilist b/sysdeps/unix/sysv/linux/sh/le/libc.abilist
> index 5dc2d54de1..18dffb1d62 100644
> --- a/sysdeps/unix/sysv/linux/sh/le/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/sh/le/libc.abilist
> @@ -21,6 +21,7 @@ GLIBC_2.0 login_tty F
>  GLIBC_2.0 logout F
>  GLIBC_2.0 logwtmp F
>  GLIBC_2.0 openpty F
> +GLIBC_2.0 res_mkquery F
>  GLIBC_2.1 aio_cancel F
>  GLIBC_2.1 aio_cancel64 F
>  GLIBC_2.1 aio_error F
> @@ -431,8 +432,10 @@ GLIBC_2.2 __read F
>  GLIBC_2.2 __realloc_hook D 0x4
>  GLIBC_2.2 __register_frame_info F
>  GLIBC_2.2 __res_init F
> +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_nsend F
>  GLIBC_2.2 __res_randomid F
>  GLIBC_2.2 __res_state F
> @@ -2541,6 +2544,8 @@ 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_mkquery F
> +GLIBC_2.34 res_nmkquery F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
>  GLIBC_2.34 res_send F
> diff --git a/sysdeps/unix/sysv/linux/sh/le/libresolv.abilist b/sysdeps/unix/sysv/linux/sh/le/libresolv.abilist
> index 87c1434919..f2707204ed 100644
> --- a/sysdeps/unix/sysv/linux/sh/le/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/sh/le/libresolv.abilist
> @@ -42,15 +42,12 @@ 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_mkquery 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_mkquery 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
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
> index 96a26a42b9..61fd09d562 100644
> --- a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
> @@ -982,6 +982,7 @@ GLIBC_2.0 remove F
>  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 revoke F
>  GLIBC_2.0 rewind F
>  GLIBC_2.0 rewinddir F
> @@ -1939,8 +1940,10 @@ GLIBC_2.2 __pthread_rwlock_unlock F
>  GLIBC_2.2 __pthread_rwlock_wrlock F
>  GLIBC_2.2 __pwrite64 F
>  GLIBC_2.2 __res_init F
> +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_nsend F
>  GLIBC_2.2 __res_state F
>  GLIBC_2.2 __setmntent F
> @@ -2684,6 +2687,8 @@ 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_mkquery F
> +GLIBC_2.34 res_nmkquery F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
>  GLIBC_2.34 res_send F
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libresolv.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libresolv.abilist
> index 87c1434919..f2707204ed 100644
> --- a/sysdeps/unix/sysv/linux/sparc/sparc32/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libresolv.abilist
> @@ -42,15 +42,12 @@ 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_mkquery 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_mkquery 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
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
> index ed5c95f089..fa300e44d6 100644
> --- a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
> @@ -21,6 +21,7 @@ GLIBC_2.0 login_tty F
>  GLIBC_2.0 logout F
>  GLIBC_2.0 logwtmp F
>  GLIBC_2.0 openpty F
> +GLIBC_2.0 res_mkquery F
>  GLIBC_2.1 aio_cancel F
>  GLIBC_2.1 aio_cancel64 F
>  GLIBC_2.1 aio_error F
> @@ -472,8 +473,10 @@ 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_init F
> +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_nsend F
>  GLIBC_2.2 __res_randomid F
>  GLIBC_2.2 __res_state F
> @@ -2519,6 +2522,8 @@ 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_mkquery F
> +GLIBC_2.34 res_nmkquery F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
>  GLIBC_2.34 res_send F
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libresolv.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libresolv.abilist
> index 9e3b8f8c31..4f5160f474 100644
> --- a/sysdeps/unix/sysv/linux/sparc/sparc64/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libresolv.abilist
> @@ -42,15 +42,12 @@ 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_mkquery 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_mkquery 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
> diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
> index 8d1eff33d9..3160273a6f 100644
> --- a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
> @@ -396,8 +396,10 @@ 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_mkquery F
>  GLIBC_2.2.5 __res_nclose F
>  GLIBC_2.2.5 __res_ninit F
> +GLIBC_2.2.5 __res_nmkquery F
>  GLIBC_2.2.5 __res_nsend F
>  GLIBC_2.2.5 __res_ownok F
>  GLIBC_2.2.5 __res_randomid F
> @@ -2474,6 +2476,8 @@ 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_mkquery F
> +GLIBC_2.34 res_nmkquery F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
>  GLIBC_2.34 res_send F
> diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libresolv.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libresolv.abilist
> index dd49cbe641..e2a6207778 100644
> --- a/sysdeps/unix/sysv/linux/x86_64/64/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/x86_64/64/libresolv.abilist
> @@ -24,9 +24,7 @@ GLIBC_2.2.5 __putshort F
>  GLIBC_2.2.5 __res_close F
>  GLIBC_2.2.5 __res_hostalias F
>  GLIBC_2.2.5 __res_isourserver F
> -GLIBC_2.2.5 __res_mkquery F
>  GLIBC_2.2.5 __res_nameinquery F
> -GLIBC_2.2.5 __res_nmkquery F
>  GLIBC_2.2.5 __res_nquery F
>  GLIBC_2.2.5 __res_nquerydomain F
>  GLIBC_2.2.5 __res_nsearch F
> diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
> index d6855e3690..886414793c 100644
> --- a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
> @@ -385,8 +385,10 @@ 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_mkquery F
>  GLIBC_2.16 __res_nclose F
>  GLIBC_2.16 __res_ninit F
> +GLIBC_2.16 __res_nmkquery F
>  GLIBC_2.16 __res_nsend F
>  GLIBC_2.16 __res_ownok F
>  GLIBC_2.16 __res_randomid F
> @@ -2580,6 +2582,8 @@ 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_mkquery F
> +GLIBC_2.34 res_nmkquery F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
>  GLIBC_2.34 res_send F
> diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libresolv.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libresolv.abilist
> index 298baa250e..b7564c49cc 100644
> --- a/sysdeps/unix/sysv/linux/x86_64/x32/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/x86_64/x32/libresolv.abilist
> @@ -25,9 +25,7 @@ GLIBC_2.16 __putshort F
>  GLIBC_2.16 __res_close F
>  GLIBC_2.16 __res_hostalias F
>  GLIBC_2.16 __res_isourserver F
> -GLIBC_2.16 __res_mkquery F
>  GLIBC_2.16 __res_nameinquery F
> -GLIBC_2.16 __res_nmkquery F
>  GLIBC_2.16 __res_nquery F
>  GLIBC_2.16 __res_nquerydomain F
>  GLIBC_2.16 __res_nsearch F
 
OK.
diff mbox series

Patch

diff --git a/resolv/Makefile b/resolv/Makefile
index e9689f7e2c..31658202d3 100644
--- a/resolv/Makefile
+++ b/resolv/Makefile
@@ -54,6 +54,7 @@  routines := \
   res_hconf \
   res_init \
   res_libc \
+  res_mkquery \
   res_nameinquery \
   res_queriesmatch \
   res_randomid \
@@ -155,7 +156,6 @@  libresolv-routines := \
   res_debug \
   res_hostalias \
   res_isourserver \
-  res_mkquery \
   res_query \
   resolv-deprecated \
   # libresolv-routines
diff --git a/resolv/Versions b/resolv/Versions
index 21b7af73c5..fcaf9fada7 100644
--- a/resolv/Versions
+++ b/resolv/Versions
@@ -17,12 +17,15 @@  libc {
     herror;
     hstrerror;
     res_init;
+    res_mkquery;
   }
   GLIBC_2.2 {
     __dn_expand;
     __res_init;
+    __res_mkquery;
     __res_nclose;
     __res_ninit;
+    __res_nmkquery;
     __res_nsend;
     __res_state;
     _res_hconf;
@@ -64,6 +67,8 @@  libc {
     res_dnok;
     res_hnok;
     res_mailok;
+    res_mkquery;
+    res_nmkquery;
     res_nsend;
     res_ownok;
     res_send;
@@ -91,10 +96,12 @@  libc {
     __ns_name_uncompress;
     __ns_name_unpack;
     __res_context_hostalias;
+    __res_context_mkquery;
     __res_context_send;
     __res_context_send;
     __res_get_nsaddr;
     __res_iclose;
+    __res_nopt;
     __resolv_context_get;
     __resolv_context_get_override;
     __resolv_context_get_preinit;
@@ -151,7 +158,6 @@  libresolv {
     res_gethostbyaddr;
     res_gethostbyname2;
     res_gethostbyname;
-    res_mkquery;
     res_query;
     res_querydomain;
     res_search;
@@ -160,8 +166,6 @@  libresolv {
   }
   GLIBC_2.2 {
     __res_hostalias;
-    __res_mkquery;
-    __res_nmkquery;
     __res_nquery;
     __res_nquerydomain;
     __res_nsearch;
diff --git a/resolv/res_mkquery.c b/resolv/res_mkquery.c
index 07c34d1340..ba6c983b58 100644
--- a/resolv/res_mkquery.c
+++ b/resolv/res_mkquery.c
@@ -141,9 +141,9 @@  __res_context_mkquery (struct resolv_context *ctx, int op, const char *dname,
       if ((buflen -= QFIXEDSZ) < 0)
         return -1;
     compose:
-      n = ns_name_compress (dname, cp, buflen,
-                            (const unsigned char **) dnptrs,
-                            (const unsigned char **) lastdnptr);
+      n = __ns_name_compress (dname, cp, buflen,
+                              (const unsigned char **) dnptrs,
+                              (const unsigned char **) lastdnptr);
       if (n < 0)
         return -1;
       cp += n;
@@ -155,9 +155,9 @@  __res_context_mkquery (struct resolv_context *ctx, int op, const char *dname,
         break;
 
       /* Make an additional record for completion domain.  */
-      n = ns_name_compress ((char *)data, cp, buflen,
-                            (const unsigned char **) dnptrs,
-                            (const unsigned char **) lastdnptr);
+      n = __ns_name_compress ((char *)data, cp, buflen,
+                              (const unsigned char **) dnptrs,
+                              (const unsigned char **) lastdnptr);
       if (__glibc_unlikely (n < 0))
         return -1;
       cp += n;
@@ -174,6 +174,7 @@  __res_context_mkquery (struct resolv_context *ctx, int op, const char *dname,
     }
   return cp - buf;
 }
+libc_hidden_def (__res_context_mkquery)
 
 /* Common part of res_nmkquery and res_mkquery.  */
 static int
@@ -203,27 +204,38 @@  context_mkquery_common (struct resolv_context *ctx,
 
    DATALEN and NEWRR_IN are currently ignored.  */
 int
-res_nmkquery (res_state statp, int op, const char *dname,
-              int class, int type,
-              const unsigned char *data, int datalen,
-              const unsigned char *newrr_in,
-              unsigned char *buf, int buflen)
+___res_nmkquery (res_state statp, int op, const char *dname,
+                 int class, int type,
+                 const unsigned char *data, int datalen,
+                 const unsigned char *newrr_in,
+                 unsigned char *buf, int buflen)
 {
   return context_mkquery_common
     (__resolv_context_get_override (statp),
      op, dname, class, type, data, buf, buflen);
 }
+versioned_symbol (libc, ___res_nmkquery, res_nmkquery, GLIBC_2_34);
+#if OTHER_SHLIB_COMPAT (libresolv, GLIBC_2_2, GLIBC_2_34)
+compat_symbol (libresolv, ___res_nmkquery, __res_nmkquery, GLIBC_2_2);
+#endif
 
 int
-res_mkquery (int op, const char *dname, int class, int type,
-             const unsigned char *data, int datalen,
-             const unsigned char *newrr_in,
-             unsigned char *buf, int buflen)
+___res_mkquery (int op, const char *dname, int class, int type,
+                const unsigned char *data, int datalen,
+                const unsigned char *newrr_in,
+                unsigned char *buf, int buflen)
 {
   return context_mkquery_common
     (__resolv_context_get_preinit (),
      op, dname, class, type, data, buf, buflen);
 }
+versioned_symbol (libc, ___res_mkquery, res_mkquery, GLIBC_2_34);
+#if OTHER_SHLIB_COMPAT (libresolv, GLIBC_2_0, GLIBC_2_2)
+compat_symbol (libresolv, ___res_mkquery, res_mkquery, GLIBC_2_0);
+#endif
+#if OTHER_SHLIB_COMPAT (libresolv, GLIBC_2_2, GLIBC_2_34)
+compat_symbol (libresolv, ___res_mkquery, __res_mkquery, GLIBC_2_2);
+#endif
 
 /* Create an OPT resource record.  Return the length of the final
    packet, or -1 on error.
@@ -285,8 +297,4 @@  __res_nopt (struct resolv_context *ctx,
 
   return cp - buf;
 }
-
-#if SHLIB_COMPAT (libresolv, GLIBC_2_0, GLIBC_2_2)
-# undef res_mkquery
-weak_alias (__res_mkquery, res_mkquery);
-#endif
+libc_hidden_def (__res_nopt)
diff --git a/resolv/resolv-internal.h b/resolv/resolv-internal.h
index 1e21c38cc7..3cf8a77698 100644
--- a/resolv/resolv-internal.h
+++ b/resolv/resolv-internal.h
@@ -55,7 +55,8 @@  struct resolv_context;
    Also used by __res_context_query.  */
 int __res_context_mkquery (struct resolv_context *, int op, const char *dname,
                            int class, int type, const unsigned char *data,
-                           unsigned char *buf, int buflen) attribute_hidden;
+                           unsigned char *buf, int buflen);
+libc_hidden_proto (__res_context_mkquery)
 
 /* Main resolver query function for use within glibc.  */
 int __res_context_search (struct resolv_context *, const char *, int, int,
@@ -84,7 +85,8 @@  libc_hidden_proto (__res_context_hostalias);
 
 /* Add an OPT record to a DNS query.  */
 int __res_nopt (struct resolv_context *, int n0,
-                unsigned char *buf, int buflen, int anslen) attribute_hidden;
+                unsigned char *buf, int buflen, int anslen);
+libc_hidden_proto (__res_nopt)
 
 /* Convert from presentation format (which usually means ASCII
    printable) to network format (which is usually some kind of binary
diff --git a/resolv/resolv.h b/resolv/resolv.h
index 66944008fd..e50b8d08d7 100644
--- a/resolv/resolv.h
+++ b/resolv/resolv.h
@@ -168,7 +168,6 @@  __END_DECLS
 #define res_close		__res_close
 #define res_init		__res_init
 #define res_isourserver		__res_isourserver
-#define res_mkquery		__res_mkquery
 #define res_query		__res_query
 #define res_querydomain		__res_querydomain
 #define res_search		__res_search
@@ -228,7 +227,6 @@  __END_DECLS
 #define res_nameinquery		__res_nameinquery
 #define res_nclose		__res_nclose
 #define res_ninit		__res_ninit
-#define res_nmkquery		__res_nmkquery
 #define res_nquery		__res_nquery
 #define res_nquerydomain	__res_nquerydomain
 #define res_nsearch		__res_nsearch
diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist
index 956c92182b..092f1b8ffb 100644
--- a/sysdeps/mach/hurd/i386/libc.abilist
+++ b/sysdeps/mach/hurd/i386/libc.abilist
@@ -405,8 +405,10 @@  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_mkquery F
 GLIBC_2.2.6 __res_nclose F
 GLIBC_2.2.6 __res_ninit F
+GLIBC_2.2.6 __res_nmkquery F
 GLIBC_2.2.6 __res_nsend F
 GLIBC_2.2.6 __res_ownok F
 GLIBC_2.2.6 __res_randomid F
@@ -2263,6 +2265,8 @@  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_mkquery F
+GLIBC_2.34 res_nmkquery F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
 GLIBC_2.34 res_send F
diff --git a/sysdeps/mach/hurd/i386/libresolv.abilist b/sysdeps/mach/hurd/i386/libresolv.abilist
index 2e772ae4e1..3ef54cc28e 100644
--- a/sysdeps/mach/hurd/i386/libresolv.abilist
+++ b/sysdeps/mach/hurd/i386/libresolv.abilist
@@ -24,9 +24,7 @@  GLIBC_2.2.6 __putshort F
 GLIBC_2.2.6 __res_close F
 GLIBC_2.2.6 __res_hostalias F
 GLIBC_2.2.6 __res_isourserver F
-GLIBC_2.2.6 __res_mkquery F
 GLIBC_2.2.6 __res_nameinquery F
-GLIBC_2.2.6 __res_nmkquery F
 GLIBC_2.2.6 __res_nquery F
 GLIBC_2.2.6 __res_nquerydomain F
 GLIBC_2.2.6 __res_nsearch F
diff --git a/sysdeps/unix/sysv/linux/aarch64/libc.abilist b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
index 21e768c926..7e1529bd90 100644
--- a/sysdeps/unix/sysv/linux/aarch64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
@@ -384,8 +384,10 @@  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_mkquery F
 GLIBC_2.17 __res_nclose F
 GLIBC_2.17 __res_ninit F
+GLIBC_2.17 __res_nmkquery F
 GLIBC_2.17 __res_nsend F
 GLIBC_2.17 __res_ownok F
 GLIBC_2.17 __res_randomid F
@@ -2565,6 +2567,8 @@  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_mkquery F
+GLIBC_2.34 res_nmkquery F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
 GLIBC_2.34 res_send F
diff --git a/sysdeps/unix/sysv/linux/aarch64/libresolv.abilist b/sysdeps/unix/sysv/linux/aarch64/libresolv.abilist
index d071a2c5ef..702d13c633 100644
--- a/sysdeps/unix/sysv/linux/aarch64/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/aarch64/libresolv.abilist
@@ -25,9 +25,7 @@  GLIBC_2.17 __putshort F
 GLIBC_2.17 __res_close F
 GLIBC_2.17 __res_hostalias F
 GLIBC_2.17 __res_isourserver F
-GLIBC_2.17 __res_mkquery F
 GLIBC_2.17 __res_nameinquery F
-GLIBC_2.17 __res_nmkquery F
 GLIBC_2.17 __res_nquery F
 GLIBC_2.17 __res_nquerydomain F
 GLIBC_2.17 __res_nsearch F
diff --git a/sysdeps/unix/sysv/linux/alpha/libc.abilist b/sysdeps/unix/sysv/linux/alpha/libc.abilist
index b0a70022dd..89ee2ed645 100644
--- a/sysdeps/unix/sysv/linux/alpha/libc.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist
@@ -1004,6 +1004,7 @@  GLIBC_2.0 remove F
 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 revoke F
 GLIBC_2.0 rewind F
 GLIBC_2.0 rewinddir F
@@ -1977,8 +1978,10 @@  GLIBC_2.2 __pthread_rwlock_unlock F
 GLIBC_2.2 __pthread_rwlock_wrlock F
 GLIBC_2.2 __pwrite64 F
 GLIBC_2.2 __res_init F
+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_nsend F
 GLIBC_2.2 __res_state F
 GLIBC_2.2 __setmntent F
@@ -2658,6 +2661,8 @@  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_mkquery F
+GLIBC_2.34 res_nmkquery F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
 GLIBC_2.34 res_send F
diff --git a/sysdeps/unix/sysv/linux/alpha/libresolv.abilist b/sysdeps/unix/sysv/linux/alpha/libresolv.abilist
index 9e3b8f8c31..4f5160f474 100644
--- a/sysdeps/unix/sysv/linux/alpha/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libresolv.abilist
@@ -42,15 +42,12 @@  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_mkquery 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_mkquery 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
diff --git a/sysdeps/unix/sysv/linux/arc/libc.abilist b/sysdeps/unix/sysv/linux/arc/libc.abilist
index 66620e2f33..cf320c4bce 100644
--- a/sysdeps/unix/sysv/linux/arc/libc.abilist
+++ b/sysdeps/unix/sysv/linux/arc/libc.abilist
@@ -373,8 +373,10 @@  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_mkquery F
 GLIBC_2.32 __res_nclose F
 GLIBC_2.32 __res_ninit F
+GLIBC_2.32 __res_nmkquery F
 GLIBC_2.32 __res_nsend F
 GLIBC_2.32 __res_ownok F
 GLIBC_2.32 __res_randomid F
@@ -2324,6 +2326,8 @@  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_mkquery F
+GLIBC_2.34 res_nmkquery F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
 GLIBC_2.34 res_send F
diff --git a/sysdeps/unix/sysv/linux/arc/libresolv.abilist b/sysdeps/unix/sysv/linux/arc/libresolv.abilist
index a9599afe6d..ee92f2ae58 100644
--- a/sysdeps/unix/sysv/linux/arc/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/arc/libresolv.abilist
@@ -24,9 +24,7 @@  GLIBC_2.32 __putshort F
 GLIBC_2.32 __res_close F
 GLIBC_2.32 __res_hostalias F
 GLIBC_2.32 __res_isourserver F
-GLIBC_2.32 __res_mkquery F
 GLIBC_2.32 __res_nameinquery F
-GLIBC_2.32 __res_nmkquery F
 GLIBC_2.32 __res_nquery F
 GLIBC_2.32 __res_nquerydomain F
 GLIBC_2.32 __res_nsearch F
diff --git a/sysdeps/unix/sysv/linux/arm/be/libc.abilist b/sysdeps/unix/sysv/linux/arm/be/libc.abilist
index 571dc4fcc0..7b395d2683 100644
--- a/sysdeps/unix/sysv/linux/arm/be/libc.abilist
+++ b/sysdeps/unix/sysv/linux/arm/be/libc.abilist
@@ -442,6 +442,8 @@  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_mkquery F
+GLIBC_2.34 res_nmkquery F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
 GLIBC_2.34 res_send F
@@ -843,8 +845,10 @@  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_mkquery F
 GLIBC_2.4 __res_nclose F
 GLIBC_2.4 __res_ninit F
+GLIBC_2.4 __res_nmkquery F
 GLIBC_2.4 __res_nsend F
 GLIBC_2.4 __res_ownok F
 GLIBC_2.4 __res_randomid F
diff --git a/sysdeps/unix/sysv/linux/arm/be/libresolv.abilist b/sysdeps/unix/sysv/linux/arm/be/libresolv.abilist
index 722feb80b6..ee4f6a36e9 100644
--- a/sysdeps/unix/sysv/linux/arm/be/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/arm/be/libresolv.abilist
@@ -25,9 +25,7 @@  GLIBC_2.4 __putshort F
 GLIBC_2.4 __res_close F
 GLIBC_2.4 __res_hostalias F
 GLIBC_2.4 __res_isourserver F
-GLIBC_2.4 __res_mkquery F
 GLIBC_2.4 __res_nameinquery F
-GLIBC_2.4 __res_nmkquery F
 GLIBC_2.4 __res_nquery F
 GLIBC_2.4 __res_nquerydomain F
 GLIBC_2.4 __res_nsearch F
diff --git a/sysdeps/unix/sysv/linux/arm/le/libc.abilist b/sysdeps/unix/sysv/linux/arm/le/libc.abilist
index fdeb5940bb..9a2aefac45 100644
--- a/sysdeps/unix/sysv/linux/arm/le/libc.abilist
+++ b/sysdeps/unix/sysv/linux/arm/le/libc.abilist
@@ -439,6 +439,8 @@  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_mkquery F
+GLIBC_2.34 res_nmkquery F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
 GLIBC_2.34 res_send F
@@ -840,8 +842,10 @@  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_mkquery F
 GLIBC_2.4 __res_nclose F
 GLIBC_2.4 __res_ninit F
+GLIBC_2.4 __res_nmkquery F
 GLIBC_2.4 __res_nsend F
 GLIBC_2.4 __res_ownok F
 GLIBC_2.4 __res_randomid F
diff --git a/sysdeps/unix/sysv/linux/arm/le/libresolv.abilist b/sysdeps/unix/sysv/linux/arm/le/libresolv.abilist
index 722feb80b6..ee4f6a36e9 100644
--- a/sysdeps/unix/sysv/linux/arm/le/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/arm/le/libresolv.abilist
@@ -25,9 +25,7 @@  GLIBC_2.4 __putshort F
 GLIBC_2.4 __res_close F
 GLIBC_2.4 __res_hostalias F
 GLIBC_2.4 __res_isourserver F
-GLIBC_2.4 __res_mkquery F
 GLIBC_2.4 __res_nameinquery F
-GLIBC_2.4 __res_nmkquery F
 GLIBC_2.4 __res_nquery F
 GLIBC_2.4 __res_nquerydomain F
 GLIBC_2.4 __res_nsearch F
diff --git a/sysdeps/unix/sysv/linux/csky/libc.abilist b/sysdeps/unix/sysv/linux/csky/libc.abilist
index 4c0e79592e..eb8efa378b 100644
--- a/sysdeps/unix/sysv/linux/csky/libc.abilist
+++ b/sysdeps/unix/sysv/linux/csky/libc.abilist
@@ -377,8 +377,10 @@  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_mkquery F
 GLIBC_2.29 __res_nclose F
 GLIBC_2.29 __res_ninit F
+GLIBC_2.29 __res_nmkquery F
 GLIBC_2.29 __res_nsend F
 GLIBC_2.29 __res_ownok F
 GLIBC_2.29 __res_randomid F
@@ -2590,6 +2592,8 @@  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_mkquery F
+GLIBC_2.34 res_nmkquery F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
 GLIBC_2.34 res_send F
diff --git a/sysdeps/unix/sysv/linux/csky/libresolv.abilist b/sysdeps/unix/sysv/linux/csky/libresolv.abilist
index d94fe24625..f4ae402b6f 100644
--- a/sysdeps/unix/sysv/linux/csky/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/csky/libresolv.abilist
@@ -24,9 +24,7 @@  GLIBC_2.29 __putshort F
 GLIBC_2.29 __res_close F
 GLIBC_2.29 __res_hostalias F
 GLIBC_2.29 __res_isourserver F
-GLIBC_2.29 __res_mkquery F
 GLIBC_2.29 __res_nameinquery F
-GLIBC_2.29 __res_nmkquery F
 GLIBC_2.29 __res_nquery F
 GLIBC_2.29 __res_nquerydomain F
 GLIBC_2.29 __res_nsearch F
diff --git a/sysdeps/unix/sysv/linux/hppa/libc.abilist b/sysdeps/unix/sysv/linux/hppa/libc.abilist
index 813fb7cdda..4c3d7674ff 100644
--- a/sysdeps/unix/sysv/linux/hppa/libc.abilist
+++ b/sysdeps/unix/sysv/linux/hppa/libc.abilist
@@ -17,6 +17,7 @@  GLIBC_2.0 login_tty F
 GLIBC_2.0 logout F
 GLIBC_2.0 logwtmp F
 GLIBC_2.0 openpty F
+GLIBC_2.0 res_mkquery F
 GLIBC_2.1 aio_cancel F
 GLIBC_2.1 aio_cancel64 F
 GLIBC_2.1 aio_error F
@@ -427,8 +428,10 @@  GLIBC_2.2 __rcmd_errstr D 0x4
 GLIBC_2.2 __read F
 GLIBC_2.2 __realloc_hook D 0x4
 GLIBC_2.2 __res_init F
+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_nsend F
 GLIBC_2.2 __res_randomid F
 GLIBC_2.2 __res_state F
@@ -2537,6 +2540,8 @@  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_mkquery F
+GLIBC_2.34 res_nmkquery F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
 GLIBC_2.34 res_send F
diff --git a/sysdeps/unix/sysv/linux/hppa/libresolv.abilist b/sysdeps/unix/sysv/linux/hppa/libresolv.abilist
index 87c1434919..f2707204ed 100644
--- a/sysdeps/unix/sysv/linux/hppa/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/hppa/libresolv.abilist
@@ -42,15 +42,12 @@  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_mkquery 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_mkquery 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
diff --git a/sysdeps/unix/sysv/linux/i386/libc.abilist b/sysdeps/unix/sysv/linux/i386/libc.abilist
index f09c7af651..9f44807e02 100644
--- a/sysdeps/unix/sysv/linux/i386/libc.abilist
+++ b/sysdeps/unix/sysv/linux/i386/libc.abilist
@@ -981,6 +981,7 @@  GLIBC_2.0 remove F
 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 revoke F
 GLIBC_2.0 rewind F
 GLIBC_2.0 rewinddir F
@@ -1981,8 +1982,10 @@  GLIBC_2.2 __pthread_rwlock_unlock F
 GLIBC_2.2 __pthread_rwlock_wrlock F
 GLIBC_2.2 __pwrite64 F
 GLIBC_2.2 __res_init F
+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_nsend F
 GLIBC_2.2 __res_state F
 GLIBC_2.2 __setmntent F
@@ -2721,6 +2724,8 @@  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_mkquery F
+GLIBC_2.34 res_nmkquery F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
 GLIBC_2.34 res_send F
diff --git a/sysdeps/unix/sysv/linux/i386/libresolv.abilist b/sysdeps/unix/sysv/linux/i386/libresolv.abilist
index 87c1434919..f2707204ed 100644
--- a/sysdeps/unix/sysv/linux/i386/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/i386/libresolv.abilist
@@ -42,15 +42,12 @@  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_mkquery 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_mkquery 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
diff --git a/sysdeps/unix/sysv/linux/ia64/libc.abilist b/sysdeps/unix/sysv/linux/ia64/libc.abilist
index 8fa8b1094e..63a3fa22ef 100644
--- a/sysdeps/unix/sysv/linux/ia64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/ia64/libc.abilist
@@ -17,6 +17,7 @@  GLIBC_2.0 login_tty F
 GLIBC_2.0 logout F
 GLIBC_2.0 logwtmp F
 GLIBC_2.0 openpty F
+GLIBC_2.0 res_mkquery F
 GLIBC_2.1 aio_cancel F
 GLIBC_2.1 aio_cancel64 F
 GLIBC_2.1 aio_error F
@@ -431,8 +432,10 @@  GLIBC_2.2 __rcmd_errstr D 0x8
 GLIBC_2.2 __read F
 GLIBC_2.2 __realloc_hook D 0x8
 GLIBC_2.2 __res_init F
+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_nsend F
 GLIBC_2.2 __res_randomid F
 GLIBC_2.2 __res_state F
@@ -2496,6 +2499,8 @@  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_mkquery F
+GLIBC_2.34 res_nmkquery F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
 GLIBC_2.34 res_send F
diff --git a/sysdeps/unix/sysv/linux/ia64/libresolv.abilist b/sysdeps/unix/sysv/linux/ia64/libresolv.abilist
index 9e3b8f8c31..4f5160f474 100644
--- a/sysdeps/unix/sysv/linux/ia64/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/ia64/libresolv.abilist
@@ -42,15 +42,12 @@  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_mkquery 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_mkquery 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
diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
index dd5d58b386..37bbdde23b 100644
--- a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
@@ -443,6 +443,8 @@  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_mkquery F
+GLIBC_2.34 res_nmkquery F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
 GLIBC_2.34 res_send F
@@ -829,8 +831,10 @@  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_mkquery F
 GLIBC_2.4 __res_nclose F
 GLIBC_2.4 __res_ninit F
+GLIBC_2.4 __res_nmkquery F
 GLIBC_2.4 __res_nsend F
 GLIBC_2.4 __res_ownok F
 GLIBC_2.4 __res_randomid F
diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libresolv.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libresolv.abilist
index 722feb80b6..ee4f6a36e9 100644
--- a/sysdeps/unix/sysv/linux/m68k/coldfire/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libresolv.abilist
@@ -25,9 +25,7 @@  GLIBC_2.4 __putshort F
 GLIBC_2.4 __res_close F
 GLIBC_2.4 __res_hostalias F
 GLIBC_2.4 __res_isourserver F
-GLIBC_2.4 __res_mkquery F
 GLIBC_2.4 __res_nameinquery F
-GLIBC_2.4 __res_nmkquery F
 GLIBC_2.4 __res_nquery F
 GLIBC_2.4 __res_nquerydomain F
 GLIBC_2.4 __res_nsearch F
diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
index 7feb85b86d..bf0eb6e976 100644
--- a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
@@ -980,6 +980,7 @@  GLIBC_2.0 remove F
 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 revoke F
 GLIBC_2.0 rewind F
 GLIBC_2.0 rewinddir F
@@ -1937,8 +1938,10 @@  GLIBC_2.2 __pthread_rwlock_unlock F
 GLIBC_2.2 __pthread_rwlock_wrlock F
 GLIBC_2.2 __pwrite64 F
 GLIBC_2.2 __res_init F
+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_nsend F
 GLIBC_2.2 __res_state F
 GLIBC_2.2 __setmntent F
@@ -2664,6 +2667,8 @@  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_mkquery F
+GLIBC_2.34 res_nmkquery F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
 GLIBC_2.34 res_send F
diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libresolv.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libresolv.abilist
index 87c1434919..f2707204ed 100644
--- a/sysdeps/unix/sysv/linux/m68k/m680x0/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libresolv.abilist
@@ -42,15 +42,12 @@  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_mkquery 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_mkquery 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
diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
index 469153ade3..d5d5771708 100644
--- a/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
@@ -385,8 +385,10 @@  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_mkquery F
 GLIBC_2.18 __res_nclose F
 GLIBC_2.18 __res_ninit F
+GLIBC_2.18 __res_nmkquery F
 GLIBC_2.18 __res_nsend F
 GLIBC_2.18 __res_ownok F
 GLIBC_2.18 __res_randomid F
@@ -2641,6 +2643,8 @@  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_mkquery F
+GLIBC_2.34 res_nmkquery F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
 GLIBC_2.34 res_send F
diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libresolv.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libresolv.abilist
index a3350181fe..9550bc22e1 100644
--- a/sysdeps/unix/sysv/linux/microblaze/be/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/be/libresolv.abilist
@@ -25,9 +25,7 @@  GLIBC_2.18 __putshort F
 GLIBC_2.18 __res_close F
 GLIBC_2.18 __res_hostalias F
 GLIBC_2.18 __res_isourserver F
-GLIBC_2.18 __res_mkquery F
 GLIBC_2.18 __res_nameinquery F
-GLIBC_2.18 __res_nmkquery F
 GLIBC_2.18 __res_nquery F
 GLIBC_2.18 __res_nquerydomain F
 GLIBC_2.18 __res_nsearch F
diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
index 99d43fe009..2f05d61c21 100644
--- a/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
@@ -385,8 +385,10 @@  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_mkquery F
 GLIBC_2.18 __res_nclose F
 GLIBC_2.18 __res_ninit F
+GLIBC_2.18 __res_nmkquery F
 GLIBC_2.18 __res_nsend F
 GLIBC_2.18 __res_ownok F
 GLIBC_2.18 __res_randomid F
@@ -2638,6 +2640,8 @@  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_mkquery F
+GLIBC_2.34 res_nmkquery F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
 GLIBC_2.34 res_send F
diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libresolv.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libresolv.abilist
index a3350181fe..9550bc22e1 100644
--- a/sysdeps/unix/sysv/linux/microblaze/le/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/le/libresolv.abilist
@@ -25,9 +25,7 @@  GLIBC_2.18 __putshort F
 GLIBC_2.18 __res_close F
 GLIBC_2.18 __res_hostalias F
 GLIBC_2.18 __res_isourserver F
-GLIBC_2.18 __res_mkquery F
 GLIBC_2.18 __res_nameinquery F
-GLIBC_2.18 __res_nmkquery F
 GLIBC_2.18 __res_nquery F
 GLIBC_2.18 __res_nquerydomain F
 GLIBC_2.18 __res_nsearch F
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
index 96edb00531..8d62d76ca5 100644
--- a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
@@ -977,6 +977,7 @@  GLIBC_2.0 remove F
 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 revoke F
 GLIBC_2.0 rewind F
 GLIBC_2.0 rewinddir F
@@ -1590,8 +1591,10 @@  GLIBC_2.2 __pthread_rwlock_wrlock F
 GLIBC_2.2 __pwrite64 F
 GLIBC_2.2 __rawmemchr F
 GLIBC_2.2 __res_init F
+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_nsend F
 GLIBC_2.2 __res_state F
 GLIBC_2.2 __setmntent F
@@ -2629,6 +2632,8 @@  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_mkquery F
+GLIBC_2.34 res_nmkquery F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
 GLIBC_2.34 res_send F
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/libresolv.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libresolv.abilist
index 87c1434919..f2707204ed 100644
--- a/sysdeps/unix/sysv/linux/mips/mips32/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips32/libresolv.abilist
@@ -42,15 +42,12 @@  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_mkquery 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_mkquery 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
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
index bfb2cec7f6..68e086d203 100644
--- a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
@@ -977,6 +977,7 @@  GLIBC_2.0 remove F
 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 revoke F
 GLIBC_2.0 rewind F
 GLIBC_2.0 rewinddir F
@@ -1588,8 +1589,10 @@  GLIBC_2.2 __pthread_rwlock_wrlock F
 GLIBC_2.2 __pwrite64 F
 GLIBC_2.2 __rawmemchr F
 GLIBC_2.2 __res_init F
+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_nsend F
 GLIBC_2.2 __res_state F
 GLIBC_2.2 __setmntent F
@@ -2627,6 +2630,8 @@  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_mkquery F
+GLIBC_2.34 res_nmkquery F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
 GLIBC_2.34 res_send F
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
index aad391e36c..14c19658c6 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
@@ -977,6 +977,7 @@  GLIBC_2.0 remove F
 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 revoke F
 GLIBC_2.0 rewind F
 GLIBC_2.0 rewinddir F
@@ -1588,8 +1589,10 @@  GLIBC_2.2 __pthread_rwlock_wrlock F
 GLIBC_2.2 __pwrite64 F
 GLIBC_2.2 __rawmemchr F
 GLIBC_2.2 __res_init F
+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_nsend F
 GLIBC_2.2 __res_state F
 GLIBC_2.2 __setmntent F
@@ -2635,6 +2638,8 @@  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_mkquery F
+GLIBC_2.34 res_nmkquery F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
 GLIBC_2.34 res_send F
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/libresolv.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libresolv.abilist
index 87c1434919..f2707204ed 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/n32/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips64/n32/libresolv.abilist
@@ -42,15 +42,12 @@  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_mkquery 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_mkquery 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
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
index 9bf9d868ce..479115297c 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
@@ -975,6 +975,7 @@  GLIBC_2.0 remove F
 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 revoke F
 GLIBC_2.0 rewind F
 GLIBC_2.0 rewinddir F
@@ -1584,8 +1585,10 @@  GLIBC_2.2 __pthread_rwlock_wrlock F
 GLIBC_2.2 __pwrite64 F
 GLIBC_2.2 __rawmemchr F
 GLIBC_2.2 __res_init F
+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_nsend F
 GLIBC_2.2 __res_state F
 GLIBC_2.2 __setmntent F
@@ -2547,6 +2550,8 @@  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_mkquery F
+GLIBC_2.34 res_nmkquery F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
 GLIBC_2.34 res_send F
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/libresolv.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libresolv.abilist
index 9e3b8f8c31..4f5160f474 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/n64/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/libresolv.abilist
@@ -42,15 +42,12 @@  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_mkquery 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_mkquery 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
diff --git a/sysdeps/unix/sysv/linux/nios2/libc.abilist b/sysdeps/unix/sysv/linux/nios2/libc.abilist
index e6304726fd..b98437e5fc 100644
--- a/sysdeps/unix/sysv/linux/nios2/libc.abilist
+++ b/sysdeps/unix/sysv/linux/nios2/libc.abilist
@@ -422,8 +422,10 @@  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_mkquery F
 GLIBC_2.21 __res_nclose F
 GLIBC_2.21 __res_ninit F
+GLIBC_2.21 __res_nmkquery F
 GLIBC_2.21 __res_nsend F
 GLIBC_2.21 __res_ownok F
 GLIBC_2.21 __res_randomid F
@@ -2680,6 +2682,8 @@  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_mkquery F
+GLIBC_2.34 res_nmkquery F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
 GLIBC_2.34 res_send F
diff --git a/sysdeps/unix/sysv/linux/nios2/libresolv.abilist b/sysdeps/unix/sysv/linux/nios2/libresolv.abilist
index 48cf067b8b..23c5250a0c 100644
--- a/sysdeps/unix/sysv/linux/nios2/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/nios2/libresolv.abilist
@@ -25,9 +25,7 @@  GLIBC_2.21 __putshort F
 GLIBC_2.21 __res_close F
 GLIBC_2.21 __res_hostalias F
 GLIBC_2.21 __res_isourserver F
-GLIBC_2.21 __res_mkquery F
 GLIBC_2.21 __res_nameinquery F
-GLIBC_2.21 __res_nmkquery F
 GLIBC_2.21 __res_nquery F
 GLIBC_2.21 __res_nquerydomain F
 GLIBC_2.21 __res_nsearch F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
index 3ade7dce04..6c311d2a5f 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
@@ -988,6 +988,7 @@  GLIBC_2.0 remove F
 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 revoke F
 GLIBC_2.0 rewind F
 GLIBC_2.0 rewinddir F
@@ -1943,8 +1944,10 @@  GLIBC_2.2 __pthread_rwlock_unlock F
 GLIBC_2.2 __pthread_rwlock_wrlock F
 GLIBC_2.2 __pwrite64 F
 GLIBC_2.2 __res_init F
+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_nsend F
 GLIBC_2.2 __res_state F
 GLIBC_2.2 __setmntent F
@@ -2691,6 +2694,8 @@  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_mkquery F
+GLIBC_2.34 res_nmkquery F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
 GLIBC_2.34 res_send F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libresolv.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libresolv.abilist
index 87c1434919..f2707204ed 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libresolv.abilist
@@ -42,15 +42,12 @@  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_mkquery 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_mkquery 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
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
index 3c68153771..c6d7f1cff4 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
@@ -988,6 +988,7 @@  GLIBC_2.0 remove F
 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 revoke F
 GLIBC_2.0 rewind F
 GLIBC_2.0 rewinddir F
@@ -1947,8 +1948,10 @@  GLIBC_2.2 __pthread_rwlock_unlock F
 GLIBC_2.2 __pthread_rwlock_wrlock F
 GLIBC_2.2 __pwrite64 F
 GLIBC_2.2 __res_init F
+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_nsend F
 GLIBC_2.2 __res_state F
 GLIBC_2.2 __setmntent F
@@ -2724,6 +2727,8 @@  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_mkquery F
+GLIBC_2.34 res_nmkquery F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
 GLIBC_2.34 res_send F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
index 0c8d700ed8..f8e69c7fd3 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
@@ -468,8 +468,10 @@  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_mkquery F
 GLIBC_2.3 __res_nclose F
 GLIBC_2.3 __res_ninit F
+GLIBC_2.3 __res_nmkquery F
 GLIBC_2.3 __res_nsend F
 GLIBC_2.3 __res_ownok F
 GLIBC_2.3 __res_randomid F
@@ -2459,6 +2461,8 @@  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_mkquery F
+GLIBC_2.34 res_nmkquery F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
 GLIBC_2.34 res_send F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libresolv.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libresolv.abilist
index 708f9cd1d8..4d1fb69bc6 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libresolv.abilist
@@ -24,9 +24,7 @@  GLIBC_2.3 __putshort F
 GLIBC_2.3 __res_close F
 GLIBC_2.3 __res_hostalias F
 GLIBC_2.3 __res_isourserver F
-GLIBC_2.3 __res_mkquery F
 GLIBC_2.3 __res_nameinquery F
-GLIBC_2.3 __res_nmkquery F
 GLIBC_2.3 __res_nquery F
 GLIBC_2.3 __res_nquerydomain F
 GLIBC_2.3 __res_nsearch F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
index 37c7b53452..6b0a84c8f6 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
@@ -470,8 +470,10 @@  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_mkquery F
 GLIBC_2.17 __res_nclose F
 GLIBC_2.17 __res_ninit F
+GLIBC_2.17 __res_nmkquery F
 GLIBC_2.17 __res_nsend F
 GLIBC_2.17 __res_ownok F
 GLIBC_2.17 __res_randomid F
@@ -2761,6 +2763,8 @@  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_mkquery F
+GLIBC_2.34 res_nmkquery F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
 GLIBC_2.34 res_send F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libresolv.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libresolv.abilist
index d071a2c5ef..702d13c633 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libresolv.abilist
@@ -25,9 +25,7 @@  GLIBC_2.17 __putshort F
 GLIBC_2.17 __res_close F
 GLIBC_2.17 __res_hostalias F
 GLIBC_2.17 __res_isourserver F
-GLIBC_2.17 __res_mkquery F
 GLIBC_2.17 __res_nameinquery F
-GLIBC_2.17 __res_nmkquery F
 GLIBC_2.17 __res_nquery F
 GLIBC_2.17 __res_nquerydomain F
 GLIBC_2.17 __res_nsearch F
diff --git a/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist b/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
index 2f00ab943c..080d87a80b 100644
--- a/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
@@ -370,8 +370,10 @@  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_mkquery F
 GLIBC_2.33 __res_nclose F
 GLIBC_2.33 __res_ninit F
+GLIBC_2.33 __res_nmkquery F
 GLIBC_2.33 __res_nsend F
 GLIBC_2.33 __res_ownok F
 GLIBC_2.33 __res_randomid F
@@ -2326,6 +2328,8 @@  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_mkquery F
+GLIBC_2.34 res_nmkquery F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
 GLIBC_2.34 res_send F
diff --git a/sysdeps/unix/sysv/linux/riscv/rv32/libresolv.abilist b/sysdeps/unix/sysv/linux/riscv/rv32/libresolv.abilist
index bd9a317d8d..50daff9908 100644
--- a/sysdeps/unix/sysv/linux/riscv/rv32/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/riscv/rv32/libresolv.abilist
@@ -24,9 +24,7 @@  GLIBC_2.33 __putshort F
 GLIBC_2.33 __res_close F
 GLIBC_2.33 __res_hostalias F
 GLIBC_2.33 __res_isourserver F
-GLIBC_2.33 __res_mkquery F
 GLIBC_2.33 __res_nameinquery F
-GLIBC_2.33 __res_nmkquery F
 GLIBC_2.33 __res_nquery F
 GLIBC_2.33 __res_nquerydomain F
 GLIBC_2.33 __res_nsearch F
diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
index 02e82a02c3..53b33d1504 100644
--- a/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
@@ -381,8 +381,10 @@  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_mkquery F
 GLIBC_2.27 __res_nclose F
 GLIBC_2.27 __res_ninit F
+GLIBC_2.27 __res_nmkquery F
 GLIBC_2.27 __res_nsend F
 GLIBC_2.27 __res_ownok F
 GLIBC_2.27 __res_randomid F
@@ -2526,6 +2528,8 @@  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_mkquery F
+GLIBC_2.34 res_nmkquery F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
 GLIBC_2.34 res_send F
diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libresolv.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libresolv.abilist
index e40b11fe0f..050ca355e2 100644
--- a/sysdeps/unix/sysv/linux/riscv/rv64/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/riscv/rv64/libresolv.abilist
@@ -24,9 +24,7 @@  GLIBC_2.27 __putshort F
 GLIBC_2.27 __res_close F
 GLIBC_2.27 __res_hostalias F
 GLIBC_2.27 __res_isourserver F
-GLIBC_2.27 __res_mkquery F
 GLIBC_2.27 __res_nameinquery F
-GLIBC_2.27 __res_nmkquery F
 GLIBC_2.27 __res_nquery F
 GLIBC_2.27 __res_nquerydomain F
 GLIBC_2.27 __res_nsearch F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
index dcb20fbe4f..d1d59f0021 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
@@ -979,6 +979,7 @@  GLIBC_2.0 remove F
 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 revoke F
 GLIBC_2.0 rewind F
 GLIBC_2.0 rewinddir F
@@ -1941,8 +1942,10 @@  GLIBC_2.2 __pthread_rwlock_unlock F
 GLIBC_2.2 __pthread_rwlock_wrlock F
 GLIBC_2.2 __pwrite64 F
 GLIBC_2.2 __res_init F
+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_nsend F
 GLIBC_2.2 __res_state F
 GLIBC_2.2 __setmntent F
@@ -2689,6 +2692,8 @@  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_mkquery F
+GLIBC_2.34 res_nmkquery F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
 GLIBC_2.34 res_send F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libresolv.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libresolv.abilist
index 87c1434919..f2707204ed 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/libresolv.abilist
@@ -42,15 +42,12 @@  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_mkquery 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_mkquery 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
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
index 2c12049d08..ca3e7ebc6d 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
@@ -412,8 +412,10 @@  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_mkquery F
 GLIBC_2.2 __res_nclose F
 GLIBC_2.2 __res_ninit F
+GLIBC_2.2 __res_nmkquery F
 GLIBC_2.2 __res_nsend F
 GLIBC_2.2 __res_ownok F
 GLIBC_2.2 __res_randomid F
@@ -2496,6 +2498,8 @@  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_mkquery F
+GLIBC_2.34 res_nmkquery F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
 GLIBC_2.34 res_send F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libresolv.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libresolv.abilist
index f1c523177b..3b8ffd2766 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/libresolv.abilist
@@ -24,9 +24,7 @@  GLIBC_2.2 __putshort F
 GLIBC_2.2 __res_close F
 GLIBC_2.2 __res_hostalias F
 GLIBC_2.2 __res_isourserver F
-GLIBC_2.2 __res_mkquery F
 GLIBC_2.2 __res_nameinquery 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
diff --git a/sysdeps/unix/sysv/linux/sh/be/libc.abilist b/sysdeps/unix/sysv/linux/sh/be/libc.abilist
index b11d407e33..fcde356a18 100644
--- a/sysdeps/unix/sysv/linux/sh/be/libc.abilist
+++ b/sysdeps/unix/sysv/linux/sh/be/libc.abilist
@@ -21,6 +21,7 @@  GLIBC_2.0 login_tty F
 GLIBC_2.0 logout F
 GLIBC_2.0 logwtmp F
 GLIBC_2.0 openpty F
+GLIBC_2.0 res_mkquery F
 GLIBC_2.1 aio_cancel F
 GLIBC_2.1 aio_cancel64 F
 GLIBC_2.1 aio_error F
@@ -431,8 +432,10 @@  GLIBC_2.2 __read F
 GLIBC_2.2 __realloc_hook D 0x4
 GLIBC_2.2 __register_frame_info F
 GLIBC_2.2 __res_init F
+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_nsend F
 GLIBC_2.2 __res_randomid F
 GLIBC_2.2 __res_state F
@@ -2544,6 +2547,8 @@  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_mkquery F
+GLIBC_2.34 res_nmkquery F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
 GLIBC_2.34 res_send F
diff --git a/sysdeps/unix/sysv/linux/sh/be/libresolv.abilist b/sysdeps/unix/sysv/linux/sh/be/libresolv.abilist
index 87c1434919..f2707204ed 100644
--- a/sysdeps/unix/sysv/linux/sh/be/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/sh/be/libresolv.abilist
@@ -42,15 +42,12 @@  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_mkquery 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_mkquery 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
diff --git a/sysdeps/unix/sysv/linux/sh/le/libc.abilist b/sysdeps/unix/sysv/linux/sh/le/libc.abilist
index 5dc2d54de1..18dffb1d62 100644
--- a/sysdeps/unix/sysv/linux/sh/le/libc.abilist
+++ b/sysdeps/unix/sysv/linux/sh/le/libc.abilist
@@ -21,6 +21,7 @@  GLIBC_2.0 login_tty F
 GLIBC_2.0 logout F
 GLIBC_2.0 logwtmp F
 GLIBC_2.0 openpty F
+GLIBC_2.0 res_mkquery F
 GLIBC_2.1 aio_cancel F
 GLIBC_2.1 aio_cancel64 F
 GLIBC_2.1 aio_error F
@@ -431,8 +432,10 @@  GLIBC_2.2 __read F
 GLIBC_2.2 __realloc_hook D 0x4
 GLIBC_2.2 __register_frame_info F
 GLIBC_2.2 __res_init F
+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_nsend F
 GLIBC_2.2 __res_randomid F
 GLIBC_2.2 __res_state F
@@ -2541,6 +2544,8 @@  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_mkquery F
+GLIBC_2.34 res_nmkquery F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
 GLIBC_2.34 res_send F
diff --git a/sysdeps/unix/sysv/linux/sh/le/libresolv.abilist b/sysdeps/unix/sysv/linux/sh/le/libresolv.abilist
index 87c1434919..f2707204ed 100644
--- a/sysdeps/unix/sysv/linux/sh/le/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/sh/le/libresolv.abilist
@@ -42,15 +42,12 @@  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_mkquery 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_mkquery 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
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
index 96a26a42b9..61fd09d562 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
@@ -982,6 +982,7 @@  GLIBC_2.0 remove F
 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 revoke F
 GLIBC_2.0 rewind F
 GLIBC_2.0 rewinddir F
@@ -1939,8 +1940,10 @@  GLIBC_2.2 __pthread_rwlock_unlock F
 GLIBC_2.2 __pthread_rwlock_wrlock F
 GLIBC_2.2 __pwrite64 F
 GLIBC_2.2 __res_init F
+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_nsend F
 GLIBC_2.2 __res_state F
 GLIBC_2.2 __setmntent F
@@ -2684,6 +2687,8 @@  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_mkquery F
+GLIBC_2.34 res_nmkquery F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
 GLIBC_2.34 res_send F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libresolv.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libresolv.abilist
index 87c1434919..f2707204ed 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libresolv.abilist
@@ -42,15 +42,12 @@  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_mkquery 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_mkquery 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
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
index ed5c95f089..fa300e44d6 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
@@ -21,6 +21,7 @@  GLIBC_2.0 login_tty F
 GLIBC_2.0 logout F
 GLIBC_2.0 logwtmp F
 GLIBC_2.0 openpty F
+GLIBC_2.0 res_mkquery F
 GLIBC_2.1 aio_cancel F
 GLIBC_2.1 aio_cancel64 F
 GLIBC_2.1 aio_error F
@@ -472,8 +473,10 @@  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_init F
+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_nsend F
 GLIBC_2.2 __res_randomid F
 GLIBC_2.2 __res_state F
@@ -2519,6 +2522,8 @@  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_mkquery F
+GLIBC_2.34 res_nmkquery F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
 GLIBC_2.34 res_send F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libresolv.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libresolv.abilist
index 9e3b8f8c31..4f5160f474 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libresolv.abilist
@@ -42,15 +42,12 @@  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_mkquery 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_mkquery 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
diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
index 8d1eff33d9..3160273a6f 100644
--- a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
@@ -396,8 +396,10 @@  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_mkquery F
 GLIBC_2.2.5 __res_nclose F
 GLIBC_2.2.5 __res_ninit F
+GLIBC_2.2.5 __res_nmkquery F
 GLIBC_2.2.5 __res_nsend F
 GLIBC_2.2.5 __res_ownok F
 GLIBC_2.2.5 __res_randomid F
@@ -2474,6 +2476,8 @@  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_mkquery F
+GLIBC_2.34 res_nmkquery F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
 GLIBC_2.34 res_send F
diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libresolv.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libresolv.abilist
index dd49cbe641..e2a6207778 100644
--- a/sysdeps/unix/sysv/linux/x86_64/64/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/64/libresolv.abilist
@@ -24,9 +24,7 @@  GLIBC_2.2.5 __putshort F
 GLIBC_2.2.5 __res_close F
 GLIBC_2.2.5 __res_hostalias F
 GLIBC_2.2.5 __res_isourserver F
-GLIBC_2.2.5 __res_mkquery F
 GLIBC_2.2.5 __res_nameinquery F
-GLIBC_2.2.5 __res_nmkquery F
 GLIBC_2.2.5 __res_nquery F
 GLIBC_2.2.5 __res_nquerydomain F
 GLIBC_2.2.5 __res_nsearch F
diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
index d6855e3690..886414793c 100644
--- a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
@@ -385,8 +385,10 @@  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_mkquery F
 GLIBC_2.16 __res_nclose F
 GLIBC_2.16 __res_ninit F
+GLIBC_2.16 __res_nmkquery F
 GLIBC_2.16 __res_nsend F
 GLIBC_2.16 __res_ownok F
 GLIBC_2.16 __res_randomid F
@@ -2580,6 +2582,8 @@  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_mkquery F
+GLIBC_2.34 res_nmkquery F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
 GLIBC_2.34 res_send F
diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libresolv.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libresolv.abilist
index 298baa250e..b7564c49cc 100644
--- a/sysdeps/unix/sysv/linux/x86_64/x32/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/x32/libresolv.abilist
@@ -25,9 +25,7 @@  GLIBC_2.16 __putshort F
 GLIBC_2.16 __res_close F
 GLIBC_2.16 __res_hostalias F
 GLIBC_2.16 __res_isourserver F
-GLIBC_2.16 __res_mkquery F
 GLIBC_2.16 __res_nameinquery F
-GLIBC_2.16 __res_nmkquery F
 GLIBC_2.16 __res_nquery F
 GLIBC_2.16 __res_nquerydomain F
 GLIBC_2.16 __res_nsearch F