[28/30] resolv: Move res_query functions into libc

Message ID 6e7ea8d228e0a7dd7c1da9eb1971146d3f09ffcd.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:07 p.m. UTC
  This switches to public symbols without __ prefixes, due to improved
namespace management in glibc.

The script was used with --no-new-version to move the symbols
__res_nquery, __res_nquerydomain, __res_nsearch, __res_query,
__res_querydomain, __res_search, res_query, res_querydomain,
res_search.  The public symbols res_nquery, res_nquerydomain,
res_nsearch, res_ownok, res_query, res_querydomain, res_search
were added with make update-all-abi.
---
 resolv/Makefile                               |  2 +-
 resolv/Versions                               | 28 +++---
 resolv/res_query.c                            | 88 ++++++++++++-------
 resolv/resolv-internal.h                      |  4 +-
 resolv/resolv.h                               |  6 --
 sysdeps/mach/hurd/i386/libc.abilist           | 12 +++
 sysdeps/mach/hurd/i386/libresolv.abilist      |  6 --
 sysdeps/unix/sysv/linux/aarch64/libc.abilist  | 12 +++
 .../unix/sysv/linux/aarch64/libresolv.abilist |  6 --
 sysdeps/unix/sysv/linux/alpha/libc.abilist    | 15 ++++
 .../unix/sysv/linux/alpha/libresolv.abilist   |  9 --
 sysdeps/unix/sysv/linux/arc/libc.abilist      | 12 +++
 sysdeps/unix/sysv/linux/arc/libresolv.abilist |  6 --
 sysdeps/unix/sysv/linux/arm/be/libc.abilist   | 12 +++
 .../unix/sysv/linux/arm/be/libresolv.abilist  |  6 --
 sysdeps/unix/sysv/linux/arm/le/libc.abilist   | 12 +++
 .../unix/sysv/linux/arm/le/libresolv.abilist  |  6 --
 sysdeps/unix/sysv/linux/csky/libc.abilist     | 12 +++
 .../unix/sysv/linux/csky/libresolv.abilist    |  6 --
 sysdeps/unix/sysv/linux/hppa/libc.abilist     | 15 ++++
 .../unix/sysv/linux/hppa/libresolv.abilist    |  9 --
 sysdeps/unix/sysv/linux/i386/libc.abilist     | 15 ++++
 .../unix/sysv/linux/i386/libresolv.abilist    |  9 --
 sysdeps/unix/sysv/linux/ia64/libc.abilist     | 15 ++++
 .../unix/sysv/linux/ia64/libresolv.abilist    |  9 --
 .../sysv/linux/m68k/coldfire/libc.abilist     | 12 +++
 .../linux/m68k/coldfire/libresolv.abilist     |  6 --
 .../unix/sysv/linux/m68k/m680x0/libc.abilist  | 15 ++++
 .../sysv/linux/m68k/m680x0/libresolv.abilist  |  9 --
 .../sysv/linux/microblaze/be/libc.abilist     | 12 +++
 .../linux/microblaze/be/libresolv.abilist     |  6 --
 .../sysv/linux/microblaze/le/libc.abilist     | 12 +++
 .../linux/microblaze/le/libresolv.abilist     |  6 --
 .../sysv/linux/mips/mips32/fpu/libc.abilist   | 15 ++++
 .../sysv/linux/mips/mips32/libresolv.abilist  |  9 --
 .../sysv/linux/mips/mips32/nofpu/libc.abilist | 15 ++++
 .../sysv/linux/mips/mips64/n32/libc.abilist   | 15 ++++
 .../linux/mips/mips64/n32/libresolv.abilist   |  9 --
 .../sysv/linux/mips/mips64/n64/libc.abilist   | 15 ++++
 .../linux/mips/mips64/n64/libresolv.abilist   |  9 --
 sysdeps/unix/sysv/linux/nios2/libc.abilist    | 12 +++
 .../unix/sysv/linux/nios2/libresolv.abilist   |  6 --
 .../linux/powerpc/powerpc32/fpu/libc.abilist  | 15 ++++
 .../linux/powerpc/powerpc32/libresolv.abilist |  9 --
 .../powerpc/powerpc32/nofpu/libc.abilist      | 15 ++++
 .../linux/powerpc/powerpc64/be/libc.abilist   | 12 +++
 .../powerpc/powerpc64/be/libresolv.abilist    |  6 --
 .../linux/powerpc/powerpc64/le/libc.abilist   | 12 +++
 .../powerpc/powerpc64/le/libresolv.abilist    |  6 --
 .../unix/sysv/linux/riscv/rv32/libc.abilist   | 12 +++
 .../sysv/linux/riscv/rv32/libresolv.abilist   |  6 --
 .../unix/sysv/linux/riscv/rv64/libc.abilist   | 12 +++
 .../sysv/linux/riscv/rv64/libresolv.abilist   |  6 --
 .../unix/sysv/linux/s390/s390-32/libc.abilist | 15 ++++
 .../sysv/linux/s390/s390-32/libresolv.abilist |  9 --
 .../unix/sysv/linux/s390/s390-64/libc.abilist | 12 +++
 .../sysv/linux/s390/s390-64/libresolv.abilist |  6 --
 sysdeps/unix/sysv/linux/sh/be/libc.abilist    | 15 ++++
 .../unix/sysv/linux/sh/be/libresolv.abilist   |  9 --
 sysdeps/unix/sysv/linux/sh/le/libc.abilist    | 15 ++++
 .../unix/sysv/linux/sh/le/libresolv.abilist   |  9 --
 .../sysv/linux/sparc/sparc32/libc.abilist     | 15 ++++
 .../linux/sparc/sparc32/libresolv.abilist     |  9 --
 .../sysv/linux/sparc/sparc64/libc.abilist     | 15 ++++
 .../linux/sparc/sparc64/libresolv.abilist     |  9 --
 .../unix/sysv/linux/x86_64/64/libc.abilist    | 12 +++
 .../sysv/linux/x86_64/64/libresolv.abilist    |  6 --
 .../unix/sysv/linux/x86_64/x32/libc.abilist   | 12 +++
 .../sysv/linux/x86_64/x32/libresolv.abilist   |  6 --
 69 files changed, 520 insertions(+), 280 deletions(-)
  

Comments

Carlos O'Donell July 15, 2021, 5:02 a.m. UTC | #1
On 7/8/21 11:07 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 script was used with --no-new-version to move the symbols
> __res_nquery, __res_nquerydomain, __res_nsearch, __res_query,
> __res_querydomain, __res_search, res_query, res_querydomain,
> res_search.  The public symbols res_nquery, res_nquerydomain,
> res_nsearch, res_ownok, res_query, res_querydomain, res_search
> were added with make update-all-abi.
> ---
>  resolv/Makefile                               |  2 +-
>  resolv/Versions                               | 28 +++---
>  resolv/res_query.c                            | 88 ++++++++++++-------
>  resolv/resolv-internal.h                      |  4 +-
>  resolv/resolv.h                               |  6 --
>  sysdeps/mach/hurd/i386/libc.abilist           | 12 +++
>  sysdeps/mach/hurd/i386/libresolv.abilist      |  6 --
>  sysdeps/unix/sysv/linux/aarch64/libc.abilist  | 12 +++
>  .../unix/sysv/linux/aarch64/libresolv.abilist |  6 --
>  sysdeps/unix/sysv/linux/alpha/libc.abilist    | 15 ++++
>  .../unix/sysv/linux/alpha/libresolv.abilist   |  9 --
>  sysdeps/unix/sysv/linux/arc/libc.abilist      | 12 +++
>  sysdeps/unix/sysv/linux/arc/libresolv.abilist |  6 --
>  sysdeps/unix/sysv/linux/arm/be/libc.abilist   | 12 +++
>  .../unix/sysv/linux/arm/be/libresolv.abilist  |  6 --
>  sysdeps/unix/sysv/linux/arm/le/libc.abilist   | 12 +++
>  .../unix/sysv/linux/arm/le/libresolv.abilist  |  6 --
>  sysdeps/unix/sysv/linux/csky/libc.abilist     | 12 +++
>  .../unix/sysv/linux/csky/libresolv.abilist    |  6 --
>  sysdeps/unix/sysv/linux/hppa/libc.abilist     | 15 ++++
>  .../unix/sysv/linux/hppa/libresolv.abilist    |  9 --
>  sysdeps/unix/sysv/linux/i386/libc.abilist     | 15 ++++
>  .../unix/sysv/linux/i386/libresolv.abilist    |  9 --
>  sysdeps/unix/sysv/linux/ia64/libc.abilist     | 15 ++++
>  .../unix/sysv/linux/ia64/libresolv.abilist    |  9 --
>  .../sysv/linux/m68k/coldfire/libc.abilist     | 12 +++
>  .../linux/m68k/coldfire/libresolv.abilist     |  6 --
>  .../unix/sysv/linux/m68k/m680x0/libc.abilist  | 15 ++++
>  .../sysv/linux/m68k/m680x0/libresolv.abilist  |  9 --
>  .../sysv/linux/microblaze/be/libc.abilist     | 12 +++
>  .../linux/microblaze/be/libresolv.abilist     |  6 --
>  .../sysv/linux/microblaze/le/libc.abilist     | 12 +++
>  .../linux/microblaze/le/libresolv.abilist     |  6 --
>  .../sysv/linux/mips/mips32/fpu/libc.abilist   | 15 ++++
>  .../sysv/linux/mips/mips32/libresolv.abilist  |  9 --
>  .../sysv/linux/mips/mips32/nofpu/libc.abilist | 15 ++++
>  .../sysv/linux/mips/mips64/n32/libc.abilist   | 15 ++++
>  .../linux/mips/mips64/n32/libresolv.abilist   |  9 --
>  .../sysv/linux/mips/mips64/n64/libc.abilist   | 15 ++++
>  .../linux/mips/mips64/n64/libresolv.abilist   |  9 --
>  sysdeps/unix/sysv/linux/nios2/libc.abilist    | 12 +++
>  .../unix/sysv/linux/nios2/libresolv.abilist   |  6 --
>  .../linux/powerpc/powerpc32/fpu/libc.abilist  | 15 ++++
>  .../linux/powerpc/powerpc32/libresolv.abilist |  9 --
>  .../powerpc/powerpc32/nofpu/libc.abilist      | 15 ++++
>  .../linux/powerpc/powerpc64/be/libc.abilist   | 12 +++
>  .../powerpc/powerpc64/be/libresolv.abilist    |  6 --
>  .../linux/powerpc/powerpc64/le/libc.abilist   | 12 +++
>  .../powerpc/powerpc64/le/libresolv.abilist    |  6 --
>  .../unix/sysv/linux/riscv/rv32/libc.abilist   | 12 +++
>  .../sysv/linux/riscv/rv32/libresolv.abilist   |  6 --
>  .../unix/sysv/linux/riscv/rv64/libc.abilist   | 12 +++
>  .../sysv/linux/riscv/rv64/libresolv.abilist   |  6 --
>  .../unix/sysv/linux/s390/s390-32/libc.abilist | 15 ++++
>  .../sysv/linux/s390/s390-32/libresolv.abilist |  9 --
>  .../unix/sysv/linux/s390/s390-64/libc.abilist | 12 +++
>  .../sysv/linux/s390/s390-64/libresolv.abilist |  6 --
>  sysdeps/unix/sysv/linux/sh/be/libc.abilist    | 15 ++++
>  .../unix/sysv/linux/sh/be/libresolv.abilist   |  9 --
>  sysdeps/unix/sysv/linux/sh/le/libc.abilist    | 15 ++++
>  .../unix/sysv/linux/sh/le/libresolv.abilist   |  9 --
>  .../sysv/linux/sparc/sparc32/libc.abilist     | 15 ++++
>  .../linux/sparc/sparc32/libresolv.abilist     |  9 --
>  .../sysv/linux/sparc/sparc64/libc.abilist     | 15 ++++
>  .../linux/sparc/sparc64/libresolv.abilist     |  9 --
>  .../unix/sysv/linux/x86_64/64/libc.abilist    | 12 +++
>  .../sysv/linux/x86_64/64/libresolv.abilist    |  6 --
>  .../unix/sysv/linux/x86_64/x32/libc.abilist   | 12 +++
>  .../sysv/linux/x86_64/x32/libresolv.abilist   |  6 --
>  69 files changed, 520 insertions(+), 280 deletions(-)
> 
> diff --git a/resolv/Makefile b/resolv/Makefile
> index 31658202d3..4ba58dfa96 100644
> --- a/resolv/Makefile
> +++ b/resolv/Makefile
> @@ -57,6 +57,7 @@ routines := \
>    res_mkquery \
>    res_nameinquery \
>    res_queriesmatch \
> +  res_query \

OK.

>    res_randomid \
>    res_send \
>    resolv_conf \
> @@ -156,7 +157,6 @@ libresolv-routines := \
>    res_debug \
>    res_hostalias \
>    res_isourserver \
> -  res_query \

OK.

>    resolv-deprecated \
>    # libresolv-routines
>  
> diff --git a/resolv/Versions b/resolv/Versions
> index fcaf9fada7..f8b7700a1e 100644
> --- a/resolv/Versions
> +++ b/resolv/Versions
> @@ -18,6 +18,9 @@ libc {
>      hstrerror;
>      res_init;
>      res_mkquery;
> +    res_query;
> +    res_querydomain;
> +    res_search;

OK.

>    }
>    GLIBC_2.2 {
>      __dn_expand;
> @@ -26,7 +29,13 @@ libc {
>      __res_nclose;
>      __res_ninit;
>      __res_nmkquery;
> +    __res_nquery;
> +    __res_nquerydomain;
> +    __res_nsearch;

OK.

>      __res_nsend;
> +    __res_query;
> +    __res_querydomain;
> +    __res_search;

OK.

>      __res_state;
>      _res_hconf;
>    }
> @@ -69,8 +78,14 @@ libc {
>      res_mailok;
>      res_mkquery;
>      res_nmkquery;
> +    res_nquery;
> +    res_nquerydomain;
> +    res_nsearch;

OK.

>      res_nsend;
>      res_ownok;
> +    res_query;
> +    res_querydomain;
> +    res_search;

OK.

>      res_send;
>    }
>    GLIBC_PRIVATE {
> @@ -97,6 +112,8 @@ libc {
>      __ns_name_unpack;
>      __res_context_hostalias;
>      __res_context_mkquery;
> +    __res_context_query;
> +    __res_context_search;

OK.

>      __res_context_send;
>      __res_context_send;

Note: Duplicate here from previous patch.

>      __res_get_nsaddr;
> @@ -158,20 +175,11 @@ libresolv {
>      res_gethostbyaddr;
>      res_gethostbyname2;
>      res_gethostbyname;
> -    res_query;
> -    res_querydomain;
> -    res_search;

OK.

>      res_send_setqhook;
>      res_send_setrhook;
>    }
>    GLIBC_2.2 {
>      __res_hostalias;
> -    __res_nquery;
> -    __res_nquerydomain;
> -    __res_nsearch;
> -    __res_query;
> -    __res_querydomain;
> -    __res_search;

OK.

>    }
>    GLIBC_2.3.2 {
>      __p_rcode;
> @@ -202,8 +210,6 @@ libresolv {
>    GLIBC_PRIVATE {
>      __ns_get16;
>      __ns_get32;
> -    __res_context_query;
> -    __res_context_search;

OK.

>    }
>  }
>  
> diff --git a/resolv/res_query.c b/resolv/res_query.c
> index 2457193d31..75b0e5f2f7 100644
> --- a/resolv/res_query.c
> +++ b/resolv/res_query.c
> @@ -276,7 +276,7 @@ __res_context_query (struct resolv_context *ctx, const char *name,
>   success:
>  	return (n);
>  }
> -libresolv_hidden_def (__res_context_query)
> +libc_hidden_def (__res_context_query)

OK. 1/2

>  
>  /* Common part of res_nquery and res_query.  */
>  static int
> @@ -296,23 +296,34 @@ context_query_common (struct resolv_context *ctx,
>  }
>  
>  int
> -res_nquery(res_state statp,
> -	   const char *name,	/* domain name */
> -	   int class, int type,	/* class and type of query */
> -	   u_char *answer,	/* buffer to put answer */
> -	   int anslen)		/* size of answer buffer */
> +___res_nquery (res_state statp,
> +	       const char *name,      /* Domain name.  */
> +	       int class, int type,   /* Class and type of query.  */
> +	       unsigned char *answer, /* Buffer to put answer.  */
> +	       int anslen)	      /* Size of answer buffer.  */

OK.

>  {
>    return context_query_common
>      (__resolv_context_get_override (statp), name, class, type, answer, anslen);
>  }
> +versioned_symbol (libc, ___res_nquery, res_nquery, GLIBC_2_34);
> +#if OTHER_SHLIB_COMPAT (libresolv, GLIBC_2_2, GLIBC_2_34)
> +compat_symbol (libresolv, ___res_nquery, __res_nquery, GLIBC_2_2);
> +#endif

OK.

>  
>  int
> -res_query (const char *name, int class, int type,
> -	   unsigned char *answer, int anslen)
> +___res_query (const char *name, int class, int type,
> +	      unsigned char *answer, int anslen)

OK.

>  {
>    return context_query_common
>      (__resolv_context_get (), name, class, type, answer, anslen);
>  }
> +versioned_symbol (libc, ___res_query, res_query, GLIBC_2_34);
> +#if OTHER_SHLIB_COMPAT (libresolv, GLIBC_2_0, GLIBC_2_2)
> +compat_symbol (libresolv, ___res_query, res_query, GLIBC_2_0);
> +#endif
> +#if OTHER_SHLIB_COMPAT (libresolv, GLIBC_2_2, GLIBC_2_34)
> +compat_symbol (libresolv, ___res_query, __res_query, GLIBC_2_2);
> +#endif

OK.

>  
>  /* Formulate a normal query, send, and retrieve answer in supplied
>     buffer.  Return the size of the response on success, -1 on error.
> @@ -515,7 +526,7 @@ __res_context_search (struct resolv_context *ctx,
>  		RES_SET_H_ERRNO(statp, TRY_AGAIN);
>  	return (-1);
>  }
> -libresolv_hidden_def (__res_context_search)
> +libc_hidden_def (__res_context_search)

OK. 2/2

>  
>  /* Common part of res_nsearch and res_search.  */
>  static int
> @@ -535,23 +546,34 @@ context_search_common (struct resolv_context *ctx,
>  }
>  
>  int
> -res_nsearch(res_state statp,
> -	    const char *name,	/* domain name */
> -	    int class, int type,	/* class and type of query */
> -	    u_char *answer,	/* buffer to put answer */
> -	    int anslen)		/* size of answer */
> +___res_nsearch (res_state statp,
> +		const char *name,      /* Domain name.  */
> +		int class, int type,   /* Class and type of query.  */
> +		unsigned char *answer, /* Buffer to put answer.  */
> +		int anslen)	       /* Size of answer.  */

OK.

>  {
>    return context_search_common
>      (__resolv_context_get_override (statp), name, class, type, answer, anslen);
>  }
> +versioned_symbol (libc, ___res_nsearch, res_nsearch, GLIBC_2_34);
> +#if OTHER_SHLIB_COMPAT (libresolv, GLIBC_2_2, GLIBC_2_34)
> +compat_symbol (libresolv, ___res_nsearch, __res_nsearch, GLIBC_2_2);
> +#endif

OK.

>  
>  int
> -res_search (const char *name, int class, int type,
> -	    unsigned char *answer, int anslen)
> +___res_search (const char *name, int class, int type,
> +	       unsigned char *answer, int anslen)

OK.

>  {
>    return context_search_common
>      (__resolv_context_get (), name, class, type, answer, anslen);
>  }

OK.

> +versioned_symbol (libc, ___res_search, res_search, GLIBC_2_34);
> +#if OTHER_SHLIB_COMPAT (libresolv, GLIBC_2_0, GLIBC_2_2)
> +compat_symbol (libresolv, ___res_search, res_search, GLIBC_2_0);
> +#endif
> +#if OTHER_SHLIB_COMPAT (libresolv, GLIBC_2_2, GLIBC_2_34)
> +compat_symbol (libresolv, ___res_search, __res_search, GLIBC_2_2);
> +#endif

OK.

>  
>  /*  Perform a call on res_query on the concatenation of name and
>      domain.  */
> @@ -615,31 +637,33 @@ context_querydomain_common (struct resolv_context *ctx,
>  }
>  
>  int
> -res_nquerydomain(res_state statp,
> -	    const char *name,
> -	    const char *domain,
> -	    int class, int type,	/* class and type of query */
> -	    u_char *answer,		/* buffer to put answer */
> -	    int anslen)		/* size of answer */
> +___res_nquerydomain (res_state statp,
> +		     const char *name,
> +		     const char *domain,
> +		     int class, int type, /* Class and type of query.  */
> +		     unsigned char *answer, /* Buffer to put answer.  */
> +		     int anslen)	    /* Size of answer.  */

OK.

>  {
>    return context_querydomain_common
>      (__resolv_context_get_override (statp),
>       name, domain, class, type, answer, anslen);
>  }
> +versioned_symbol (libc, ___res_nquerydomain, res_nquerydomain, GLIBC_2_34);
> +#if OTHER_SHLIB_COMPAT (libresolv, GLIBC_2_2, GLIBC_2_34)
> +compat_symbol (libresolv, ___res_nquerydomain, __res_nquerydomain, GLIBC_2_2);
> +#endif

OK.

>  
>  int
> -res_querydomain (const char *name, const char *domain, int class, int type,
> -		 unsigned char *answer, int anslen)
> +___res_querydomain (const char *name, const char *domain, int class, int type,
> +		    unsigned char *answer, int anslen)

OK.

>  {
>    return context_querydomain_common
>      (__resolv_context_get (), name, domain, class, type, answer, anslen);
>  }
> -
> -#if SHLIB_COMPAT (libresolv, GLIBC_2_0, GLIBC_2_2)
> -# undef res_query
> -# undef res_querydomain
> -# undef res_search
> -weak_alias (__res_query, res_query);
> -weak_alias (__res_querydomain, res_querydomain);
> -weak_alias (__res_search, res_search);
> +versioned_symbol (libc, ___res_querydomain, res_querydomain, GLIBC_2_34);
> +#if OTHER_SHLIB_COMPAT (libresolv, GLIBC_2_0, GLIBC_2_2)
> +compat_symbol (libresolv, ___res_querydomain, res_querydomain, GLIBC_2_0);
> +#endif
> +#if OTHER_SHLIB_COMPAT (libresolv, GLIBC_2_2, GLIBC_2_34)
> +compat_symbol (libresolv, ___res_querydomain, __res_querydomain, GLIBC_2_2);

OK. Good cleanup.

>  #endif
> diff --git a/resolv/resolv-internal.h b/resolv/resolv-internal.h
> index 3cf8a77698..216e47ed42 100644
> --- a/resolv/resolv-internal.h
> +++ b/resolv/resolv-internal.h
> @@ -62,13 +62,13 @@ libc_hidden_proto (__res_context_mkquery)
>  int __res_context_search (struct resolv_context *, const char *, int, int,
>                            unsigned char *, int, unsigned char **,
>                            unsigned char **, int *, int *, int *);
> -libresolv_hidden_proto (__res_context_search)
> +libc_hidden_proto (__res_context_search)

OK 1/2

>  
>  /* Main resolver query function for use within glibc.  */
>  int __res_context_query (struct resolv_context *, const char *, int, int,
>                           unsigned char *, int, unsigned char **,
>                           unsigned char **, int *, int *, int *);
> -libresolv_hidden_proto (__res_context_query)
> +libc_hidden_proto (__res_context_query)

OK. 2/2

>  
>  /* Internal function used to implement the query and search
>     functions.  */
> diff --git a/resolv/resolv.h b/resolv/resolv.h
> index e50b8d08d7..f2a8641e82 100644
> --- a/resolv/resolv.h
> +++ b/resolv/resolv.h
> @@ -168,9 +168,6 @@ __END_DECLS
>  #define res_close		__res_close
>  #define res_init		__res_init
>  #define res_isourserver		__res_isourserver
> -#define res_query		__res_query
> -#define res_querydomain		__res_querydomain
> -#define res_search		__res_search

OK.

>  
>  #ifdef _LIBC
>  # define __RESOLV_DEPRECATED
> @@ -227,9 +224,6 @@ __END_DECLS
>  #define res_nameinquery		__res_nameinquery
>  #define res_nclose		__res_nclose
>  #define res_ninit		__res_ninit
> -#define res_nquery		__res_nquery
> -#define res_nquerydomain	__res_nquerydomain
> -#define res_nsearch		__res_nsearch

OK.

>  #define res_queriesmatch	__res_queriesmatch
>  #define res_randomid		__res_randomid
>  #define sym_ntop		__sym_ntop
> diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist
> index 092f1b8ffb..db955bd396 100644
> --- a/sysdeps/mach/hurd/i386/libc.abilist
> +++ b/sysdeps/mach/hurd/i386/libc.abilist
> @@ -409,9 +409,15 @@ 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_nquery F
> +GLIBC_2.2.6 __res_nquerydomain F
> +GLIBC_2.2.6 __res_nsearch F
>  GLIBC_2.2.6 __res_nsend F
>  GLIBC_2.2.6 __res_ownok F
> +GLIBC_2.2.6 __res_query F
> +GLIBC_2.2.6 __res_querydomain F
>  GLIBC_2.2.6 __res_randomid F
> +GLIBC_2.2.6 __res_search F

OK. All 6 moved functions added.

>  GLIBC_2.2.6 __res_send F
>  GLIBC_2.2.6 __res_state F
>  GLIBC_2.2.6 __rpc_thread_createerr F
> @@ -2267,8 +2273,14 @@ GLIBC_2.34 res_hnok F
>  GLIBC_2.34 res_mailok F
>  GLIBC_2.34 res_mkquery F
>  GLIBC_2.34 res_nmkquery F
> +GLIBC_2.34 res_nquery F
> +GLIBC_2.34 res_nquerydomain F
> +GLIBC_2.34 res_nsearch F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
> +GLIBC_2.34 res_query F
> +GLIBC_2.34 res_querydomain F
> +GLIBC_2.34 res_search F
>  GLIBC_2.34 res_send F
>  GLIBC_2.34 shm_open F
>  GLIBC_2.34 shm_unlink F
> diff --git a/sysdeps/mach/hurd/i386/libresolv.abilist b/sysdeps/mach/hurd/i386/libresolv.abilist
> index 3ef54cc28e..8b633891cf 100644
> --- a/sysdeps/mach/hurd/i386/libresolv.abilist
> +++ b/sysdeps/mach/hurd/i386/libresolv.abilist
> @@ -25,13 +25,7 @@ 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_nameinquery F
> -GLIBC_2.2.6 __res_nquery F
> -GLIBC_2.2.6 __res_nquerydomain F
> -GLIBC_2.2.6 __res_nsearch F
>  GLIBC_2.2.6 __res_queriesmatch F
> -GLIBC_2.2.6 __res_query F
> -GLIBC_2.2.6 __res_querydomain F
> -GLIBC_2.2.6 __res_search F
>  GLIBC_2.2.6 __sym_ntop F
>  GLIBC_2.2.6 __sym_ntos F
>  GLIBC_2.2.6 __sym_ston F
> diff --git a/sysdeps/unix/sysv/linux/aarch64/libc.abilist b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
> index 7e1529bd90..afa6a526ac 100644
> --- a/sysdeps/unix/sysv/linux/aarch64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
> @@ -388,9 +388,15 @@ 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_nquery F
> +GLIBC_2.17 __res_nquerydomain F
> +GLIBC_2.17 __res_nsearch F
>  GLIBC_2.17 __res_nsend F
>  GLIBC_2.17 __res_ownok F
> +GLIBC_2.17 __res_query F
> +GLIBC_2.17 __res_querydomain F
>  GLIBC_2.17 __res_randomid F
> +GLIBC_2.17 __res_search F
>  GLIBC_2.17 __res_send F
>  GLIBC_2.17 __res_state F
>  GLIBC_2.17 __rpc_thread_createerr F
> @@ -2569,8 +2575,14 @@ GLIBC_2.34 res_hnok F
>  GLIBC_2.34 res_mailok F
>  GLIBC_2.34 res_mkquery F
>  GLIBC_2.34 res_nmkquery F
> +GLIBC_2.34 res_nquery F
> +GLIBC_2.34 res_nquerydomain F
> +GLIBC_2.34 res_nsearch F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
> +GLIBC_2.34 res_query F
> +GLIBC_2.34 res_querydomain F
> +GLIBC_2.34 res_search F
>  GLIBC_2.34 res_send F
>  GLIBC_2.34 sem_clockwait F
>  GLIBC_2.34 sem_close F
> diff --git a/sysdeps/unix/sysv/linux/aarch64/libresolv.abilist b/sysdeps/unix/sysv/linux/aarch64/libresolv.abilist
> index 702d13c633..3d4bfe3179 100644
> --- a/sysdeps/unix/sysv/linux/aarch64/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/aarch64/libresolv.abilist
> @@ -26,13 +26,7 @@ GLIBC_2.17 __res_close F
>  GLIBC_2.17 __res_hostalias F
>  GLIBC_2.17 __res_isourserver F
>  GLIBC_2.17 __res_nameinquery F
> -GLIBC_2.17 __res_nquery F
> -GLIBC_2.17 __res_nquerydomain F
> -GLIBC_2.17 __res_nsearch F
>  GLIBC_2.17 __res_queriesmatch F
> -GLIBC_2.17 __res_query F
> -GLIBC_2.17 __res_querydomain F
> -GLIBC_2.17 __res_search F
>  GLIBC_2.17 __sym_ntop F
>  GLIBC_2.17 __sym_ntos F
>  GLIBC_2.17 __sym_ston F
> diff --git a/sysdeps/unix/sysv/linux/alpha/libc.abilist b/sysdeps/unix/sysv/linux/alpha/libc.abilist
> index 89ee2ed645..66688182b1 100644
> --- a/sysdeps/unix/sysv/linux/alpha/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist
> @@ -1005,6 +1005,9 @@ GLIBC_2.0 remque F
>  GLIBC_2.0 rename F
>  GLIBC_2.0 res_init F
>  GLIBC_2.0 res_mkquery F
> +GLIBC_2.0 res_query F
> +GLIBC_2.0 res_querydomain F
> +GLIBC_2.0 res_search F
>  GLIBC_2.0 revoke F
>  GLIBC_2.0 rewind F
>  GLIBC_2.0 rewinddir F
> @@ -1982,7 +1985,13 @@ GLIBC_2.2 __res_mkquery F
>  GLIBC_2.2 __res_nclose F
>  GLIBC_2.2 __res_ninit F
>  GLIBC_2.2 __res_nmkquery F
> +GLIBC_2.2 __res_nquery F
> +GLIBC_2.2 __res_nquerydomain F
> +GLIBC_2.2 __res_nsearch F
>  GLIBC_2.2 __res_nsend F
> +GLIBC_2.2 __res_query F
> +GLIBC_2.2 __res_querydomain F
> +GLIBC_2.2 __res_search F
>  GLIBC_2.2 __res_state F
>  GLIBC_2.2 __setmntent F
>  GLIBC_2.2 __statfs F
> @@ -2663,8 +2672,14 @@ GLIBC_2.34 res_hnok F
>  GLIBC_2.34 res_mailok F
>  GLIBC_2.34 res_mkquery F
>  GLIBC_2.34 res_nmkquery F
> +GLIBC_2.34 res_nquery F
> +GLIBC_2.34 res_nquerydomain F
> +GLIBC_2.34 res_nsearch F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
> +GLIBC_2.34 res_query F
> +GLIBC_2.34 res_querydomain F
> +GLIBC_2.34 res_search F
>  GLIBC_2.34 res_send F
>  GLIBC_2.34 sem_clockwait F
>  GLIBC_2.34 sem_close F
> diff --git a/sysdeps/unix/sysv/linux/alpha/libresolv.abilist b/sysdeps/unix/sysv/linux/alpha/libresolv.abilist
> index 4f5160f474..8325eae8a5 100644
> --- a/sysdeps/unix/sysv/linux/alpha/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/alpha/libresolv.abilist
> @@ -42,18 +42,9 @@ GLIBC_2.0 inet_neta F
>  GLIBC_2.0 res_gethostbyaddr F
>  GLIBC_2.0 res_gethostbyname F
>  GLIBC_2.0 res_gethostbyname2 F
> -GLIBC_2.0 res_query F
> -GLIBC_2.0 res_querydomain F
> -GLIBC_2.0 res_search F
>  GLIBC_2.0 res_send_setqhook F
>  GLIBC_2.0 res_send_setrhook F
>  GLIBC_2.2 __res_hostalias F
> -GLIBC_2.2 __res_nquery F
> -GLIBC_2.2 __res_nquerydomain F
> -GLIBC_2.2 __res_nsearch F
> -GLIBC_2.2 __res_query F
> -GLIBC_2.2 __res_querydomain F
> -GLIBC_2.2 __res_search F
>  GLIBC_2.3.2 __p_rcode F
>  GLIBC_2.9 ns_datetosecs F
>  GLIBC_2.9 ns_format_ttl F
> diff --git a/sysdeps/unix/sysv/linux/arc/libc.abilist b/sysdeps/unix/sysv/linux/arc/libc.abilist
> index cf320c4bce..cd935c4015 100644
> --- a/sysdeps/unix/sysv/linux/arc/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/arc/libc.abilist
> @@ -377,9 +377,15 @@ 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_nquery F
> +GLIBC_2.32 __res_nquerydomain F
> +GLIBC_2.32 __res_nsearch F
>  GLIBC_2.32 __res_nsend F
>  GLIBC_2.32 __res_ownok F
> +GLIBC_2.32 __res_query F
> +GLIBC_2.32 __res_querydomain F
>  GLIBC_2.32 __res_randomid F
> +GLIBC_2.32 __res_search F
>  GLIBC_2.32 __res_send F
>  GLIBC_2.32 __res_state F
>  GLIBC_2.32 __sbrk F
> @@ -2328,8 +2334,14 @@ GLIBC_2.34 res_hnok F
>  GLIBC_2.34 res_mailok F
>  GLIBC_2.34 res_mkquery F
>  GLIBC_2.34 res_nmkquery F
> +GLIBC_2.34 res_nquery F
> +GLIBC_2.34 res_nquerydomain F
> +GLIBC_2.34 res_nsearch F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
> +GLIBC_2.34 res_query F
> +GLIBC_2.34 res_querydomain F
> +GLIBC_2.34 res_search F
>  GLIBC_2.34 res_send F
>  GLIBC_2.34 sem_clockwait F
>  GLIBC_2.34 sem_close F
> diff --git a/sysdeps/unix/sysv/linux/arc/libresolv.abilist b/sysdeps/unix/sysv/linux/arc/libresolv.abilist
> index ee92f2ae58..47c5072f61 100644
> --- a/sysdeps/unix/sysv/linux/arc/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/arc/libresolv.abilist
> @@ -25,13 +25,7 @@ GLIBC_2.32 __res_close F
>  GLIBC_2.32 __res_hostalias F
>  GLIBC_2.32 __res_isourserver F
>  GLIBC_2.32 __res_nameinquery F
> -GLIBC_2.32 __res_nquery F
> -GLIBC_2.32 __res_nquerydomain F
> -GLIBC_2.32 __res_nsearch F
>  GLIBC_2.32 __res_queriesmatch F
> -GLIBC_2.32 __res_query F
> -GLIBC_2.32 __res_querydomain F
> -GLIBC_2.32 __res_search F
>  GLIBC_2.32 __sym_ntop F
>  GLIBC_2.32 __sym_ntos F
>  GLIBC_2.32 __sym_ston F
> diff --git a/sysdeps/unix/sysv/linux/arm/be/libc.abilist b/sysdeps/unix/sysv/linux/arm/be/libc.abilist
> index 7b395d2683..e1026b6077 100644
> --- a/sysdeps/unix/sysv/linux/arm/be/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/arm/be/libc.abilist
> @@ -444,8 +444,14 @@ GLIBC_2.34 res_hnok F
>  GLIBC_2.34 res_mailok F
>  GLIBC_2.34 res_mkquery F
>  GLIBC_2.34 res_nmkquery F
> +GLIBC_2.34 res_nquery F
> +GLIBC_2.34 res_nquerydomain F
> +GLIBC_2.34 res_nsearch F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
> +GLIBC_2.34 res_query F
> +GLIBC_2.34 res_querydomain F
> +GLIBC_2.34 res_search F
>  GLIBC_2.34 res_send F
>  GLIBC_2.34 sem_clockwait F
>  GLIBC_2.34 sem_close F
> @@ -849,9 +855,15 @@ 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_nquery F
> +GLIBC_2.4 __res_nquerydomain F
> +GLIBC_2.4 __res_nsearch F
>  GLIBC_2.4 __res_nsend F
>  GLIBC_2.4 __res_ownok F
> +GLIBC_2.4 __res_query F
> +GLIBC_2.4 __res_querydomain F
>  GLIBC_2.4 __res_randomid F
> +GLIBC_2.4 __res_search F
>  GLIBC_2.4 __res_send F
>  GLIBC_2.4 __res_state F
>  GLIBC_2.4 __rpc_thread_createerr F
> diff --git a/sysdeps/unix/sysv/linux/arm/be/libresolv.abilist b/sysdeps/unix/sysv/linux/arm/be/libresolv.abilist
> index ee4f6a36e9..06018c2f04 100644
> --- a/sysdeps/unix/sysv/linux/arm/be/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/arm/be/libresolv.abilist
> @@ -26,13 +26,7 @@ GLIBC_2.4 __res_close F
>  GLIBC_2.4 __res_hostalias F
>  GLIBC_2.4 __res_isourserver F
>  GLIBC_2.4 __res_nameinquery F
> -GLIBC_2.4 __res_nquery F
> -GLIBC_2.4 __res_nquerydomain F
> -GLIBC_2.4 __res_nsearch F
>  GLIBC_2.4 __res_queriesmatch F
> -GLIBC_2.4 __res_query F
> -GLIBC_2.4 __res_querydomain F
> -GLIBC_2.4 __res_search F
>  GLIBC_2.4 __sym_ntop F
>  GLIBC_2.4 __sym_ntos F
>  GLIBC_2.4 __sym_ston F
> diff --git a/sysdeps/unix/sysv/linux/arm/le/libc.abilist b/sysdeps/unix/sysv/linux/arm/le/libc.abilist
> index 9a2aefac45..aa45c60686 100644
> --- a/sysdeps/unix/sysv/linux/arm/le/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/arm/le/libc.abilist
> @@ -441,8 +441,14 @@ GLIBC_2.34 res_hnok F
>  GLIBC_2.34 res_mailok F
>  GLIBC_2.34 res_mkquery F
>  GLIBC_2.34 res_nmkquery F
> +GLIBC_2.34 res_nquery F
> +GLIBC_2.34 res_nquerydomain F
> +GLIBC_2.34 res_nsearch F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
> +GLIBC_2.34 res_query F
> +GLIBC_2.34 res_querydomain F
> +GLIBC_2.34 res_search F
>  GLIBC_2.34 res_send F
>  GLIBC_2.34 sem_clockwait F
>  GLIBC_2.34 sem_close F
> @@ -846,9 +852,15 @@ 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_nquery F
> +GLIBC_2.4 __res_nquerydomain F
> +GLIBC_2.4 __res_nsearch F
>  GLIBC_2.4 __res_nsend F
>  GLIBC_2.4 __res_ownok F
> +GLIBC_2.4 __res_query F
> +GLIBC_2.4 __res_querydomain F
>  GLIBC_2.4 __res_randomid F
> +GLIBC_2.4 __res_search F
>  GLIBC_2.4 __res_send F
>  GLIBC_2.4 __res_state F
>  GLIBC_2.4 __rpc_thread_createerr F
> diff --git a/sysdeps/unix/sysv/linux/arm/le/libresolv.abilist b/sysdeps/unix/sysv/linux/arm/le/libresolv.abilist
> index ee4f6a36e9..06018c2f04 100644
> --- a/sysdeps/unix/sysv/linux/arm/le/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/arm/le/libresolv.abilist
> @@ -26,13 +26,7 @@ GLIBC_2.4 __res_close F
>  GLIBC_2.4 __res_hostalias F
>  GLIBC_2.4 __res_isourserver F
>  GLIBC_2.4 __res_nameinquery F
> -GLIBC_2.4 __res_nquery F
> -GLIBC_2.4 __res_nquerydomain F
> -GLIBC_2.4 __res_nsearch F
>  GLIBC_2.4 __res_queriesmatch F
> -GLIBC_2.4 __res_query F
> -GLIBC_2.4 __res_querydomain F
> -GLIBC_2.4 __res_search F
>  GLIBC_2.4 __sym_ntop F
>  GLIBC_2.4 __sym_ntos F
>  GLIBC_2.4 __sym_ston F
> diff --git a/sysdeps/unix/sysv/linux/csky/libc.abilist b/sysdeps/unix/sysv/linux/csky/libc.abilist
> index eb8efa378b..f385a7cb66 100644
> --- a/sysdeps/unix/sysv/linux/csky/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/csky/libc.abilist
> @@ -381,9 +381,15 @@ 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_nquery F
> +GLIBC_2.29 __res_nquerydomain F
> +GLIBC_2.29 __res_nsearch F
>  GLIBC_2.29 __res_nsend F
>  GLIBC_2.29 __res_ownok F
> +GLIBC_2.29 __res_query F
> +GLIBC_2.29 __res_querydomain F
>  GLIBC_2.29 __res_randomid F
> +GLIBC_2.29 __res_search F
>  GLIBC_2.29 __res_send F
>  GLIBC_2.29 __res_state F
>  GLIBC_2.29 __rpc_thread_createerr F
> @@ -2594,8 +2600,14 @@ GLIBC_2.34 res_hnok F
>  GLIBC_2.34 res_mailok F
>  GLIBC_2.34 res_mkquery F
>  GLIBC_2.34 res_nmkquery F
> +GLIBC_2.34 res_nquery F
> +GLIBC_2.34 res_nquerydomain F
> +GLIBC_2.34 res_nsearch F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
> +GLIBC_2.34 res_query F
> +GLIBC_2.34 res_querydomain F
> +GLIBC_2.34 res_search F
>  GLIBC_2.34 res_send F
>  GLIBC_2.34 sem_clockwait F
>  GLIBC_2.34 sem_close F
> diff --git a/sysdeps/unix/sysv/linux/csky/libresolv.abilist b/sysdeps/unix/sysv/linux/csky/libresolv.abilist
> index f4ae402b6f..1b37befe82 100644
> --- a/sysdeps/unix/sysv/linux/csky/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/csky/libresolv.abilist
> @@ -25,13 +25,7 @@ GLIBC_2.29 __res_close F
>  GLIBC_2.29 __res_hostalias F
>  GLIBC_2.29 __res_isourserver F
>  GLIBC_2.29 __res_nameinquery F
> -GLIBC_2.29 __res_nquery F
> -GLIBC_2.29 __res_nquerydomain F
> -GLIBC_2.29 __res_nsearch F
>  GLIBC_2.29 __res_queriesmatch F
> -GLIBC_2.29 __res_query F
> -GLIBC_2.29 __res_querydomain F
> -GLIBC_2.29 __res_search F
>  GLIBC_2.29 __sym_ntop F
>  GLIBC_2.29 __sym_ntos F
>  GLIBC_2.29 __sym_ston F
> diff --git a/sysdeps/unix/sysv/linux/hppa/libc.abilist b/sysdeps/unix/sysv/linux/hppa/libc.abilist
> index 4c3d7674ff..6ed506e5ec 100644
> --- a/sysdeps/unix/sysv/linux/hppa/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/hppa/libc.abilist
> @@ -18,6 +18,9 @@ GLIBC_2.0 logout F
>  GLIBC_2.0 logwtmp F
>  GLIBC_2.0 openpty 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.1 aio_cancel F
>  GLIBC_2.1 aio_cancel64 F
>  GLIBC_2.1 aio_error F
> @@ -432,8 +435,14 @@ GLIBC_2.2 __res_mkquery F
>  GLIBC_2.2 __res_nclose F
>  GLIBC_2.2 __res_ninit F
>  GLIBC_2.2 __res_nmkquery F
> +GLIBC_2.2 __res_nquery F
> +GLIBC_2.2 __res_nquerydomain F
> +GLIBC_2.2 __res_nsearch F
>  GLIBC_2.2 __res_nsend F
> +GLIBC_2.2 __res_query F
> +GLIBC_2.2 __res_querydomain F
>  GLIBC_2.2 __res_randomid F
> +GLIBC_2.2 __res_search F
>  GLIBC_2.2 __res_state F
>  GLIBC_2.2 __sbrk F
>  GLIBC_2.2 __sched_get_priority_max F
> @@ -2542,8 +2551,14 @@ GLIBC_2.34 res_hnok F
>  GLIBC_2.34 res_mailok F
>  GLIBC_2.34 res_mkquery F
>  GLIBC_2.34 res_nmkquery F
> +GLIBC_2.34 res_nquery F
> +GLIBC_2.34 res_nquerydomain F
> +GLIBC_2.34 res_nsearch F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
> +GLIBC_2.34 res_query F
> +GLIBC_2.34 res_querydomain F
> +GLIBC_2.34 res_search F
>  GLIBC_2.34 res_send F
>  GLIBC_2.34 sem_clockwait F
>  GLIBC_2.34 sem_close F
> diff --git a/sysdeps/unix/sysv/linux/hppa/libresolv.abilist b/sysdeps/unix/sysv/linux/hppa/libresolv.abilist
> index f2707204ed..56dcd57b6c 100644
> --- a/sysdeps/unix/sysv/linux/hppa/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/hppa/libresolv.abilist
> @@ -42,18 +42,9 @@ GLIBC_2.0 inet_neta F
>  GLIBC_2.0 res_gethostbyaddr F
>  GLIBC_2.0 res_gethostbyname F
>  GLIBC_2.0 res_gethostbyname2 F
> -GLIBC_2.0 res_query F
> -GLIBC_2.0 res_querydomain F
> -GLIBC_2.0 res_search F
>  GLIBC_2.0 res_send_setqhook F
>  GLIBC_2.0 res_send_setrhook F
>  GLIBC_2.2 __res_hostalias F
> -GLIBC_2.2 __res_nquery F
> -GLIBC_2.2 __res_nquerydomain F
> -GLIBC_2.2 __res_nsearch F
> -GLIBC_2.2 __res_query F
> -GLIBC_2.2 __res_querydomain F
> -GLIBC_2.2 __res_search F
>  GLIBC_2.3.2 __p_rcode F
>  GLIBC_2.9 ns_datetosecs F
>  GLIBC_2.9 ns_format_ttl F
> diff --git a/sysdeps/unix/sysv/linux/i386/libc.abilist b/sysdeps/unix/sysv/linux/i386/libc.abilist
> index 9f44807e02..8f28ecbb9c 100644
> --- a/sysdeps/unix/sysv/linux/i386/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/i386/libc.abilist
> @@ -982,6 +982,9 @@ GLIBC_2.0 remque F
>  GLIBC_2.0 rename F
>  GLIBC_2.0 res_init F
>  GLIBC_2.0 res_mkquery F
> +GLIBC_2.0 res_query F
> +GLIBC_2.0 res_querydomain F
> +GLIBC_2.0 res_search F
>  GLIBC_2.0 revoke F
>  GLIBC_2.0 rewind F
>  GLIBC_2.0 rewinddir F
> @@ -1986,7 +1989,13 @@ GLIBC_2.2 __res_mkquery F
>  GLIBC_2.2 __res_nclose F
>  GLIBC_2.2 __res_ninit F
>  GLIBC_2.2 __res_nmkquery F
> +GLIBC_2.2 __res_nquery F
> +GLIBC_2.2 __res_nquerydomain F
> +GLIBC_2.2 __res_nsearch F
>  GLIBC_2.2 __res_nsend F
> +GLIBC_2.2 __res_query F
> +GLIBC_2.2 __res_querydomain F
> +GLIBC_2.2 __res_search F
>  GLIBC_2.2 __res_state F
>  GLIBC_2.2 __setmntent F
>  GLIBC_2.2 __statfs F
> @@ -2726,8 +2735,14 @@ GLIBC_2.34 res_hnok F
>  GLIBC_2.34 res_mailok F
>  GLIBC_2.34 res_mkquery F
>  GLIBC_2.34 res_nmkquery F
> +GLIBC_2.34 res_nquery F
> +GLIBC_2.34 res_nquerydomain F
> +GLIBC_2.34 res_nsearch F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
> +GLIBC_2.34 res_query F
> +GLIBC_2.34 res_querydomain F
> +GLIBC_2.34 res_search F
>  GLIBC_2.34 res_send F
>  GLIBC_2.34 sem_clockwait F
>  GLIBC_2.34 sem_close F
> diff --git a/sysdeps/unix/sysv/linux/i386/libresolv.abilist b/sysdeps/unix/sysv/linux/i386/libresolv.abilist
> index f2707204ed..56dcd57b6c 100644
> --- a/sysdeps/unix/sysv/linux/i386/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/i386/libresolv.abilist
> @@ -42,18 +42,9 @@ GLIBC_2.0 inet_neta F
>  GLIBC_2.0 res_gethostbyaddr F
>  GLIBC_2.0 res_gethostbyname F
>  GLIBC_2.0 res_gethostbyname2 F
> -GLIBC_2.0 res_query F
> -GLIBC_2.0 res_querydomain F
> -GLIBC_2.0 res_search F
>  GLIBC_2.0 res_send_setqhook F
>  GLIBC_2.0 res_send_setrhook F
>  GLIBC_2.2 __res_hostalias F
> -GLIBC_2.2 __res_nquery F
> -GLIBC_2.2 __res_nquerydomain F
> -GLIBC_2.2 __res_nsearch F
> -GLIBC_2.2 __res_query F
> -GLIBC_2.2 __res_querydomain F
> -GLIBC_2.2 __res_search F
>  GLIBC_2.3.2 __p_rcode F
>  GLIBC_2.9 ns_datetosecs F
>  GLIBC_2.9 ns_format_ttl F
> diff --git a/sysdeps/unix/sysv/linux/ia64/libc.abilist b/sysdeps/unix/sysv/linux/ia64/libc.abilist
> index 63a3fa22ef..1acdafd19b 100644
> --- a/sysdeps/unix/sysv/linux/ia64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/ia64/libc.abilist
> @@ -18,6 +18,9 @@ GLIBC_2.0 logout F
>  GLIBC_2.0 logwtmp F
>  GLIBC_2.0 openpty 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.1 aio_cancel F
>  GLIBC_2.1 aio_cancel64 F
>  GLIBC_2.1 aio_error F
> @@ -436,8 +439,14 @@ GLIBC_2.2 __res_mkquery F
>  GLIBC_2.2 __res_nclose F
>  GLIBC_2.2 __res_ninit F
>  GLIBC_2.2 __res_nmkquery F
> +GLIBC_2.2 __res_nquery F
> +GLIBC_2.2 __res_nquerydomain F
> +GLIBC_2.2 __res_nsearch F
>  GLIBC_2.2 __res_nsend F
> +GLIBC_2.2 __res_query F
> +GLIBC_2.2 __res_querydomain F
>  GLIBC_2.2 __res_randomid F
> +GLIBC_2.2 __res_search F
>  GLIBC_2.2 __res_state F
>  GLIBC_2.2 __sbrk F
>  GLIBC_2.2 __sched_get_priority_max F
> @@ -2501,8 +2510,14 @@ GLIBC_2.34 res_hnok F
>  GLIBC_2.34 res_mailok F
>  GLIBC_2.34 res_mkquery F
>  GLIBC_2.34 res_nmkquery F
> +GLIBC_2.34 res_nquery F
> +GLIBC_2.34 res_nquerydomain F
> +GLIBC_2.34 res_nsearch F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
> +GLIBC_2.34 res_query F
> +GLIBC_2.34 res_querydomain F
> +GLIBC_2.34 res_search F
>  GLIBC_2.34 res_send F
>  GLIBC_2.34 sem_clockwait F
>  GLIBC_2.34 sem_close F
> diff --git a/sysdeps/unix/sysv/linux/ia64/libresolv.abilist b/sysdeps/unix/sysv/linux/ia64/libresolv.abilist
> index 4f5160f474..8325eae8a5 100644
> --- a/sysdeps/unix/sysv/linux/ia64/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/ia64/libresolv.abilist
> @@ -42,18 +42,9 @@ GLIBC_2.0 inet_neta F
>  GLIBC_2.0 res_gethostbyaddr F
>  GLIBC_2.0 res_gethostbyname F
>  GLIBC_2.0 res_gethostbyname2 F
> -GLIBC_2.0 res_query F
> -GLIBC_2.0 res_querydomain F
> -GLIBC_2.0 res_search F
>  GLIBC_2.0 res_send_setqhook F
>  GLIBC_2.0 res_send_setrhook F
>  GLIBC_2.2 __res_hostalias F
> -GLIBC_2.2 __res_nquery F
> -GLIBC_2.2 __res_nquerydomain F
> -GLIBC_2.2 __res_nsearch F
> -GLIBC_2.2 __res_query F
> -GLIBC_2.2 __res_querydomain F
> -GLIBC_2.2 __res_search F
>  GLIBC_2.3.2 __p_rcode F
>  GLIBC_2.9 ns_datetosecs F
>  GLIBC_2.9 ns_format_ttl F
> diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
> index 37bbdde23b..125f2cfbca 100644
> --- a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
> @@ -445,8 +445,14 @@ GLIBC_2.34 res_hnok F
>  GLIBC_2.34 res_mailok F
>  GLIBC_2.34 res_mkquery F
>  GLIBC_2.34 res_nmkquery F
> +GLIBC_2.34 res_nquery F
> +GLIBC_2.34 res_nquerydomain F
> +GLIBC_2.34 res_nsearch F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
> +GLIBC_2.34 res_query F
> +GLIBC_2.34 res_querydomain F
> +GLIBC_2.34 res_search F
>  GLIBC_2.34 res_send F
>  GLIBC_2.34 sem_clockwait F
>  GLIBC_2.34 sem_close F
> @@ -835,9 +841,15 @@ 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_nquery F
> +GLIBC_2.4 __res_nquerydomain F
> +GLIBC_2.4 __res_nsearch F
>  GLIBC_2.4 __res_nsend F
>  GLIBC_2.4 __res_ownok F
> +GLIBC_2.4 __res_query F
> +GLIBC_2.4 __res_querydomain F
>  GLIBC_2.4 __res_randomid F
> +GLIBC_2.4 __res_search F
>  GLIBC_2.4 __res_send F
>  GLIBC_2.4 __res_state F
>  GLIBC_2.4 __rpc_thread_createerr F
> diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libresolv.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libresolv.abilist
> index ee4f6a36e9..06018c2f04 100644
> --- a/sysdeps/unix/sysv/linux/m68k/coldfire/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libresolv.abilist
> @@ -26,13 +26,7 @@ GLIBC_2.4 __res_close F
>  GLIBC_2.4 __res_hostalias F
>  GLIBC_2.4 __res_isourserver F
>  GLIBC_2.4 __res_nameinquery F
> -GLIBC_2.4 __res_nquery F
> -GLIBC_2.4 __res_nquerydomain F
> -GLIBC_2.4 __res_nsearch F
>  GLIBC_2.4 __res_queriesmatch F
> -GLIBC_2.4 __res_query F
> -GLIBC_2.4 __res_querydomain F
> -GLIBC_2.4 __res_search F
>  GLIBC_2.4 __sym_ntop F
>  GLIBC_2.4 __sym_ntos F
>  GLIBC_2.4 __sym_ston F
> diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
> index bf0eb6e976..0e5d7c1b48 100644
> --- a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
> @@ -981,6 +981,9 @@ GLIBC_2.0 remque F
>  GLIBC_2.0 rename F
>  GLIBC_2.0 res_init F
>  GLIBC_2.0 res_mkquery F
> +GLIBC_2.0 res_query F
> +GLIBC_2.0 res_querydomain F
> +GLIBC_2.0 res_search F
>  GLIBC_2.0 revoke F
>  GLIBC_2.0 rewind F
>  GLIBC_2.0 rewinddir F
> @@ -1942,7 +1945,13 @@ GLIBC_2.2 __res_mkquery F
>  GLIBC_2.2 __res_nclose F
>  GLIBC_2.2 __res_ninit F
>  GLIBC_2.2 __res_nmkquery F
> +GLIBC_2.2 __res_nquery F
> +GLIBC_2.2 __res_nquerydomain F
> +GLIBC_2.2 __res_nsearch F
>  GLIBC_2.2 __res_nsend F
> +GLIBC_2.2 __res_query F
> +GLIBC_2.2 __res_querydomain F
> +GLIBC_2.2 __res_search F
>  GLIBC_2.2 __res_state F
>  GLIBC_2.2 __setmntent F
>  GLIBC_2.2 __statfs F
> @@ -2669,8 +2678,14 @@ GLIBC_2.34 res_hnok F
>  GLIBC_2.34 res_mailok F
>  GLIBC_2.34 res_mkquery F
>  GLIBC_2.34 res_nmkquery F
> +GLIBC_2.34 res_nquery F
> +GLIBC_2.34 res_nquerydomain F
> +GLIBC_2.34 res_nsearch F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
> +GLIBC_2.34 res_query F
> +GLIBC_2.34 res_querydomain F
> +GLIBC_2.34 res_search F
>  GLIBC_2.34 res_send F
>  GLIBC_2.34 sem_clockwait F
>  GLIBC_2.34 sem_close F
> diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libresolv.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libresolv.abilist
> index f2707204ed..56dcd57b6c 100644
> --- a/sysdeps/unix/sysv/linux/m68k/m680x0/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libresolv.abilist
> @@ -42,18 +42,9 @@ GLIBC_2.0 inet_neta F
>  GLIBC_2.0 res_gethostbyaddr F
>  GLIBC_2.0 res_gethostbyname F
>  GLIBC_2.0 res_gethostbyname2 F
> -GLIBC_2.0 res_query F
> -GLIBC_2.0 res_querydomain F
> -GLIBC_2.0 res_search F
>  GLIBC_2.0 res_send_setqhook F
>  GLIBC_2.0 res_send_setrhook F
>  GLIBC_2.2 __res_hostalias F
> -GLIBC_2.2 __res_nquery F
> -GLIBC_2.2 __res_nquerydomain F
> -GLIBC_2.2 __res_nsearch F
> -GLIBC_2.2 __res_query F
> -GLIBC_2.2 __res_querydomain F
> -GLIBC_2.2 __res_search F
>  GLIBC_2.3.2 __p_rcode F
>  GLIBC_2.9 ns_datetosecs F
>  GLIBC_2.9 ns_format_ttl F
> diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
> index d5d5771708..c44b106449 100644
> --- a/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
> @@ -389,9 +389,15 @@ 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_nquery F
> +GLIBC_2.18 __res_nquerydomain F
> +GLIBC_2.18 __res_nsearch F
>  GLIBC_2.18 __res_nsend F
>  GLIBC_2.18 __res_ownok F
> +GLIBC_2.18 __res_query F
> +GLIBC_2.18 __res_querydomain F
>  GLIBC_2.18 __res_randomid F
> +GLIBC_2.18 __res_search F
>  GLIBC_2.18 __res_send F
>  GLIBC_2.18 __res_state F
>  GLIBC_2.18 __rpc_thread_createerr F
> @@ -2645,8 +2651,14 @@ GLIBC_2.34 res_hnok F
>  GLIBC_2.34 res_mailok F
>  GLIBC_2.34 res_mkquery F
>  GLIBC_2.34 res_nmkquery F
> +GLIBC_2.34 res_nquery F
> +GLIBC_2.34 res_nquerydomain F
> +GLIBC_2.34 res_nsearch F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
> +GLIBC_2.34 res_query F
> +GLIBC_2.34 res_querydomain F
> +GLIBC_2.34 res_search F
>  GLIBC_2.34 res_send F
>  GLIBC_2.34 sem_clockwait F
>  GLIBC_2.34 sem_close F
> diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libresolv.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libresolv.abilist
> index 9550bc22e1..9782b54587 100644
> --- a/sysdeps/unix/sysv/linux/microblaze/be/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/microblaze/be/libresolv.abilist
> @@ -26,13 +26,7 @@ GLIBC_2.18 __res_close F
>  GLIBC_2.18 __res_hostalias F
>  GLIBC_2.18 __res_isourserver F
>  GLIBC_2.18 __res_nameinquery F
> -GLIBC_2.18 __res_nquery F
> -GLIBC_2.18 __res_nquerydomain F
> -GLIBC_2.18 __res_nsearch F
>  GLIBC_2.18 __res_queriesmatch F
> -GLIBC_2.18 __res_query F
> -GLIBC_2.18 __res_querydomain F
> -GLIBC_2.18 __res_search F
>  GLIBC_2.18 __sym_ntop F
>  GLIBC_2.18 __sym_ntos F
>  GLIBC_2.18 __sym_ston F
> diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
> index 2f05d61c21..3c2edae799 100644
> --- a/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
> @@ -389,9 +389,15 @@ 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_nquery F
> +GLIBC_2.18 __res_nquerydomain F
> +GLIBC_2.18 __res_nsearch F
>  GLIBC_2.18 __res_nsend F
>  GLIBC_2.18 __res_ownok F
> +GLIBC_2.18 __res_query F
> +GLIBC_2.18 __res_querydomain F
>  GLIBC_2.18 __res_randomid F
> +GLIBC_2.18 __res_search F
>  GLIBC_2.18 __res_send F
>  GLIBC_2.18 __res_state F
>  GLIBC_2.18 __rpc_thread_createerr F
> @@ -2642,8 +2648,14 @@ GLIBC_2.34 res_hnok F
>  GLIBC_2.34 res_mailok F
>  GLIBC_2.34 res_mkquery F
>  GLIBC_2.34 res_nmkquery F
> +GLIBC_2.34 res_nquery F
> +GLIBC_2.34 res_nquerydomain F
> +GLIBC_2.34 res_nsearch F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
> +GLIBC_2.34 res_query F
> +GLIBC_2.34 res_querydomain F
> +GLIBC_2.34 res_search F
>  GLIBC_2.34 res_send F
>  GLIBC_2.34 sem_clockwait F
>  GLIBC_2.34 sem_close F
> diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libresolv.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libresolv.abilist
> index 9550bc22e1..9782b54587 100644
> --- a/sysdeps/unix/sysv/linux/microblaze/le/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/microblaze/le/libresolv.abilist
> @@ -26,13 +26,7 @@ GLIBC_2.18 __res_close F
>  GLIBC_2.18 __res_hostalias F
>  GLIBC_2.18 __res_isourserver F
>  GLIBC_2.18 __res_nameinquery F
> -GLIBC_2.18 __res_nquery F
> -GLIBC_2.18 __res_nquerydomain F
> -GLIBC_2.18 __res_nsearch F
>  GLIBC_2.18 __res_queriesmatch F
> -GLIBC_2.18 __res_query F
> -GLIBC_2.18 __res_querydomain F
> -GLIBC_2.18 __res_search F
>  GLIBC_2.18 __sym_ntop F
>  GLIBC_2.18 __sym_ntos F
>  GLIBC_2.18 __sym_ston F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
> index 8d62d76ca5..41d8b812c6 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
> @@ -978,6 +978,9 @@ GLIBC_2.0 remque F
>  GLIBC_2.0 rename F
>  GLIBC_2.0 res_init F
>  GLIBC_2.0 res_mkquery F
> +GLIBC_2.0 res_query F
> +GLIBC_2.0 res_querydomain F
> +GLIBC_2.0 res_search F
>  GLIBC_2.0 revoke F
>  GLIBC_2.0 rewind F
>  GLIBC_2.0 rewinddir F
> @@ -1595,7 +1598,13 @@ GLIBC_2.2 __res_mkquery F
>  GLIBC_2.2 __res_nclose F
>  GLIBC_2.2 __res_ninit F
>  GLIBC_2.2 __res_nmkquery F
> +GLIBC_2.2 __res_nquery F
> +GLIBC_2.2 __res_nquerydomain F
> +GLIBC_2.2 __res_nsearch F
>  GLIBC_2.2 __res_nsend F
> +GLIBC_2.2 __res_query F
> +GLIBC_2.2 __res_querydomain F
> +GLIBC_2.2 __res_search F
>  GLIBC_2.2 __res_state F
>  GLIBC_2.2 __setmntent F
>  GLIBC_2.2 __signbit F
> @@ -2634,8 +2643,14 @@ GLIBC_2.34 res_hnok F
>  GLIBC_2.34 res_mailok F
>  GLIBC_2.34 res_mkquery F
>  GLIBC_2.34 res_nmkquery F
> +GLIBC_2.34 res_nquery F
> +GLIBC_2.34 res_nquerydomain F
> +GLIBC_2.34 res_nsearch F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
> +GLIBC_2.34 res_query F
> +GLIBC_2.34 res_querydomain F
> +GLIBC_2.34 res_search F
>  GLIBC_2.34 res_send F
>  GLIBC_2.34 sem_clockwait F
>  GLIBC_2.34 sem_close F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips32/libresolv.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libresolv.abilist
> index f2707204ed..56dcd57b6c 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips32/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips32/libresolv.abilist
> @@ -42,18 +42,9 @@ GLIBC_2.0 inet_neta F
>  GLIBC_2.0 res_gethostbyaddr F
>  GLIBC_2.0 res_gethostbyname F
>  GLIBC_2.0 res_gethostbyname2 F
> -GLIBC_2.0 res_query F
> -GLIBC_2.0 res_querydomain F
> -GLIBC_2.0 res_search F
>  GLIBC_2.0 res_send_setqhook F
>  GLIBC_2.0 res_send_setrhook F
>  GLIBC_2.2 __res_hostalias F
> -GLIBC_2.2 __res_nquery F
> -GLIBC_2.2 __res_nquerydomain F
> -GLIBC_2.2 __res_nsearch F
> -GLIBC_2.2 __res_query F
> -GLIBC_2.2 __res_querydomain F
> -GLIBC_2.2 __res_search F
>  GLIBC_2.3.2 __p_rcode F
>  GLIBC_2.9 ns_datetosecs F
>  GLIBC_2.9 ns_format_ttl F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
> index 68e086d203..875f68199a 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
> @@ -978,6 +978,9 @@ GLIBC_2.0 remque F
>  GLIBC_2.0 rename F
>  GLIBC_2.0 res_init F
>  GLIBC_2.0 res_mkquery F
> +GLIBC_2.0 res_query F
> +GLIBC_2.0 res_querydomain F
> +GLIBC_2.0 res_search F
>  GLIBC_2.0 revoke F
>  GLIBC_2.0 rewind F
>  GLIBC_2.0 rewinddir F
> @@ -1593,7 +1596,13 @@ GLIBC_2.2 __res_mkquery F
>  GLIBC_2.2 __res_nclose F
>  GLIBC_2.2 __res_ninit F
>  GLIBC_2.2 __res_nmkquery F
> +GLIBC_2.2 __res_nquery F
> +GLIBC_2.2 __res_nquerydomain F
> +GLIBC_2.2 __res_nsearch F
>  GLIBC_2.2 __res_nsend F
> +GLIBC_2.2 __res_query F
> +GLIBC_2.2 __res_querydomain F
> +GLIBC_2.2 __res_search F
>  GLIBC_2.2 __res_state F
>  GLIBC_2.2 __setmntent F
>  GLIBC_2.2 __signbit F
> @@ -2632,8 +2641,14 @@ GLIBC_2.34 res_hnok F
>  GLIBC_2.34 res_mailok F
>  GLIBC_2.34 res_mkquery F
>  GLIBC_2.34 res_nmkquery F
> +GLIBC_2.34 res_nquery F
> +GLIBC_2.34 res_nquerydomain F
> +GLIBC_2.34 res_nsearch F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
> +GLIBC_2.34 res_query F
> +GLIBC_2.34 res_querydomain F
> +GLIBC_2.34 res_search F
>  GLIBC_2.34 res_send F
>  GLIBC_2.34 sem_clockwait F
>  GLIBC_2.34 sem_close F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
> index 14c19658c6..bca901db65 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
> @@ -978,6 +978,9 @@ GLIBC_2.0 remque F
>  GLIBC_2.0 rename F
>  GLIBC_2.0 res_init F
>  GLIBC_2.0 res_mkquery F
> +GLIBC_2.0 res_query F
> +GLIBC_2.0 res_querydomain F
> +GLIBC_2.0 res_search F
>  GLIBC_2.0 revoke F
>  GLIBC_2.0 rewind F
>  GLIBC_2.0 rewinddir F
> @@ -1593,7 +1596,13 @@ GLIBC_2.2 __res_mkquery F
>  GLIBC_2.2 __res_nclose F
>  GLIBC_2.2 __res_ninit F
>  GLIBC_2.2 __res_nmkquery F
> +GLIBC_2.2 __res_nquery F
> +GLIBC_2.2 __res_nquerydomain F
> +GLIBC_2.2 __res_nsearch F
>  GLIBC_2.2 __res_nsend F
> +GLIBC_2.2 __res_query F
> +GLIBC_2.2 __res_querydomain F
> +GLIBC_2.2 __res_search F
>  GLIBC_2.2 __res_state F
>  GLIBC_2.2 __setmntent F
>  GLIBC_2.2 __signbit F
> @@ -2640,8 +2649,14 @@ GLIBC_2.34 res_hnok F
>  GLIBC_2.34 res_mailok F
>  GLIBC_2.34 res_mkquery F
>  GLIBC_2.34 res_nmkquery F
> +GLIBC_2.34 res_nquery F
> +GLIBC_2.34 res_nquerydomain F
> +GLIBC_2.34 res_nsearch F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
> +GLIBC_2.34 res_query F
> +GLIBC_2.34 res_querydomain F
> +GLIBC_2.34 res_search F
>  GLIBC_2.34 res_send F
>  GLIBC_2.34 sem_clockwait F
>  GLIBC_2.34 sem_close F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/libresolv.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libresolv.abilist
> index f2707204ed..56dcd57b6c 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips64/n32/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips64/n32/libresolv.abilist
> @@ -42,18 +42,9 @@ GLIBC_2.0 inet_neta F
>  GLIBC_2.0 res_gethostbyaddr F
>  GLIBC_2.0 res_gethostbyname F
>  GLIBC_2.0 res_gethostbyname2 F
> -GLIBC_2.0 res_query F
> -GLIBC_2.0 res_querydomain F
> -GLIBC_2.0 res_search F
>  GLIBC_2.0 res_send_setqhook F
>  GLIBC_2.0 res_send_setrhook F
>  GLIBC_2.2 __res_hostalias F
> -GLIBC_2.2 __res_nquery F
> -GLIBC_2.2 __res_nquerydomain F
> -GLIBC_2.2 __res_nsearch F
> -GLIBC_2.2 __res_query F
> -GLIBC_2.2 __res_querydomain F
> -GLIBC_2.2 __res_search F
>  GLIBC_2.3.2 __p_rcode F
>  GLIBC_2.9 ns_datetosecs F
>  GLIBC_2.9 ns_format_ttl F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
> index 479115297c..29ddd75b77 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
> @@ -976,6 +976,9 @@ GLIBC_2.0 remque F
>  GLIBC_2.0 rename F
>  GLIBC_2.0 res_init F
>  GLIBC_2.0 res_mkquery F
> +GLIBC_2.0 res_query F
> +GLIBC_2.0 res_querydomain F
> +GLIBC_2.0 res_search F
>  GLIBC_2.0 revoke F
>  GLIBC_2.0 rewind F
>  GLIBC_2.0 rewinddir F
> @@ -1589,7 +1592,13 @@ GLIBC_2.2 __res_mkquery F
>  GLIBC_2.2 __res_nclose F
>  GLIBC_2.2 __res_ninit F
>  GLIBC_2.2 __res_nmkquery F
> +GLIBC_2.2 __res_nquery F
> +GLIBC_2.2 __res_nquerydomain F
> +GLIBC_2.2 __res_nsearch F
>  GLIBC_2.2 __res_nsend F
> +GLIBC_2.2 __res_query F
> +GLIBC_2.2 __res_querydomain F
> +GLIBC_2.2 __res_search F
>  GLIBC_2.2 __res_state F
>  GLIBC_2.2 __setmntent F
>  GLIBC_2.2 __signbit F
> @@ -2552,8 +2561,14 @@ GLIBC_2.34 res_hnok F
>  GLIBC_2.34 res_mailok F
>  GLIBC_2.34 res_mkquery F
>  GLIBC_2.34 res_nmkquery F
> +GLIBC_2.34 res_nquery F
> +GLIBC_2.34 res_nquerydomain F
> +GLIBC_2.34 res_nsearch F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
> +GLIBC_2.34 res_query F
> +GLIBC_2.34 res_querydomain F
> +GLIBC_2.34 res_search F
>  GLIBC_2.34 res_send F
>  GLIBC_2.34 sem_clockwait F
>  GLIBC_2.34 sem_close F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/libresolv.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libresolv.abilist
> index 4f5160f474..8325eae8a5 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips64/n64/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/libresolv.abilist
> @@ -42,18 +42,9 @@ GLIBC_2.0 inet_neta F
>  GLIBC_2.0 res_gethostbyaddr F
>  GLIBC_2.0 res_gethostbyname F
>  GLIBC_2.0 res_gethostbyname2 F
> -GLIBC_2.0 res_query F
> -GLIBC_2.0 res_querydomain F
> -GLIBC_2.0 res_search F
>  GLIBC_2.0 res_send_setqhook F
>  GLIBC_2.0 res_send_setrhook F
>  GLIBC_2.2 __res_hostalias F
> -GLIBC_2.2 __res_nquery F
> -GLIBC_2.2 __res_nquerydomain F
> -GLIBC_2.2 __res_nsearch F
> -GLIBC_2.2 __res_query F
> -GLIBC_2.2 __res_querydomain F
> -GLIBC_2.2 __res_search F
>  GLIBC_2.3.2 __p_rcode F
>  GLIBC_2.9 ns_datetosecs F
>  GLIBC_2.9 ns_format_ttl F
> diff --git a/sysdeps/unix/sysv/linux/nios2/libc.abilist b/sysdeps/unix/sysv/linux/nios2/libc.abilist
> index b98437e5fc..dfb14647d2 100644
> --- a/sysdeps/unix/sysv/linux/nios2/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/nios2/libc.abilist
> @@ -426,9 +426,15 @@ 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_nquery F
> +GLIBC_2.21 __res_nquerydomain F
> +GLIBC_2.21 __res_nsearch F
>  GLIBC_2.21 __res_nsend F
>  GLIBC_2.21 __res_ownok F
> +GLIBC_2.21 __res_query F
> +GLIBC_2.21 __res_querydomain F
>  GLIBC_2.21 __res_randomid F
> +GLIBC_2.21 __res_search F
>  GLIBC_2.21 __res_send F
>  GLIBC_2.21 __res_state F
>  GLIBC_2.21 __rpc_thread_createerr F
> @@ -2684,8 +2690,14 @@ GLIBC_2.34 res_hnok F
>  GLIBC_2.34 res_mailok F
>  GLIBC_2.34 res_mkquery F
>  GLIBC_2.34 res_nmkquery F
> +GLIBC_2.34 res_nquery F
> +GLIBC_2.34 res_nquerydomain F
> +GLIBC_2.34 res_nsearch F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
> +GLIBC_2.34 res_query F
> +GLIBC_2.34 res_querydomain F
> +GLIBC_2.34 res_search F
>  GLIBC_2.34 res_send F
>  GLIBC_2.34 sem_clockwait F
>  GLIBC_2.34 sem_close F
> diff --git a/sysdeps/unix/sysv/linux/nios2/libresolv.abilist b/sysdeps/unix/sysv/linux/nios2/libresolv.abilist
> index 23c5250a0c..e1d606503a 100644
> --- a/sysdeps/unix/sysv/linux/nios2/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/nios2/libresolv.abilist
> @@ -26,13 +26,7 @@ GLIBC_2.21 __res_close F
>  GLIBC_2.21 __res_hostalias F
>  GLIBC_2.21 __res_isourserver F
>  GLIBC_2.21 __res_nameinquery F
> -GLIBC_2.21 __res_nquery F
> -GLIBC_2.21 __res_nquerydomain F
> -GLIBC_2.21 __res_nsearch F
>  GLIBC_2.21 __res_queriesmatch F
> -GLIBC_2.21 __res_query F
> -GLIBC_2.21 __res_querydomain F
> -GLIBC_2.21 __res_search F
>  GLIBC_2.21 __sym_ntop F
>  GLIBC_2.21 __sym_ntos F
>  GLIBC_2.21 __sym_ston F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
> index 6c311d2a5f..930dccea8e 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
> @@ -989,6 +989,9 @@ GLIBC_2.0 remque F
>  GLIBC_2.0 rename F
>  GLIBC_2.0 res_init F
>  GLIBC_2.0 res_mkquery F
> +GLIBC_2.0 res_query F
> +GLIBC_2.0 res_querydomain F
> +GLIBC_2.0 res_search F
>  GLIBC_2.0 revoke F
>  GLIBC_2.0 rewind F
>  GLIBC_2.0 rewinddir F
> @@ -1948,7 +1951,13 @@ GLIBC_2.2 __res_mkquery F
>  GLIBC_2.2 __res_nclose F
>  GLIBC_2.2 __res_ninit F
>  GLIBC_2.2 __res_nmkquery F
> +GLIBC_2.2 __res_nquery F
> +GLIBC_2.2 __res_nquerydomain F
> +GLIBC_2.2 __res_nsearch F
>  GLIBC_2.2 __res_nsend F
> +GLIBC_2.2 __res_query F
> +GLIBC_2.2 __res_querydomain F
> +GLIBC_2.2 __res_search F
>  GLIBC_2.2 __res_state F
>  GLIBC_2.2 __setmntent F
>  GLIBC_2.2 __statfs F
> @@ -2696,8 +2705,14 @@ GLIBC_2.34 res_hnok F
>  GLIBC_2.34 res_mailok F
>  GLIBC_2.34 res_mkquery F
>  GLIBC_2.34 res_nmkquery F
> +GLIBC_2.34 res_nquery F
> +GLIBC_2.34 res_nquerydomain F
> +GLIBC_2.34 res_nsearch F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
> +GLIBC_2.34 res_query F
> +GLIBC_2.34 res_querydomain F
> +GLIBC_2.34 res_search F
>  GLIBC_2.34 res_send F
>  GLIBC_2.34 sem_clockwait F
>  GLIBC_2.34 sem_close F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libresolv.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libresolv.abilist
> index f2707204ed..56dcd57b6c 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libresolv.abilist
> @@ -42,18 +42,9 @@ GLIBC_2.0 inet_neta F
>  GLIBC_2.0 res_gethostbyaddr F
>  GLIBC_2.0 res_gethostbyname F
>  GLIBC_2.0 res_gethostbyname2 F
> -GLIBC_2.0 res_query F
> -GLIBC_2.0 res_querydomain F
> -GLIBC_2.0 res_search F
>  GLIBC_2.0 res_send_setqhook F
>  GLIBC_2.0 res_send_setrhook F
>  GLIBC_2.2 __res_hostalias F
> -GLIBC_2.2 __res_nquery F
> -GLIBC_2.2 __res_nquerydomain F
> -GLIBC_2.2 __res_nsearch F
> -GLIBC_2.2 __res_query F
> -GLIBC_2.2 __res_querydomain F
> -GLIBC_2.2 __res_search F
>  GLIBC_2.3.2 __p_rcode F
>  GLIBC_2.9 ns_datetosecs F
>  GLIBC_2.9 ns_format_ttl F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
> index c6d7f1cff4..29bb3ddc35 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
> @@ -989,6 +989,9 @@ GLIBC_2.0 remque F
>  GLIBC_2.0 rename F
>  GLIBC_2.0 res_init F
>  GLIBC_2.0 res_mkquery F
> +GLIBC_2.0 res_query F
> +GLIBC_2.0 res_querydomain F
> +GLIBC_2.0 res_search F
>  GLIBC_2.0 revoke F
>  GLIBC_2.0 rewind F
>  GLIBC_2.0 rewinddir F
> @@ -1952,7 +1955,13 @@ GLIBC_2.2 __res_mkquery F
>  GLIBC_2.2 __res_nclose F
>  GLIBC_2.2 __res_ninit F
>  GLIBC_2.2 __res_nmkquery F
> +GLIBC_2.2 __res_nquery F
> +GLIBC_2.2 __res_nquerydomain F
> +GLIBC_2.2 __res_nsearch F
>  GLIBC_2.2 __res_nsend F
> +GLIBC_2.2 __res_query F
> +GLIBC_2.2 __res_querydomain F
> +GLIBC_2.2 __res_search F
>  GLIBC_2.2 __res_state F
>  GLIBC_2.2 __setmntent F
>  GLIBC_2.2 __statfs F
> @@ -2729,8 +2738,14 @@ GLIBC_2.34 res_hnok F
>  GLIBC_2.34 res_mailok F
>  GLIBC_2.34 res_mkquery F
>  GLIBC_2.34 res_nmkquery F
> +GLIBC_2.34 res_nquery F
> +GLIBC_2.34 res_nquerydomain F
> +GLIBC_2.34 res_nsearch F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
> +GLIBC_2.34 res_query F
> +GLIBC_2.34 res_querydomain F
> +GLIBC_2.34 res_search F
>  GLIBC_2.34 res_send F
>  GLIBC_2.34 sem_clockwait F
>  GLIBC_2.34 sem_close F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
> index f8e69c7fd3..5d0b01d486 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
> @@ -472,9 +472,15 @@ 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_nquery F
> +GLIBC_2.3 __res_nquerydomain F
> +GLIBC_2.3 __res_nsearch F
>  GLIBC_2.3 __res_nsend F
>  GLIBC_2.3 __res_ownok F
> +GLIBC_2.3 __res_query F
> +GLIBC_2.3 __res_querydomain F
>  GLIBC_2.3 __res_randomid F
> +GLIBC_2.3 __res_search F
>  GLIBC_2.3 __res_send F
>  GLIBC_2.3 __res_state F
>  GLIBC_2.3 __rpc_thread_createerr F
> @@ -2463,8 +2469,14 @@ GLIBC_2.34 res_hnok F
>  GLIBC_2.34 res_mailok F
>  GLIBC_2.34 res_mkquery F
>  GLIBC_2.34 res_nmkquery F
> +GLIBC_2.34 res_nquery F
> +GLIBC_2.34 res_nquerydomain F
> +GLIBC_2.34 res_nsearch F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
> +GLIBC_2.34 res_query F
> +GLIBC_2.34 res_querydomain F
> +GLIBC_2.34 res_search F
>  GLIBC_2.34 res_send F
>  GLIBC_2.34 sem_clockwait F
>  GLIBC_2.34 sem_close F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libresolv.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libresolv.abilist
> index 4d1fb69bc6..55dfc1d558 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libresolv.abilist
> @@ -25,13 +25,7 @@ GLIBC_2.3 __res_close F
>  GLIBC_2.3 __res_hostalias F
>  GLIBC_2.3 __res_isourserver F
>  GLIBC_2.3 __res_nameinquery F
> -GLIBC_2.3 __res_nquery F
> -GLIBC_2.3 __res_nquerydomain F
> -GLIBC_2.3 __res_nsearch F
>  GLIBC_2.3 __res_queriesmatch F
> -GLIBC_2.3 __res_query F
> -GLIBC_2.3 __res_querydomain F
> -GLIBC_2.3 __res_search F
>  GLIBC_2.3 __sym_ntop F
>  GLIBC_2.3 __sym_ntos F
>  GLIBC_2.3 __sym_ston F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
> index 6b0a84c8f6..b82e3af690 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
> @@ -474,9 +474,15 @@ 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_nquery F
> +GLIBC_2.17 __res_nquerydomain F
> +GLIBC_2.17 __res_nsearch F
>  GLIBC_2.17 __res_nsend F
>  GLIBC_2.17 __res_ownok F
> +GLIBC_2.17 __res_query F
> +GLIBC_2.17 __res_querydomain F
>  GLIBC_2.17 __res_randomid F
> +GLIBC_2.17 __res_search F
>  GLIBC_2.17 __res_send F
>  GLIBC_2.17 __res_state F
>  GLIBC_2.17 __rpc_thread_createerr F
> @@ -2765,8 +2771,14 @@ GLIBC_2.34 res_hnok F
>  GLIBC_2.34 res_mailok F
>  GLIBC_2.34 res_mkquery F
>  GLIBC_2.34 res_nmkquery F
> +GLIBC_2.34 res_nquery F
> +GLIBC_2.34 res_nquerydomain F
> +GLIBC_2.34 res_nsearch F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
> +GLIBC_2.34 res_query F
> +GLIBC_2.34 res_querydomain F
> +GLIBC_2.34 res_search F
>  GLIBC_2.34 res_send F
>  GLIBC_2.34 sem_clockwait F
>  GLIBC_2.34 sem_close F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libresolv.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libresolv.abilist
> index 702d13c633..3d4bfe3179 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libresolv.abilist
> @@ -26,13 +26,7 @@ GLIBC_2.17 __res_close F
>  GLIBC_2.17 __res_hostalias F
>  GLIBC_2.17 __res_isourserver F
>  GLIBC_2.17 __res_nameinquery F
> -GLIBC_2.17 __res_nquery F
> -GLIBC_2.17 __res_nquerydomain F
> -GLIBC_2.17 __res_nsearch F
>  GLIBC_2.17 __res_queriesmatch F
> -GLIBC_2.17 __res_query F
> -GLIBC_2.17 __res_querydomain F
> -GLIBC_2.17 __res_search F
>  GLIBC_2.17 __sym_ntop F
>  GLIBC_2.17 __sym_ntos F
>  GLIBC_2.17 __sym_ston F
> diff --git a/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist b/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
> index 080d87a80b..03a9a617b8 100644
> --- a/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
> @@ -374,9 +374,15 @@ 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_nquery F
> +GLIBC_2.33 __res_nquerydomain F
> +GLIBC_2.33 __res_nsearch F
>  GLIBC_2.33 __res_nsend F
>  GLIBC_2.33 __res_ownok F
> +GLIBC_2.33 __res_query F
> +GLIBC_2.33 __res_querydomain F
>  GLIBC_2.33 __res_randomid F
> +GLIBC_2.33 __res_search F
>  GLIBC_2.33 __res_send F
>  GLIBC_2.33 __res_state F
>  GLIBC_2.33 __riscv_flush_icache F
> @@ -2330,8 +2336,14 @@ GLIBC_2.34 res_hnok F
>  GLIBC_2.34 res_mailok F
>  GLIBC_2.34 res_mkquery F
>  GLIBC_2.34 res_nmkquery F
> +GLIBC_2.34 res_nquery F
> +GLIBC_2.34 res_nquerydomain F
> +GLIBC_2.34 res_nsearch F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
> +GLIBC_2.34 res_query F
> +GLIBC_2.34 res_querydomain F
> +GLIBC_2.34 res_search F
>  GLIBC_2.34 res_send F
>  GLIBC_2.34 sem_clockwait F
>  GLIBC_2.34 sem_close F
> diff --git a/sysdeps/unix/sysv/linux/riscv/rv32/libresolv.abilist b/sysdeps/unix/sysv/linux/riscv/rv32/libresolv.abilist
> index 50daff9908..e4e29c8a20 100644
> --- a/sysdeps/unix/sysv/linux/riscv/rv32/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/riscv/rv32/libresolv.abilist
> @@ -25,13 +25,7 @@ GLIBC_2.33 __res_close F
>  GLIBC_2.33 __res_hostalias F
>  GLIBC_2.33 __res_isourserver F
>  GLIBC_2.33 __res_nameinquery F
> -GLIBC_2.33 __res_nquery F
> -GLIBC_2.33 __res_nquerydomain F
> -GLIBC_2.33 __res_nsearch F
>  GLIBC_2.33 __res_queriesmatch F
> -GLIBC_2.33 __res_query F
> -GLIBC_2.33 __res_querydomain F
> -GLIBC_2.33 __res_search F
>  GLIBC_2.33 __sym_ntop F
>  GLIBC_2.33 __sym_ntos F
>  GLIBC_2.33 __sym_ston F
> diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
> index 53b33d1504..42c0f86aaa 100644
> --- a/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
> @@ -385,9 +385,15 @@ 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_nquery F
> +GLIBC_2.27 __res_nquerydomain F
> +GLIBC_2.27 __res_nsearch F
>  GLIBC_2.27 __res_nsend F
>  GLIBC_2.27 __res_ownok F
> +GLIBC_2.27 __res_query F
> +GLIBC_2.27 __res_querydomain F
>  GLIBC_2.27 __res_randomid F
> +GLIBC_2.27 __res_search F
>  GLIBC_2.27 __res_send F
>  GLIBC_2.27 __res_state F
>  GLIBC_2.27 __riscv_flush_icache F
> @@ -2530,8 +2536,14 @@ GLIBC_2.34 res_hnok F
>  GLIBC_2.34 res_mailok F
>  GLIBC_2.34 res_mkquery F
>  GLIBC_2.34 res_nmkquery F
> +GLIBC_2.34 res_nquery F
> +GLIBC_2.34 res_nquerydomain F
> +GLIBC_2.34 res_nsearch F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
> +GLIBC_2.34 res_query F
> +GLIBC_2.34 res_querydomain F
> +GLIBC_2.34 res_search F
>  GLIBC_2.34 res_send F
>  GLIBC_2.34 sem_clockwait F
>  GLIBC_2.34 sem_close F
> diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libresolv.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libresolv.abilist
> index 050ca355e2..57f214e869 100644
> --- a/sysdeps/unix/sysv/linux/riscv/rv64/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/riscv/rv64/libresolv.abilist
> @@ -25,13 +25,7 @@ GLIBC_2.27 __res_close F
>  GLIBC_2.27 __res_hostalias F
>  GLIBC_2.27 __res_isourserver F
>  GLIBC_2.27 __res_nameinquery F
> -GLIBC_2.27 __res_nquery F
> -GLIBC_2.27 __res_nquerydomain F
> -GLIBC_2.27 __res_nsearch F
>  GLIBC_2.27 __res_queriesmatch F
> -GLIBC_2.27 __res_query F
> -GLIBC_2.27 __res_querydomain F
> -GLIBC_2.27 __res_search F
>  GLIBC_2.27 __sym_ntop F
>  GLIBC_2.27 __sym_ntos F
>  GLIBC_2.27 __sym_ston F
> diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
> index d1d59f0021..3f15b3edc5 100644
> --- a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
> @@ -980,6 +980,9 @@ GLIBC_2.0 remque F
>  GLIBC_2.0 rename F
>  GLIBC_2.0 res_init F
>  GLIBC_2.0 res_mkquery F
> +GLIBC_2.0 res_query F
> +GLIBC_2.0 res_querydomain F
> +GLIBC_2.0 res_search F
>  GLIBC_2.0 revoke F
>  GLIBC_2.0 rewind F
>  GLIBC_2.0 rewinddir F
> @@ -1946,7 +1949,13 @@ GLIBC_2.2 __res_mkquery F
>  GLIBC_2.2 __res_nclose F
>  GLIBC_2.2 __res_ninit F
>  GLIBC_2.2 __res_nmkquery F
> +GLIBC_2.2 __res_nquery F
> +GLIBC_2.2 __res_nquerydomain F
> +GLIBC_2.2 __res_nsearch F
>  GLIBC_2.2 __res_nsend F
> +GLIBC_2.2 __res_query F
> +GLIBC_2.2 __res_querydomain F
> +GLIBC_2.2 __res_search F
>  GLIBC_2.2 __res_state F
>  GLIBC_2.2 __setmntent F
>  GLIBC_2.2 __statfs F
> @@ -2694,8 +2703,14 @@ GLIBC_2.34 res_hnok F
>  GLIBC_2.34 res_mailok F
>  GLIBC_2.34 res_mkquery F
>  GLIBC_2.34 res_nmkquery F
> +GLIBC_2.34 res_nquery F
> +GLIBC_2.34 res_nquerydomain F
> +GLIBC_2.34 res_nsearch F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
> +GLIBC_2.34 res_query F
> +GLIBC_2.34 res_querydomain F
> +GLIBC_2.34 res_search F
>  GLIBC_2.34 res_send F
>  GLIBC_2.34 sem_clockwait F
>  GLIBC_2.34 sem_close F
> diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libresolv.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libresolv.abilist
> index f2707204ed..56dcd57b6c 100644
> --- a/sysdeps/unix/sysv/linux/s390/s390-32/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/s390/s390-32/libresolv.abilist
> @@ -42,18 +42,9 @@ GLIBC_2.0 inet_neta F
>  GLIBC_2.0 res_gethostbyaddr F
>  GLIBC_2.0 res_gethostbyname F
>  GLIBC_2.0 res_gethostbyname2 F
> -GLIBC_2.0 res_query F
> -GLIBC_2.0 res_querydomain F
> -GLIBC_2.0 res_search F
>  GLIBC_2.0 res_send_setqhook F
>  GLIBC_2.0 res_send_setrhook F
>  GLIBC_2.2 __res_hostalias F
> -GLIBC_2.2 __res_nquery F
> -GLIBC_2.2 __res_nquerydomain F
> -GLIBC_2.2 __res_nsearch F
> -GLIBC_2.2 __res_query F
> -GLIBC_2.2 __res_querydomain F
> -GLIBC_2.2 __res_search F
>  GLIBC_2.3.2 __p_rcode F
>  GLIBC_2.9 ns_datetosecs F
>  GLIBC_2.9 ns_format_ttl F
> diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
> index ca3e7ebc6d..c24face132 100644
> --- a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
> @@ -416,9 +416,15 @@ GLIBC_2.2 __res_mkquery F
>  GLIBC_2.2 __res_nclose F
>  GLIBC_2.2 __res_ninit F
>  GLIBC_2.2 __res_nmkquery F
> +GLIBC_2.2 __res_nquery F
> +GLIBC_2.2 __res_nquerydomain F
> +GLIBC_2.2 __res_nsearch F
>  GLIBC_2.2 __res_nsend F
>  GLIBC_2.2 __res_ownok F
> +GLIBC_2.2 __res_query F
> +GLIBC_2.2 __res_querydomain F
>  GLIBC_2.2 __res_randomid F
> +GLIBC_2.2 __res_search F
>  GLIBC_2.2 __res_send F
>  GLIBC_2.2 __res_state F
>  GLIBC_2.2 __sbrk F
> @@ -2500,8 +2506,14 @@ GLIBC_2.34 res_hnok F
>  GLIBC_2.34 res_mailok F
>  GLIBC_2.34 res_mkquery F
>  GLIBC_2.34 res_nmkquery F
> +GLIBC_2.34 res_nquery F
> +GLIBC_2.34 res_nquerydomain F
> +GLIBC_2.34 res_nsearch F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
> +GLIBC_2.34 res_query F
> +GLIBC_2.34 res_querydomain F
> +GLIBC_2.34 res_search F
>  GLIBC_2.34 res_send F
>  GLIBC_2.34 sem_clockwait F
>  GLIBC_2.34 sem_close F
> diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libresolv.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libresolv.abilist
> index 3b8ffd2766..7f2b4f6cab 100644
> --- a/sysdeps/unix/sysv/linux/s390/s390-64/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/s390/s390-64/libresolv.abilist
> @@ -25,13 +25,7 @@ GLIBC_2.2 __res_close F
>  GLIBC_2.2 __res_hostalias F
>  GLIBC_2.2 __res_isourserver F
>  GLIBC_2.2 __res_nameinquery F
> -GLIBC_2.2 __res_nquery F
> -GLIBC_2.2 __res_nquerydomain F
> -GLIBC_2.2 __res_nsearch F
>  GLIBC_2.2 __res_queriesmatch F
> -GLIBC_2.2 __res_query F
> -GLIBC_2.2 __res_querydomain F
> -GLIBC_2.2 __res_search F
>  GLIBC_2.2 __sym_ntop F
>  GLIBC_2.2 __sym_ntos F
>  GLIBC_2.2 __sym_ston F
> diff --git a/sysdeps/unix/sysv/linux/sh/be/libc.abilist b/sysdeps/unix/sysv/linux/sh/be/libc.abilist
> index fcde356a18..ddcf105058 100644
> --- a/sysdeps/unix/sysv/linux/sh/be/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/sh/be/libc.abilist
> @@ -22,6 +22,9 @@ GLIBC_2.0 logout F
>  GLIBC_2.0 logwtmp F
>  GLIBC_2.0 openpty 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.1 aio_cancel F
>  GLIBC_2.1 aio_cancel64 F
>  GLIBC_2.1 aio_error F
> @@ -436,8 +439,14 @@ GLIBC_2.2 __res_mkquery F
>  GLIBC_2.2 __res_nclose F
>  GLIBC_2.2 __res_ninit F
>  GLIBC_2.2 __res_nmkquery F
> +GLIBC_2.2 __res_nquery F
> +GLIBC_2.2 __res_nquerydomain F
> +GLIBC_2.2 __res_nsearch F
>  GLIBC_2.2 __res_nsend F
> +GLIBC_2.2 __res_query F
> +GLIBC_2.2 __res_querydomain F
>  GLIBC_2.2 __res_randomid F
> +GLIBC_2.2 __res_search F
>  GLIBC_2.2 __res_state F
>  GLIBC_2.2 __sbrk F
>  GLIBC_2.2 __sched_get_priority_max F
> @@ -2549,8 +2558,14 @@ GLIBC_2.34 res_hnok F
>  GLIBC_2.34 res_mailok F
>  GLIBC_2.34 res_mkquery F
>  GLIBC_2.34 res_nmkquery F
> +GLIBC_2.34 res_nquery F
> +GLIBC_2.34 res_nquerydomain F
> +GLIBC_2.34 res_nsearch F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
> +GLIBC_2.34 res_query F
> +GLIBC_2.34 res_querydomain F
> +GLIBC_2.34 res_search F
>  GLIBC_2.34 res_send F
>  GLIBC_2.34 sem_clockwait F
>  GLIBC_2.34 sem_close F
> diff --git a/sysdeps/unix/sysv/linux/sh/be/libresolv.abilist b/sysdeps/unix/sysv/linux/sh/be/libresolv.abilist
> index f2707204ed..56dcd57b6c 100644
> --- a/sysdeps/unix/sysv/linux/sh/be/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/sh/be/libresolv.abilist
> @@ -42,18 +42,9 @@ GLIBC_2.0 inet_neta F
>  GLIBC_2.0 res_gethostbyaddr F
>  GLIBC_2.0 res_gethostbyname F
>  GLIBC_2.0 res_gethostbyname2 F
> -GLIBC_2.0 res_query F
> -GLIBC_2.0 res_querydomain F
> -GLIBC_2.0 res_search F
>  GLIBC_2.0 res_send_setqhook F
>  GLIBC_2.0 res_send_setrhook F
>  GLIBC_2.2 __res_hostalias F
> -GLIBC_2.2 __res_nquery F
> -GLIBC_2.2 __res_nquerydomain F
> -GLIBC_2.2 __res_nsearch F
> -GLIBC_2.2 __res_query F
> -GLIBC_2.2 __res_querydomain F
> -GLIBC_2.2 __res_search F
>  GLIBC_2.3.2 __p_rcode F
>  GLIBC_2.9 ns_datetosecs F
>  GLIBC_2.9 ns_format_ttl F
> diff --git a/sysdeps/unix/sysv/linux/sh/le/libc.abilist b/sysdeps/unix/sysv/linux/sh/le/libc.abilist
> index 18dffb1d62..916630a82c 100644
> --- a/sysdeps/unix/sysv/linux/sh/le/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/sh/le/libc.abilist
> @@ -22,6 +22,9 @@ GLIBC_2.0 logout F
>  GLIBC_2.0 logwtmp F
>  GLIBC_2.0 openpty 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.1 aio_cancel F
>  GLIBC_2.1 aio_cancel64 F
>  GLIBC_2.1 aio_error F
> @@ -436,8 +439,14 @@ GLIBC_2.2 __res_mkquery F
>  GLIBC_2.2 __res_nclose F
>  GLIBC_2.2 __res_ninit F
>  GLIBC_2.2 __res_nmkquery F
> +GLIBC_2.2 __res_nquery F
> +GLIBC_2.2 __res_nquerydomain F
> +GLIBC_2.2 __res_nsearch F
>  GLIBC_2.2 __res_nsend F
> +GLIBC_2.2 __res_query F
> +GLIBC_2.2 __res_querydomain F
>  GLIBC_2.2 __res_randomid F
> +GLIBC_2.2 __res_search F
>  GLIBC_2.2 __res_state F
>  GLIBC_2.2 __sbrk F
>  GLIBC_2.2 __sched_get_priority_max F
> @@ -2546,8 +2555,14 @@ GLIBC_2.34 res_hnok F
>  GLIBC_2.34 res_mailok F
>  GLIBC_2.34 res_mkquery F
>  GLIBC_2.34 res_nmkquery F
> +GLIBC_2.34 res_nquery F
> +GLIBC_2.34 res_nquerydomain F
> +GLIBC_2.34 res_nsearch F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
> +GLIBC_2.34 res_query F
> +GLIBC_2.34 res_querydomain F
> +GLIBC_2.34 res_search F
>  GLIBC_2.34 res_send F
>  GLIBC_2.34 sem_clockwait F
>  GLIBC_2.34 sem_close F
> diff --git a/sysdeps/unix/sysv/linux/sh/le/libresolv.abilist b/sysdeps/unix/sysv/linux/sh/le/libresolv.abilist
> index f2707204ed..56dcd57b6c 100644
> --- a/sysdeps/unix/sysv/linux/sh/le/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/sh/le/libresolv.abilist
> @@ -42,18 +42,9 @@ GLIBC_2.0 inet_neta F
>  GLIBC_2.0 res_gethostbyaddr F
>  GLIBC_2.0 res_gethostbyname F
>  GLIBC_2.0 res_gethostbyname2 F
> -GLIBC_2.0 res_query F
> -GLIBC_2.0 res_querydomain F
> -GLIBC_2.0 res_search F
>  GLIBC_2.0 res_send_setqhook F
>  GLIBC_2.0 res_send_setrhook F
>  GLIBC_2.2 __res_hostalias F
> -GLIBC_2.2 __res_nquery F
> -GLIBC_2.2 __res_nquerydomain F
> -GLIBC_2.2 __res_nsearch F
> -GLIBC_2.2 __res_query F
> -GLIBC_2.2 __res_querydomain F
> -GLIBC_2.2 __res_search F
>  GLIBC_2.3.2 __p_rcode F
>  GLIBC_2.9 ns_datetosecs F
>  GLIBC_2.9 ns_format_ttl F
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
> index 61fd09d562..c411653766 100644
> --- a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
> @@ -983,6 +983,9 @@ GLIBC_2.0 remque F
>  GLIBC_2.0 rename F
>  GLIBC_2.0 res_init F
>  GLIBC_2.0 res_mkquery F
> +GLIBC_2.0 res_query F
> +GLIBC_2.0 res_querydomain F
> +GLIBC_2.0 res_search F
>  GLIBC_2.0 revoke F
>  GLIBC_2.0 rewind F
>  GLIBC_2.0 rewinddir F
> @@ -1944,7 +1947,13 @@ GLIBC_2.2 __res_mkquery F
>  GLIBC_2.2 __res_nclose F
>  GLIBC_2.2 __res_ninit F
>  GLIBC_2.2 __res_nmkquery F
> +GLIBC_2.2 __res_nquery F
> +GLIBC_2.2 __res_nquerydomain F
> +GLIBC_2.2 __res_nsearch F
>  GLIBC_2.2 __res_nsend F
> +GLIBC_2.2 __res_query F
> +GLIBC_2.2 __res_querydomain F
> +GLIBC_2.2 __res_search F
>  GLIBC_2.2 __res_state F
>  GLIBC_2.2 __setmntent F
>  GLIBC_2.2 __statfs F
> @@ -2689,8 +2698,14 @@ GLIBC_2.34 res_hnok F
>  GLIBC_2.34 res_mailok F
>  GLIBC_2.34 res_mkquery F
>  GLIBC_2.34 res_nmkquery F
> +GLIBC_2.34 res_nquery F
> +GLIBC_2.34 res_nquerydomain F
> +GLIBC_2.34 res_nsearch F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
> +GLIBC_2.34 res_query F
> +GLIBC_2.34 res_querydomain F
> +GLIBC_2.34 res_search F
>  GLIBC_2.34 res_send F
>  GLIBC_2.34 sem_clockwait F
>  GLIBC_2.34 sem_close F
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libresolv.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libresolv.abilist
> index f2707204ed..56dcd57b6c 100644
> --- a/sysdeps/unix/sysv/linux/sparc/sparc32/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libresolv.abilist
> @@ -42,18 +42,9 @@ GLIBC_2.0 inet_neta F
>  GLIBC_2.0 res_gethostbyaddr F
>  GLIBC_2.0 res_gethostbyname F
>  GLIBC_2.0 res_gethostbyname2 F
> -GLIBC_2.0 res_query F
> -GLIBC_2.0 res_querydomain F
> -GLIBC_2.0 res_search F
>  GLIBC_2.0 res_send_setqhook F
>  GLIBC_2.0 res_send_setrhook F
>  GLIBC_2.2 __res_hostalias F
> -GLIBC_2.2 __res_nquery F
> -GLIBC_2.2 __res_nquerydomain F
> -GLIBC_2.2 __res_nsearch F
> -GLIBC_2.2 __res_query F
> -GLIBC_2.2 __res_querydomain F
> -GLIBC_2.2 __res_search F
>  GLIBC_2.3.2 __p_rcode F
>  GLIBC_2.9 ns_datetosecs F
>  GLIBC_2.9 ns_format_ttl F
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
> index fa300e44d6..8421b56ac5 100644
> --- a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
> @@ -22,6 +22,9 @@ GLIBC_2.0 logout F
>  GLIBC_2.0 logwtmp F
>  GLIBC_2.0 openpty 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.1 aio_cancel F
>  GLIBC_2.1 aio_cancel64 F
>  GLIBC_2.1 aio_error F
> @@ -477,8 +480,14 @@ GLIBC_2.2 __res_mkquery F
>  GLIBC_2.2 __res_nclose F
>  GLIBC_2.2 __res_ninit F
>  GLIBC_2.2 __res_nmkquery F
> +GLIBC_2.2 __res_nquery F
> +GLIBC_2.2 __res_nquerydomain F
> +GLIBC_2.2 __res_nsearch F
>  GLIBC_2.2 __res_nsend F
> +GLIBC_2.2 __res_query F
> +GLIBC_2.2 __res_querydomain F
>  GLIBC_2.2 __res_randomid F
> +GLIBC_2.2 __res_search F
>  GLIBC_2.2 __res_state F
>  GLIBC_2.2 __sbrk F
>  GLIBC_2.2 __sched_get_priority_max F
> @@ -2524,8 +2533,14 @@ GLIBC_2.34 res_hnok F
>  GLIBC_2.34 res_mailok F
>  GLIBC_2.34 res_mkquery F
>  GLIBC_2.34 res_nmkquery F
> +GLIBC_2.34 res_nquery F
> +GLIBC_2.34 res_nquerydomain F
> +GLIBC_2.34 res_nsearch F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
> +GLIBC_2.34 res_query F
> +GLIBC_2.34 res_querydomain F
> +GLIBC_2.34 res_search F
>  GLIBC_2.34 res_send F
>  GLIBC_2.34 sem_clockwait F
>  GLIBC_2.34 sem_close F
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libresolv.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libresolv.abilist
> index 4f5160f474..8325eae8a5 100644
> --- a/sysdeps/unix/sysv/linux/sparc/sparc64/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libresolv.abilist
> @@ -42,18 +42,9 @@ GLIBC_2.0 inet_neta F
>  GLIBC_2.0 res_gethostbyaddr F
>  GLIBC_2.0 res_gethostbyname F
>  GLIBC_2.0 res_gethostbyname2 F
> -GLIBC_2.0 res_query F
> -GLIBC_2.0 res_querydomain F
> -GLIBC_2.0 res_search F
>  GLIBC_2.0 res_send_setqhook F
>  GLIBC_2.0 res_send_setrhook F
>  GLIBC_2.2 __res_hostalias F
> -GLIBC_2.2 __res_nquery F
> -GLIBC_2.2 __res_nquerydomain F
> -GLIBC_2.2 __res_nsearch F
> -GLIBC_2.2 __res_query F
> -GLIBC_2.2 __res_querydomain F
> -GLIBC_2.2 __res_search F
>  GLIBC_2.3.2 __p_rcode F
>  GLIBC_2.9 ns_datetosecs F
>  GLIBC_2.9 ns_format_ttl F
> diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
> index 3160273a6f..04720305d4 100644
> --- a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
> @@ -400,9 +400,15 @@ 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_nquery F
> +GLIBC_2.2.5 __res_nquerydomain F
> +GLIBC_2.2.5 __res_nsearch F
>  GLIBC_2.2.5 __res_nsend F
>  GLIBC_2.2.5 __res_ownok F
> +GLIBC_2.2.5 __res_query F
> +GLIBC_2.2.5 __res_querydomain F
>  GLIBC_2.2.5 __res_randomid F
> +GLIBC_2.2.5 __res_search F
>  GLIBC_2.2.5 __res_send F
>  GLIBC_2.2.5 __res_state F
>  GLIBC_2.2.5 __rpc_thread_createerr F
> @@ -2478,8 +2484,14 @@ GLIBC_2.34 res_hnok F
>  GLIBC_2.34 res_mailok F
>  GLIBC_2.34 res_mkquery F
>  GLIBC_2.34 res_nmkquery F
> +GLIBC_2.34 res_nquery F
> +GLIBC_2.34 res_nquerydomain F
> +GLIBC_2.34 res_nsearch F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
> +GLIBC_2.34 res_query F
> +GLIBC_2.34 res_querydomain F
> +GLIBC_2.34 res_search F
>  GLIBC_2.34 res_send F
>  GLIBC_2.34 sem_clockwait F
>  GLIBC_2.34 sem_close F
> diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libresolv.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libresolv.abilist
> index e2a6207778..bd3596d3a3 100644
> --- a/sysdeps/unix/sysv/linux/x86_64/64/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/x86_64/64/libresolv.abilist
> @@ -25,13 +25,7 @@ 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_nameinquery F
> -GLIBC_2.2.5 __res_nquery F
> -GLIBC_2.2.5 __res_nquerydomain F
> -GLIBC_2.2.5 __res_nsearch F
>  GLIBC_2.2.5 __res_queriesmatch F
> -GLIBC_2.2.5 __res_query F
> -GLIBC_2.2.5 __res_querydomain F
> -GLIBC_2.2.5 __res_search F
>  GLIBC_2.2.5 __sym_ntop F
>  GLIBC_2.2.5 __sym_ntos F
>  GLIBC_2.2.5 __sym_ston F
> diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
> index 886414793c..3981f2eb31 100644
> --- a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
> @@ -389,9 +389,15 @@ 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_nquery F
> +GLIBC_2.16 __res_nquerydomain F
> +GLIBC_2.16 __res_nsearch F
>  GLIBC_2.16 __res_nsend F
>  GLIBC_2.16 __res_ownok F
> +GLIBC_2.16 __res_query F
> +GLIBC_2.16 __res_querydomain F
>  GLIBC_2.16 __res_randomid F
> +GLIBC_2.16 __res_search F
>  GLIBC_2.16 __res_send F
>  GLIBC_2.16 __res_state F
>  GLIBC_2.16 __rpc_thread_createerr F
> @@ -2584,8 +2590,14 @@ GLIBC_2.34 res_hnok F
>  GLIBC_2.34 res_mailok F
>  GLIBC_2.34 res_mkquery F
>  GLIBC_2.34 res_nmkquery F
> +GLIBC_2.34 res_nquery F
> +GLIBC_2.34 res_nquerydomain F
> +GLIBC_2.34 res_nsearch F
>  GLIBC_2.34 res_nsend F
>  GLIBC_2.34 res_ownok F
> +GLIBC_2.34 res_query F
> +GLIBC_2.34 res_querydomain F
> +GLIBC_2.34 res_search F
>  GLIBC_2.34 res_send F
>  GLIBC_2.34 sem_clockwait F
>  GLIBC_2.34 sem_close F
> diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libresolv.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libresolv.abilist
> index b7564c49cc..aa5227882b 100644
> --- a/sysdeps/unix/sysv/linux/x86_64/x32/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/x86_64/x32/libresolv.abilist
> @@ -26,13 +26,7 @@ GLIBC_2.16 __res_close F
>  GLIBC_2.16 __res_hostalias F
>  GLIBC_2.16 __res_isourserver F
>  GLIBC_2.16 __res_nameinquery F
> -GLIBC_2.16 __res_nquery F
> -GLIBC_2.16 __res_nquerydomain F
> -GLIBC_2.16 __res_nsearch F
>  GLIBC_2.16 __res_queriesmatch F
> -GLIBC_2.16 __res_query F
> -GLIBC_2.16 __res_querydomain F
> -GLIBC_2.16 __res_search F
>  GLIBC_2.16 __sym_ntop F
>  GLIBC_2.16 __sym_ntos F
>  GLIBC_2.16 __sym_ston F
> 

OK.
  

Patch

diff --git a/resolv/Makefile b/resolv/Makefile
index 31658202d3..4ba58dfa96 100644
--- a/resolv/Makefile
+++ b/resolv/Makefile
@@ -57,6 +57,7 @@  routines := \
   res_mkquery \
   res_nameinquery \
   res_queriesmatch \
+  res_query \
   res_randomid \
   res_send \
   resolv_conf \
@@ -156,7 +157,6 @@  libresolv-routines := \
   res_debug \
   res_hostalias \
   res_isourserver \
-  res_query \
   resolv-deprecated \
   # libresolv-routines
 
diff --git a/resolv/Versions b/resolv/Versions
index fcaf9fada7..f8b7700a1e 100644
--- a/resolv/Versions
+++ b/resolv/Versions
@@ -18,6 +18,9 @@  libc {
     hstrerror;
     res_init;
     res_mkquery;
+    res_query;
+    res_querydomain;
+    res_search;
   }
   GLIBC_2.2 {
     __dn_expand;
@@ -26,7 +29,13 @@  libc {
     __res_nclose;
     __res_ninit;
     __res_nmkquery;
+    __res_nquery;
+    __res_nquerydomain;
+    __res_nsearch;
     __res_nsend;
+    __res_query;
+    __res_querydomain;
+    __res_search;
     __res_state;
     _res_hconf;
   }
@@ -69,8 +78,14 @@  libc {
     res_mailok;
     res_mkquery;
     res_nmkquery;
+    res_nquery;
+    res_nquerydomain;
+    res_nsearch;
     res_nsend;
     res_ownok;
+    res_query;
+    res_querydomain;
+    res_search;
     res_send;
   }
   GLIBC_PRIVATE {
@@ -97,6 +112,8 @@  libc {
     __ns_name_unpack;
     __res_context_hostalias;
     __res_context_mkquery;
+    __res_context_query;
+    __res_context_search;
     __res_context_send;
     __res_context_send;
     __res_get_nsaddr;
@@ -158,20 +175,11 @@  libresolv {
     res_gethostbyaddr;
     res_gethostbyname2;
     res_gethostbyname;
-    res_query;
-    res_querydomain;
-    res_search;
     res_send_setqhook;
     res_send_setrhook;
   }
   GLIBC_2.2 {
     __res_hostalias;
-    __res_nquery;
-    __res_nquerydomain;
-    __res_nsearch;
-    __res_query;
-    __res_querydomain;
-    __res_search;
   }
   GLIBC_2.3.2 {
     __p_rcode;
@@ -202,8 +210,6 @@  libresolv {
   GLIBC_PRIVATE {
     __ns_get16;
     __ns_get32;
-    __res_context_query;
-    __res_context_search;
   }
 }
 
diff --git a/resolv/res_query.c b/resolv/res_query.c
index 2457193d31..75b0e5f2f7 100644
--- a/resolv/res_query.c
+++ b/resolv/res_query.c
@@ -276,7 +276,7 @@  __res_context_query (struct resolv_context *ctx, const char *name,
  success:
 	return (n);
 }
-libresolv_hidden_def (__res_context_query)
+libc_hidden_def (__res_context_query)
 
 /* Common part of res_nquery and res_query.  */
 static int
@@ -296,23 +296,34 @@  context_query_common (struct resolv_context *ctx,
 }
 
 int
-res_nquery(res_state statp,
-	   const char *name,	/* domain name */
-	   int class, int type,	/* class and type of query */
-	   u_char *answer,	/* buffer to put answer */
-	   int anslen)		/* size of answer buffer */
+___res_nquery (res_state statp,
+	       const char *name,      /* Domain name.  */
+	       int class, int type,   /* Class and type of query.  */
+	       unsigned char *answer, /* Buffer to put answer.  */
+	       int anslen)	      /* Size of answer buffer.  */
 {
   return context_query_common
     (__resolv_context_get_override (statp), name, class, type, answer, anslen);
 }
+versioned_symbol (libc, ___res_nquery, res_nquery, GLIBC_2_34);
+#if OTHER_SHLIB_COMPAT (libresolv, GLIBC_2_2, GLIBC_2_34)
+compat_symbol (libresolv, ___res_nquery, __res_nquery, GLIBC_2_2);
+#endif
 
 int
-res_query (const char *name, int class, int type,
-	   unsigned char *answer, int anslen)
+___res_query (const char *name, int class, int type,
+	      unsigned char *answer, int anslen)
 {
   return context_query_common
     (__resolv_context_get (), name, class, type, answer, anslen);
 }
+versioned_symbol (libc, ___res_query, res_query, GLIBC_2_34);
+#if OTHER_SHLIB_COMPAT (libresolv, GLIBC_2_0, GLIBC_2_2)
+compat_symbol (libresolv, ___res_query, res_query, GLIBC_2_0);
+#endif
+#if OTHER_SHLIB_COMPAT (libresolv, GLIBC_2_2, GLIBC_2_34)
+compat_symbol (libresolv, ___res_query, __res_query, GLIBC_2_2);
+#endif
 
 /* Formulate a normal query, send, and retrieve answer in supplied
    buffer.  Return the size of the response on success, -1 on error.
@@ -515,7 +526,7 @@  __res_context_search (struct resolv_context *ctx,
 		RES_SET_H_ERRNO(statp, TRY_AGAIN);
 	return (-1);
 }
-libresolv_hidden_def (__res_context_search)
+libc_hidden_def (__res_context_search)
 
 /* Common part of res_nsearch and res_search.  */
 static int
@@ -535,23 +546,34 @@  context_search_common (struct resolv_context *ctx,
 }
 
 int
-res_nsearch(res_state statp,
-	    const char *name,	/* domain name */
-	    int class, int type,	/* class and type of query */
-	    u_char *answer,	/* buffer to put answer */
-	    int anslen)		/* size of answer */
+___res_nsearch (res_state statp,
+		const char *name,      /* Domain name.  */
+		int class, int type,   /* Class and type of query.  */
+		unsigned char *answer, /* Buffer to put answer.  */
+		int anslen)	       /* Size of answer.  */
 {
   return context_search_common
     (__resolv_context_get_override (statp), name, class, type, answer, anslen);
 }
+versioned_symbol (libc, ___res_nsearch, res_nsearch, GLIBC_2_34);
+#if OTHER_SHLIB_COMPAT (libresolv, GLIBC_2_2, GLIBC_2_34)
+compat_symbol (libresolv, ___res_nsearch, __res_nsearch, GLIBC_2_2);
+#endif
 
 int
-res_search (const char *name, int class, int type,
-	    unsigned char *answer, int anslen)
+___res_search (const char *name, int class, int type,
+	       unsigned char *answer, int anslen)
 {
   return context_search_common
     (__resolv_context_get (), name, class, type, answer, anslen);
 }
+versioned_symbol (libc, ___res_search, res_search, GLIBC_2_34);
+#if OTHER_SHLIB_COMPAT (libresolv, GLIBC_2_0, GLIBC_2_2)
+compat_symbol (libresolv, ___res_search, res_search, GLIBC_2_0);
+#endif
+#if OTHER_SHLIB_COMPAT (libresolv, GLIBC_2_2, GLIBC_2_34)
+compat_symbol (libresolv, ___res_search, __res_search, GLIBC_2_2);
+#endif
 
 /*  Perform a call on res_query on the concatenation of name and
     domain.  */
@@ -615,31 +637,33 @@  context_querydomain_common (struct resolv_context *ctx,
 }
 
 int
-res_nquerydomain(res_state statp,
-	    const char *name,
-	    const char *domain,
-	    int class, int type,	/* class and type of query */
-	    u_char *answer,		/* buffer to put answer */
-	    int anslen)		/* size of answer */
+___res_nquerydomain (res_state statp,
+		     const char *name,
+		     const char *domain,
+		     int class, int type, /* Class and type of query.  */
+		     unsigned char *answer, /* Buffer to put answer.  */
+		     int anslen)	    /* Size of answer.  */
 {
   return context_querydomain_common
     (__resolv_context_get_override (statp),
      name, domain, class, type, answer, anslen);
 }
+versioned_symbol (libc, ___res_nquerydomain, res_nquerydomain, GLIBC_2_34);
+#if OTHER_SHLIB_COMPAT (libresolv, GLIBC_2_2, GLIBC_2_34)
+compat_symbol (libresolv, ___res_nquerydomain, __res_nquerydomain, GLIBC_2_2);
+#endif
 
 int
-res_querydomain (const char *name, const char *domain, int class, int type,
-		 unsigned char *answer, int anslen)
+___res_querydomain (const char *name, const char *domain, int class, int type,
+		    unsigned char *answer, int anslen)
 {
   return context_querydomain_common
     (__resolv_context_get (), name, domain, class, type, answer, anslen);
 }
-
-#if SHLIB_COMPAT (libresolv, GLIBC_2_0, GLIBC_2_2)
-# undef res_query
-# undef res_querydomain
-# undef res_search
-weak_alias (__res_query, res_query);
-weak_alias (__res_querydomain, res_querydomain);
-weak_alias (__res_search, res_search);
+versioned_symbol (libc, ___res_querydomain, res_querydomain, GLIBC_2_34);
+#if OTHER_SHLIB_COMPAT (libresolv, GLIBC_2_0, GLIBC_2_2)
+compat_symbol (libresolv, ___res_querydomain, res_querydomain, GLIBC_2_0);
+#endif
+#if OTHER_SHLIB_COMPAT (libresolv, GLIBC_2_2, GLIBC_2_34)
+compat_symbol (libresolv, ___res_querydomain, __res_querydomain, GLIBC_2_2);
 #endif
diff --git a/resolv/resolv-internal.h b/resolv/resolv-internal.h
index 3cf8a77698..216e47ed42 100644
--- a/resolv/resolv-internal.h
+++ b/resolv/resolv-internal.h
@@ -62,13 +62,13 @@  libc_hidden_proto (__res_context_mkquery)
 int __res_context_search (struct resolv_context *, const char *, int, int,
                           unsigned char *, int, unsigned char **,
                           unsigned char **, int *, int *, int *);
-libresolv_hidden_proto (__res_context_search)
+libc_hidden_proto (__res_context_search)
 
 /* Main resolver query function for use within glibc.  */
 int __res_context_query (struct resolv_context *, const char *, int, int,
                          unsigned char *, int, unsigned char **,
                          unsigned char **, int *, int *, int *);
-libresolv_hidden_proto (__res_context_query)
+libc_hidden_proto (__res_context_query)
 
 /* Internal function used to implement the query and search
    functions.  */
diff --git a/resolv/resolv.h b/resolv/resolv.h
index e50b8d08d7..f2a8641e82 100644
--- a/resolv/resolv.h
+++ b/resolv/resolv.h
@@ -168,9 +168,6 @@  __END_DECLS
 #define res_close		__res_close
 #define res_init		__res_init
 #define res_isourserver		__res_isourserver
-#define res_query		__res_query
-#define res_querydomain		__res_querydomain
-#define res_search		__res_search
 
 #ifdef _LIBC
 # define __RESOLV_DEPRECATED
@@ -227,9 +224,6 @@  __END_DECLS
 #define res_nameinquery		__res_nameinquery
 #define res_nclose		__res_nclose
 #define res_ninit		__res_ninit
-#define res_nquery		__res_nquery
-#define res_nquerydomain	__res_nquerydomain
-#define res_nsearch		__res_nsearch
 #define res_queriesmatch	__res_queriesmatch
 #define res_randomid		__res_randomid
 #define sym_ntop		__sym_ntop
diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist
index 092f1b8ffb..db955bd396 100644
--- a/sysdeps/mach/hurd/i386/libc.abilist
+++ b/sysdeps/mach/hurd/i386/libc.abilist
@@ -409,9 +409,15 @@  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_nquery F
+GLIBC_2.2.6 __res_nquerydomain F
+GLIBC_2.2.6 __res_nsearch F
 GLIBC_2.2.6 __res_nsend F
 GLIBC_2.2.6 __res_ownok F
+GLIBC_2.2.6 __res_query F
+GLIBC_2.2.6 __res_querydomain F
 GLIBC_2.2.6 __res_randomid F
+GLIBC_2.2.6 __res_search F
 GLIBC_2.2.6 __res_send F
 GLIBC_2.2.6 __res_state F
 GLIBC_2.2.6 __rpc_thread_createerr F
@@ -2267,8 +2273,14 @@  GLIBC_2.34 res_hnok F
 GLIBC_2.34 res_mailok F
 GLIBC_2.34 res_mkquery F
 GLIBC_2.34 res_nmkquery F
+GLIBC_2.34 res_nquery F
+GLIBC_2.34 res_nquerydomain F
+GLIBC_2.34 res_nsearch F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
+GLIBC_2.34 res_query F
+GLIBC_2.34 res_querydomain F
+GLIBC_2.34 res_search F
 GLIBC_2.34 res_send F
 GLIBC_2.34 shm_open F
 GLIBC_2.34 shm_unlink F
diff --git a/sysdeps/mach/hurd/i386/libresolv.abilist b/sysdeps/mach/hurd/i386/libresolv.abilist
index 3ef54cc28e..8b633891cf 100644
--- a/sysdeps/mach/hurd/i386/libresolv.abilist
+++ b/sysdeps/mach/hurd/i386/libresolv.abilist
@@ -25,13 +25,7 @@  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_nameinquery F
-GLIBC_2.2.6 __res_nquery F
-GLIBC_2.2.6 __res_nquerydomain F
-GLIBC_2.2.6 __res_nsearch F
 GLIBC_2.2.6 __res_queriesmatch F
-GLIBC_2.2.6 __res_query F
-GLIBC_2.2.6 __res_querydomain F
-GLIBC_2.2.6 __res_search F
 GLIBC_2.2.6 __sym_ntop F
 GLIBC_2.2.6 __sym_ntos F
 GLIBC_2.2.6 __sym_ston F
diff --git a/sysdeps/unix/sysv/linux/aarch64/libc.abilist b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
index 7e1529bd90..afa6a526ac 100644
--- a/sysdeps/unix/sysv/linux/aarch64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
@@ -388,9 +388,15 @@  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_nquery F
+GLIBC_2.17 __res_nquerydomain F
+GLIBC_2.17 __res_nsearch F
 GLIBC_2.17 __res_nsend F
 GLIBC_2.17 __res_ownok F
+GLIBC_2.17 __res_query F
+GLIBC_2.17 __res_querydomain F
 GLIBC_2.17 __res_randomid F
+GLIBC_2.17 __res_search F
 GLIBC_2.17 __res_send F
 GLIBC_2.17 __res_state F
 GLIBC_2.17 __rpc_thread_createerr F
@@ -2569,8 +2575,14 @@  GLIBC_2.34 res_hnok F
 GLIBC_2.34 res_mailok F
 GLIBC_2.34 res_mkquery F
 GLIBC_2.34 res_nmkquery F
+GLIBC_2.34 res_nquery F
+GLIBC_2.34 res_nquerydomain F
+GLIBC_2.34 res_nsearch F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
+GLIBC_2.34 res_query F
+GLIBC_2.34 res_querydomain F
+GLIBC_2.34 res_search F
 GLIBC_2.34 res_send F
 GLIBC_2.34 sem_clockwait F
 GLIBC_2.34 sem_close F
diff --git a/sysdeps/unix/sysv/linux/aarch64/libresolv.abilist b/sysdeps/unix/sysv/linux/aarch64/libresolv.abilist
index 702d13c633..3d4bfe3179 100644
--- a/sysdeps/unix/sysv/linux/aarch64/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/aarch64/libresolv.abilist
@@ -26,13 +26,7 @@  GLIBC_2.17 __res_close F
 GLIBC_2.17 __res_hostalias F
 GLIBC_2.17 __res_isourserver F
 GLIBC_2.17 __res_nameinquery F
-GLIBC_2.17 __res_nquery F
-GLIBC_2.17 __res_nquerydomain F
-GLIBC_2.17 __res_nsearch F
 GLIBC_2.17 __res_queriesmatch F
-GLIBC_2.17 __res_query F
-GLIBC_2.17 __res_querydomain F
-GLIBC_2.17 __res_search F
 GLIBC_2.17 __sym_ntop F
 GLIBC_2.17 __sym_ntos F
 GLIBC_2.17 __sym_ston F
diff --git a/sysdeps/unix/sysv/linux/alpha/libc.abilist b/sysdeps/unix/sysv/linux/alpha/libc.abilist
index 89ee2ed645..66688182b1 100644
--- a/sysdeps/unix/sysv/linux/alpha/libc.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist
@@ -1005,6 +1005,9 @@  GLIBC_2.0 remque F
 GLIBC_2.0 rename F
 GLIBC_2.0 res_init F
 GLIBC_2.0 res_mkquery F
+GLIBC_2.0 res_query F
+GLIBC_2.0 res_querydomain F
+GLIBC_2.0 res_search F
 GLIBC_2.0 revoke F
 GLIBC_2.0 rewind F
 GLIBC_2.0 rewinddir F
@@ -1982,7 +1985,13 @@  GLIBC_2.2 __res_mkquery F
 GLIBC_2.2 __res_nclose F
 GLIBC_2.2 __res_ninit F
 GLIBC_2.2 __res_nmkquery F
+GLIBC_2.2 __res_nquery F
+GLIBC_2.2 __res_nquerydomain F
+GLIBC_2.2 __res_nsearch F
 GLIBC_2.2 __res_nsend F
+GLIBC_2.2 __res_query F
+GLIBC_2.2 __res_querydomain F
+GLIBC_2.2 __res_search F
 GLIBC_2.2 __res_state F
 GLIBC_2.2 __setmntent F
 GLIBC_2.2 __statfs F
@@ -2663,8 +2672,14 @@  GLIBC_2.34 res_hnok F
 GLIBC_2.34 res_mailok F
 GLIBC_2.34 res_mkquery F
 GLIBC_2.34 res_nmkquery F
+GLIBC_2.34 res_nquery F
+GLIBC_2.34 res_nquerydomain F
+GLIBC_2.34 res_nsearch F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
+GLIBC_2.34 res_query F
+GLIBC_2.34 res_querydomain F
+GLIBC_2.34 res_search F
 GLIBC_2.34 res_send F
 GLIBC_2.34 sem_clockwait F
 GLIBC_2.34 sem_close F
diff --git a/sysdeps/unix/sysv/linux/alpha/libresolv.abilist b/sysdeps/unix/sysv/linux/alpha/libresolv.abilist
index 4f5160f474..8325eae8a5 100644
--- a/sysdeps/unix/sysv/linux/alpha/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libresolv.abilist
@@ -42,18 +42,9 @@  GLIBC_2.0 inet_neta F
 GLIBC_2.0 res_gethostbyaddr F
 GLIBC_2.0 res_gethostbyname F
 GLIBC_2.0 res_gethostbyname2 F
-GLIBC_2.0 res_query F
-GLIBC_2.0 res_querydomain F
-GLIBC_2.0 res_search F
 GLIBC_2.0 res_send_setqhook F
 GLIBC_2.0 res_send_setrhook F
 GLIBC_2.2 __res_hostalias F
-GLIBC_2.2 __res_nquery F
-GLIBC_2.2 __res_nquerydomain F
-GLIBC_2.2 __res_nsearch F
-GLIBC_2.2 __res_query F
-GLIBC_2.2 __res_querydomain F
-GLIBC_2.2 __res_search F
 GLIBC_2.3.2 __p_rcode F
 GLIBC_2.9 ns_datetosecs F
 GLIBC_2.9 ns_format_ttl F
diff --git a/sysdeps/unix/sysv/linux/arc/libc.abilist b/sysdeps/unix/sysv/linux/arc/libc.abilist
index cf320c4bce..cd935c4015 100644
--- a/sysdeps/unix/sysv/linux/arc/libc.abilist
+++ b/sysdeps/unix/sysv/linux/arc/libc.abilist
@@ -377,9 +377,15 @@  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_nquery F
+GLIBC_2.32 __res_nquerydomain F
+GLIBC_2.32 __res_nsearch F
 GLIBC_2.32 __res_nsend F
 GLIBC_2.32 __res_ownok F
+GLIBC_2.32 __res_query F
+GLIBC_2.32 __res_querydomain F
 GLIBC_2.32 __res_randomid F
+GLIBC_2.32 __res_search F
 GLIBC_2.32 __res_send F
 GLIBC_2.32 __res_state F
 GLIBC_2.32 __sbrk F
@@ -2328,8 +2334,14 @@  GLIBC_2.34 res_hnok F
 GLIBC_2.34 res_mailok F
 GLIBC_2.34 res_mkquery F
 GLIBC_2.34 res_nmkquery F
+GLIBC_2.34 res_nquery F
+GLIBC_2.34 res_nquerydomain F
+GLIBC_2.34 res_nsearch F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
+GLIBC_2.34 res_query F
+GLIBC_2.34 res_querydomain F
+GLIBC_2.34 res_search F
 GLIBC_2.34 res_send F
 GLIBC_2.34 sem_clockwait F
 GLIBC_2.34 sem_close F
diff --git a/sysdeps/unix/sysv/linux/arc/libresolv.abilist b/sysdeps/unix/sysv/linux/arc/libresolv.abilist
index ee92f2ae58..47c5072f61 100644
--- a/sysdeps/unix/sysv/linux/arc/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/arc/libresolv.abilist
@@ -25,13 +25,7 @@  GLIBC_2.32 __res_close F
 GLIBC_2.32 __res_hostalias F
 GLIBC_2.32 __res_isourserver F
 GLIBC_2.32 __res_nameinquery F
-GLIBC_2.32 __res_nquery F
-GLIBC_2.32 __res_nquerydomain F
-GLIBC_2.32 __res_nsearch F
 GLIBC_2.32 __res_queriesmatch F
-GLIBC_2.32 __res_query F
-GLIBC_2.32 __res_querydomain F
-GLIBC_2.32 __res_search F
 GLIBC_2.32 __sym_ntop F
 GLIBC_2.32 __sym_ntos F
 GLIBC_2.32 __sym_ston F
diff --git a/sysdeps/unix/sysv/linux/arm/be/libc.abilist b/sysdeps/unix/sysv/linux/arm/be/libc.abilist
index 7b395d2683..e1026b6077 100644
--- a/sysdeps/unix/sysv/linux/arm/be/libc.abilist
+++ b/sysdeps/unix/sysv/linux/arm/be/libc.abilist
@@ -444,8 +444,14 @@  GLIBC_2.34 res_hnok F
 GLIBC_2.34 res_mailok F
 GLIBC_2.34 res_mkquery F
 GLIBC_2.34 res_nmkquery F
+GLIBC_2.34 res_nquery F
+GLIBC_2.34 res_nquerydomain F
+GLIBC_2.34 res_nsearch F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
+GLIBC_2.34 res_query F
+GLIBC_2.34 res_querydomain F
+GLIBC_2.34 res_search F
 GLIBC_2.34 res_send F
 GLIBC_2.34 sem_clockwait F
 GLIBC_2.34 sem_close F
@@ -849,9 +855,15 @@  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_nquery F
+GLIBC_2.4 __res_nquerydomain F
+GLIBC_2.4 __res_nsearch F
 GLIBC_2.4 __res_nsend F
 GLIBC_2.4 __res_ownok F
+GLIBC_2.4 __res_query F
+GLIBC_2.4 __res_querydomain F
 GLIBC_2.4 __res_randomid F
+GLIBC_2.4 __res_search F
 GLIBC_2.4 __res_send F
 GLIBC_2.4 __res_state F
 GLIBC_2.4 __rpc_thread_createerr F
diff --git a/sysdeps/unix/sysv/linux/arm/be/libresolv.abilist b/sysdeps/unix/sysv/linux/arm/be/libresolv.abilist
index ee4f6a36e9..06018c2f04 100644
--- a/sysdeps/unix/sysv/linux/arm/be/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/arm/be/libresolv.abilist
@@ -26,13 +26,7 @@  GLIBC_2.4 __res_close F
 GLIBC_2.4 __res_hostalias F
 GLIBC_2.4 __res_isourserver F
 GLIBC_2.4 __res_nameinquery F
-GLIBC_2.4 __res_nquery F
-GLIBC_2.4 __res_nquerydomain F
-GLIBC_2.4 __res_nsearch F
 GLIBC_2.4 __res_queriesmatch F
-GLIBC_2.4 __res_query F
-GLIBC_2.4 __res_querydomain F
-GLIBC_2.4 __res_search F
 GLIBC_2.4 __sym_ntop F
 GLIBC_2.4 __sym_ntos F
 GLIBC_2.4 __sym_ston F
diff --git a/sysdeps/unix/sysv/linux/arm/le/libc.abilist b/sysdeps/unix/sysv/linux/arm/le/libc.abilist
index 9a2aefac45..aa45c60686 100644
--- a/sysdeps/unix/sysv/linux/arm/le/libc.abilist
+++ b/sysdeps/unix/sysv/linux/arm/le/libc.abilist
@@ -441,8 +441,14 @@  GLIBC_2.34 res_hnok F
 GLIBC_2.34 res_mailok F
 GLIBC_2.34 res_mkquery F
 GLIBC_2.34 res_nmkquery F
+GLIBC_2.34 res_nquery F
+GLIBC_2.34 res_nquerydomain F
+GLIBC_2.34 res_nsearch F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
+GLIBC_2.34 res_query F
+GLIBC_2.34 res_querydomain F
+GLIBC_2.34 res_search F
 GLIBC_2.34 res_send F
 GLIBC_2.34 sem_clockwait F
 GLIBC_2.34 sem_close F
@@ -846,9 +852,15 @@  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_nquery F
+GLIBC_2.4 __res_nquerydomain F
+GLIBC_2.4 __res_nsearch F
 GLIBC_2.4 __res_nsend F
 GLIBC_2.4 __res_ownok F
+GLIBC_2.4 __res_query F
+GLIBC_2.4 __res_querydomain F
 GLIBC_2.4 __res_randomid F
+GLIBC_2.4 __res_search F
 GLIBC_2.4 __res_send F
 GLIBC_2.4 __res_state F
 GLIBC_2.4 __rpc_thread_createerr F
diff --git a/sysdeps/unix/sysv/linux/arm/le/libresolv.abilist b/sysdeps/unix/sysv/linux/arm/le/libresolv.abilist
index ee4f6a36e9..06018c2f04 100644
--- a/sysdeps/unix/sysv/linux/arm/le/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/arm/le/libresolv.abilist
@@ -26,13 +26,7 @@  GLIBC_2.4 __res_close F
 GLIBC_2.4 __res_hostalias F
 GLIBC_2.4 __res_isourserver F
 GLIBC_2.4 __res_nameinquery F
-GLIBC_2.4 __res_nquery F
-GLIBC_2.4 __res_nquerydomain F
-GLIBC_2.4 __res_nsearch F
 GLIBC_2.4 __res_queriesmatch F
-GLIBC_2.4 __res_query F
-GLIBC_2.4 __res_querydomain F
-GLIBC_2.4 __res_search F
 GLIBC_2.4 __sym_ntop F
 GLIBC_2.4 __sym_ntos F
 GLIBC_2.4 __sym_ston F
diff --git a/sysdeps/unix/sysv/linux/csky/libc.abilist b/sysdeps/unix/sysv/linux/csky/libc.abilist
index eb8efa378b..f385a7cb66 100644
--- a/sysdeps/unix/sysv/linux/csky/libc.abilist
+++ b/sysdeps/unix/sysv/linux/csky/libc.abilist
@@ -381,9 +381,15 @@  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_nquery F
+GLIBC_2.29 __res_nquerydomain F
+GLIBC_2.29 __res_nsearch F
 GLIBC_2.29 __res_nsend F
 GLIBC_2.29 __res_ownok F
+GLIBC_2.29 __res_query F
+GLIBC_2.29 __res_querydomain F
 GLIBC_2.29 __res_randomid F
+GLIBC_2.29 __res_search F
 GLIBC_2.29 __res_send F
 GLIBC_2.29 __res_state F
 GLIBC_2.29 __rpc_thread_createerr F
@@ -2594,8 +2600,14 @@  GLIBC_2.34 res_hnok F
 GLIBC_2.34 res_mailok F
 GLIBC_2.34 res_mkquery F
 GLIBC_2.34 res_nmkquery F
+GLIBC_2.34 res_nquery F
+GLIBC_2.34 res_nquerydomain F
+GLIBC_2.34 res_nsearch F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
+GLIBC_2.34 res_query F
+GLIBC_2.34 res_querydomain F
+GLIBC_2.34 res_search F
 GLIBC_2.34 res_send F
 GLIBC_2.34 sem_clockwait F
 GLIBC_2.34 sem_close F
diff --git a/sysdeps/unix/sysv/linux/csky/libresolv.abilist b/sysdeps/unix/sysv/linux/csky/libresolv.abilist
index f4ae402b6f..1b37befe82 100644
--- a/sysdeps/unix/sysv/linux/csky/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/csky/libresolv.abilist
@@ -25,13 +25,7 @@  GLIBC_2.29 __res_close F
 GLIBC_2.29 __res_hostalias F
 GLIBC_2.29 __res_isourserver F
 GLIBC_2.29 __res_nameinquery F
-GLIBC_2.29 __res_nquery F
-GLIBC_2.29 __res_nquerydomain F
-GLIBC_2.29 __res_nsearch F
 GLIBC_2.29 __res_queriesmatch F
-GLIBC_2.29 __res_query F
-GLIBC_2.29 __res_querydomain F
-GLIBC_2.29 __res_search F
 GLIBC_2.29 __sym_ntop F
 GLIBC_2.29 __sym_ntos F
 GLIBC_2.29 __sym_ston F
diff --git a/sysdeps/unix/sysv/linux/hppa/libc.abilist b/sysdeps/unix/sysv/linux/hppa/libc.abilist
index 4c3d7674ff..6ed506e5ec 100644
--- a/sysdeps/unix/sysv/linux/hppa/libc.abilist
+++ b/sysdeps/unix/sysv/linux/hppa/libc.abilist
@@ -18,6 +18,9 @@  GLIBC_2.0 logout F
 GLIBC_2.0 logwtmp F
 GLIBC_2.0 openpty 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.1 aio_cancel F
 GLIBC_2.1 aio_cancel64 F
 GLIBC_2.1 aio_error F
@@ -432,8 +435,14 @@  GLIBC_2.2 __res_mkquery F
 GLIBC_2.2 __res_nclose F
 GLIBC_2.2 __res_ninit F
 GLIBC_2.2 __res_nmkquery F
+GLIBC_2.2 __res_nquery F
+GLIBC_2.2 __res_nquerydomain F
+GLIBC_2.2 __res_nsearch F
 GLIBC_2.2 __res_nsend F
+GLIBC_2.2 __res_query F
+GLIBC_2.2 __res_querydomain F
 GLIBC_2.2 __res_randomid F
+GLIBC_2.2 __res_search F
 GLIBC_2.2 __res_state F
 GLIBC_2.2 __sbrk F
 GLIBC_2.2 __sched_get_priority_max F
@@ -2542,8 +2551,14 @@  GLIBC_2.34 res_hnok F
 GLIBC_2.34 res_mailok F
 GLIBC_2.34 res_mkquery F
 GLIBC_2.34 res_nmkquery F
+GLIBC_2.34 res_nquery F
+GLIBC_2.34 res_nquerydomain F
+GLIBC_2.34 res_nsearch F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
+GLIBC_2.34 res_query F
+GLIBC_2.34 res_querydomain F
+GLIBC_2.34 res_search F
 GLIBC_2.34 res_send F
 GLIBC_2.34 sem_clockwait F
 GLIBC_2.34 sem_close F
diff --git a/sysdeps/unix/sysv/linux/hppa/libresolv.abilist b/sysdeps/unix/sysv/linux/hppa/libresolv.abilist
index f2707204ed..56dcd57b6c 100644
--- a/sysdeps/unix/sysv/linux/hppa/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/hppa/libresolv.abilist
@@ -42,18 +42,9 @@  GLIBC_2.0 inet_neta F
 GLIBC_2.0 res_gethostbyaddr F
 GLIBC_2.0 res_gethostbyname F
 GLIBC_2.0 res_gethostbyname2 F
-GLIBC_2.0 res_query F
-GLIBC_2.0 res_querydomain F
-GLIBC_2.0 res_search F
 GLIBC_2.0 res_send_setqhook F
 GLIBC_2.0 res_send_setrhook F
 GLIBC_2.2 __res_hostalias F
-GLIBC_2.2 __res_nquery F
-GLIBC_2.2 __res_nquerydomain F
-GLIBC_2.2 __res_nsearch F
-GLIBC_2.2 __res_query F
-GLIBC_2.2 __res_querydomain F
-GLIBC_2.2 __res_search F
 GLIBC_2.3.2 __p_rcode F
 GLIBC_2.9 ns_datetosecs F
 GLIBC_2.9 ns_format_ttl F
diff --git a/sysdeps/unix/sysv/linux/i386/libc.abilist b/sysdeps/unix/sysv/linux/i386/libc.abilist
index 9f44807e02..8f28ecbb9c 100644
--- a/sysdeps/unix/sysv/linux/i386/libc.abilist
+++ b/sysdeps/unix/sysv/linux/i386/libc.abilist
@@ -982,6 +982,9 @@  GLIBC_2.0 remque F
 GLIBC_2.0 rename F
 GLIBC_2.0 res_init F
 GLIBC_2.0 res_mkquery F
+GLIBC_2.0 res_query F
+GLIBC_2.0 res_querydomain F
+GLIBC_2.0 res_search F
 GLIBC_2.0 revoke F
 GLIBC_2.0 rewind F
 GLIBC_2.0 rewinddir F
@@ -1986,7 +1989,13 @@  GLIBC_2.2 __res_mkquery F
 GLIBC_2.2 __res_nclose F
 GLIBC_2.2 __res_ninit F
 GLIBC_2.2 __res_nmkquery F
+GLIBC_2.2 __res_nquery F
+GLIBC_2.2 __res_nquerydomain F
+GLIBC_2.2 __res_nsearch F
 GLIBC_2.2 __res_nsend F
+GLIBC_2.2 __res_query F
+GLIBC_2.2 __res_querydomain F
+GLIBC_2.2 __res_search F
 GLIBC_2.2 __res_state F
 GLIBC_2.2 __setmntent F
 GLIBC_2.2 __statfs F
@@ -2726,8 +2735,14 @@  GLIBC_2.34 res_hnok F
 GLIBC_2.34 res_mailok F
 GLIBC_2.34 res_mkquery F
 GLIBC_2.34 res_nmkquery F
+GLIBC_2.34 res_nquery F
+GLIBC_2.34 res_nquerydomain F
+GLIBC_2.34 res_nsearch F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
+GLIBC_2.34 res_query F
+GLIBC_2.34 res_querydomain F
+GLIBC_2.34 res_search F
 GLIBC_2.34 res_send F
 GLIBC_2.34 sem_clockwait F
 GLIBC_2.34 sem_close F
diff --git a/sysdeps/unix/sysv/linux/i386/libresolv.abilist b/sysdeps/unix/sysv/linux/i386/libresolv.abilist
index f2707204ed..56dcd57b6c 100644
--- a/sysdeps/unix/sysv/linux/i386/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/i386/libresolv.abilist
@@ -42,18 +42,9 @@  GLIBC_2.0 inet_neta F
 GLIBC_2.0 res_gethostbyaddr F
 GLIBC_2.0 res_gethostbyname F
 GLIBC_2.0 res_gethostbyname2 F
-GLIBC_2.0 res_query F
-GLIBC_2.0 res_querydomain F
-GLIBC_2.0 res_search F
 GLIBC_2.0 res_send_setqhook F
 GLIBC_2.0 res_send_setrhook F
 GLIBC_2.2 __res_hostalias F
-GLIBC_2.2 __res_nquery F
-GLIBC_2.2 __res_nquerydomain F
-GLIBC_2.2 __res_nsearch F
-GLIBC_2.2 __res_query F
-GLIBC_2.2 __res_querydomain F
-GLIBC_2.2 __res_search F
 GLIBC_2.3.2 __p_rcode F
 GLIBC_2.9 ns_datetosecs F
 GLIBC_2.9 ns_format_ttl F
diff --git a/sysdeps/unix/sysv/linux/ia64/libc.abilist b/sysdeps/unix/sysv/linux/ia64/libc.abilist
index 63a3fa22ef..1acdafd19b 100644
--- a/sysdeps/unix/sysv/linux/ia64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/ia64/libc.abilist
@@ -18,6 +18,9 @@  GLIBC_2.0 logout F
 GLIBC_2.0 logwtmp F
 GLIBC_2.0 openpty 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.1 aio_cancel F
 GLIBC_2.1 aio_cancel64 F
 GLIBC_2.1 aio_error F
@@ -436,8 +439,14 @@  GLIBC_2.2 __res_mkquery F
 GLIBC_2.2 __res_nclose F
 GLIBC_2.2 __res_ninit F
 GLIBC_2.2 __res_nmkquery F
+GLIBC_2.2 __res_nquery F
+GLIBC_2.2 __res_nquerydomain F
+GLIBC_2.2 __res_nsearch F
 GLIBC_2.2 __res_nsend F
+GLIBC_2.2 __res_query F
+GLIBC_2.2 __res_querydomain F
 GLIBC_2.2 __res_randomid F
+GLIBC_2.2 __res_search F
 GLIBC_2.2 __res_state F
 GLIBC_2.2 __sbrk F
 GLIBC_2.2 __sched_get_priority_max F
@@ -2501,8 +2510,14 @@  GLIBC_2.34 res_hnok F
 GLIBC_2.34 res_mailok F
 GLIBC_2.34 res_mkquery F
 GLIBC_2.34 res_nmkquery F
+GLIBC_2.34 res_nquery F
+GLIBC_2.34 res_nquerydomain F
+GLIBC_2.34 res_nsearch F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
+GLIBC_2.34 res_query F
+GLIBC_2.34 res_querydomain F
+GLIBC_2.34 res_search F
 GLIBC_2.34 res_send F
 GLIBC_2.34 sem_clockwait F
 GLIBC_2.34 sem_close F
diff --git a/sysdeps/unix/sysv/linux/ia64/libresolv.abilist b/sysdeps/unix/sysv/linux/ia64/libresolv.abilist
index 4f5160f474..8325eae8a5 100644
--- a/sysdeps/unix/sysv/linux/ia64/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/ia64/libresolv.abilist
@@ -42,18 +42,9 @@  GLIBC_2.0 inet_neta F
 GLIBC_2.0 res_gethostbyaddr F
 GLIBC_2.0 res_gethostbyname F
 GLIBC_2.0 res_gethostbyname2 F
-GLIBC_2.0 res_query F
-GLIBC_2.0 res_querydomain F
-GLIBC_2.0 res_search F
 GLIBC_2.0 res_send_setqhook F
 GLIBC_2.0 res_send_setrhook F
 GLIBC_2.2 __res_hostalias F
-GLIBC_2.2 __res_nquery F
-GLIBC_2.2 __res_nquerydomain F
-GLIBC_2.2 __res_nsearch F
-GLIBC_2.2 __res_query F
-GLIBC_2.2 __res_querydomain F
-GLIBC_2.2 __res_search F
 GLIBC_2.3.2 __p_rcode F
 GLIBC_2.9 ns_datetosecs F
 GLIBC_2.9 ns_format_ttl F
diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
index 37bbdde23b..125f2cfbca 100644
--- a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
@@ -445,8 +445,14 @@  GLIBC_2.34 res_hnok F
 GLIBC_2.34 res_mailok F
 GLIBC_2.34 res_mkquery F
 GLIBC_2.34 res_nmkquery F
+GLIBC_2.34 res_nquery F
+GLIBC_2.34 res_nquerydomain F
+GLIBC_2.34 res_nsearch F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
+GLIBC_2.34 res_query F
+GLIBC_2.34 res_querydomain F
+GLIBC_2.34 res_search F
 GLIBC_2.34 res_send F
 GLIBC_2.34 sem_clockwait F
 GLIBC_2.34 sem_close F
@@ -835,9 +841,15 @@  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_nquery F
+GLIBC_2.4 __res_nquerydomain F
+GLIBC_2.4 __res_nsearch F
 GLIBC_2.4 __res_nsend F
 GLIBC_2.4 __res_ownok F
+GLIBC_2.4 __res_query F
+GLIBC_2.4 __res_querydomain F
 GLIBC_2.4 __res_randomid F
+GLIBC_2.4 __res_search F
 GLIBC_2.4 __res_send F
 GLIBC_2.4 __res_state F
 GLIBC_2.4 __rpc_thread_createerr F
diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libresolv.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libresolv.abilist
index ee4f6a36e9..06018c2f04 100644
--- a/sysdeps/unix/sysv/linux/m68k/coldfire/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libresolv.abilist
@@ -26,13 +26,7 @@  GLIBC_2.4 __res_close F
 GLIBC_2.4 __res_hostalias F
 GLIBC_2.4 __res_isourserver F
 GLIBC_2.4 __res_nameinquery F
-GLIBC_2.4 __res_nquery F
-GLIBC_2.4 __res_nquerydomain F
-GLIBC_2.4 __res_nsearch F
 GLIBC_2.4 __res_queriesmatch F
-GLIBC_2.4 __res_query F
-GLIBC_2.4 __res_querydomain F
-GLIBC_2.4 __res_search F
 GLIBC_2.4 __sym_ntop F
 GLIBC_2.4 __sym_ntos F
 GLIBC_2.4 __sym_ston F
diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
index bf0eb6e976..0e5d7c1b48 100644
--- a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
@@ -981,6 +981,9 @@  GLIBC_2.0 remque F
 GLIBC_2.0 rename F
 GLIBC_2.0 res_init F
 GLIBC_2.0 res_mkquery F
+GLIBC_2.0 res_query F
+GLIBC_2.0 res_querydomain F
+GLIBC_2.0 res_search F
 GLIBC_2.0 revoke F
 GLIBC_2.0 rewind F
 GLIBC_2.0 rewinddir F
@@ -1942,7 +1945,13 @@  GLIBC_2.2 __res_mkquery F
 GLIBC_2.2 __res_nclose F
 GLIBC_2.2 __res_ninit F
 GLIBC_2.2 __res_nmkquery F
+GLIBC_2.2 __res_nquery F
+GLIBC_2.2 __res_nquerydomain F
+GLIBC_2.2 __res_nsearch F
 GLIBC_2.2 __res_nsend F
+GLIBC_2.2 __res_query F
+GLIBC_2.2 __res_querydomain F
+GLIBC_2.2 __res_search F
 GLIBC_2.2 __res_state F
 GLIBC_2.2 __setmntent F
 GLIBC_2.2 __statfs F
@@ -2669,8 +2678,14 @@  GLIBC_2.34 res_hnok F
 GLIBC_2.34 res_mailok F
 GLIBC_2.34 res_mkquery F
 GLIBC_2.34 res_nmkquery F
+GLIBC_2.34 res_nquery F
+GLIBC_2.34 res_nquerydomain F
+GLIBC_2.34 res_nsearch F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
+GLIBC_2.34 res_query F
+GLIBC_2.34 res_querydomain F
+GLIBC_2.34 res_search F
 GLIBC_2.34 res_send F
 GLIBC_2.34 sem_clockwait F
 GLIBC_2.34 sem_close F
diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libresolv.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libresolv.abilist
index f2707204ed..56dcd57b6c 100644
--- a/sysdeps/unix/sysv/linux/m68k/m680x0/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libresolv.abilist
@@ -42,18 +42,9 @@  GLIBC_2.0 inet_neta F
 GLIBC_2.0 res_gethostbyaddr F
 GLIBC_2.0 res_gethostbyname F
 GLIBC_2.0 res_gethostbyname2 F
-GLIBC_2.0 res_query F
-GLIBC_2.0 res_querydomain F
-GLIBC_2.0 res_search F
 GLIBC_2.0 res_send_setqhook F
 GLIBC_2.0 res_send_setrhook F
 GLIBC_2.2 __res_hostalias F
-GLIBC_2.2 __res_nquery F
-GLIBC_2.2 __res_nquerydomain F
-GLIBC_2.2 __res_nsearch F
-GLIBC_2.2 __res_query F
-GLIBC_2.2 __res_querydomain F
-GLIBC_2.2 __res_search F
 GLIBC_2.3.2 __p_rcode F
 GLIBC_2.9 ns_datetosecs F
 GLIBC_2.9 ns_format_ttl F
diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
index d5d5771708..c44b106449 100644
--- a/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
@@ -389,9 +389,15 @@  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_nquery F
+GLIBC_2.18 __res_nquerydomain F
+GLIBC_2.18 __res_nsearch F
 GLIBC_2.18 __res_nsend F
 GLIBC_2.18 __res_ownok F
+GLIBC_2.18 __res_query F
+GLIBC_2.18 __res_querydomain F
 GLIBC_2.18 __res_randomid F
+GLIBC_2.18 __res_search F
 GLIBC_2.18 __res_send F
 GLIBC_2.18 __res_state F
 GLIBC_2.18 __rpc_thread_createerr F
@@ -2645,8 +2651,14 @@  GLIBC_2.34 res_hnok F
 GLIBC_2.34 res_mailok F
 GLIBC_2.34 res_mkquery F
 GLIBC_2.34 res_nmkquery F
+GLIBC_2.34 res_nquery F
+GLIBC_2.34 res_nquerydomain F
+GLIBC_2.34 res_nsearch F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
+GLIBC_2.34 res_query F
+GLIBC_2.34 res_querydomain F
+GLIBC_2.34 res_search F
 GLIBC_2.34 res_send F
 GLIBC_2.34 sem_clockwait F
 GLIBC_2.34 sem_close F
diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libresolv.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libresolv.abilist
index 9550bc22e1..9782b54587 100644
--- a/sysdeps/unix/sysv/linux/microblaze/be/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/be/libresolv.abilist
@@ -26,13 +26,7 @@  GLIBC_2.18 __res_close F
 GLIBC_2.18 __res_hostalias F
 GLIBC_2.18 __res_isourserver F
 GLIBC_2.18 __res_nameinquery F
-GLIBC_2.18 __res_nquery F
-GLIBC_2.18 __res_nquerydomain F
-GLIBC_2.18 __res_nsearch F
 GLIBC_2.18 __res_queriesmatch F
-GLIBC_2.18 __res_query F
-GLIBC_2.18 __res_querydomain F
-GLIBC_2.18 __res_search F
 GLIBC_2.18 __sym_ntop F
 GLIBC_2.18 __sym_ntos F
 GLIBC_2.18 __sym_ston F
diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
index 2f05d61c21..3c2edae799 100644
--- a/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
@@ -389,9 +389,15 @@  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_nquery F
+GLIBC_2.18 __res_nquerydomain F
+GLIBC_2.18 __res_nsearch F
 GLIBC_2.18 __res_nsend F
 GLIBC_2.18 __res_ownok F
+GLIBC_2.18 __res_query F
+GLIBC_2.18 __res_querydomain F
 GLIBC_2.18 __res_randomid F
+GLIBC_2.18 __res_search F
 GLIBC_2.18 __res_send F
 GLIBC_2.18 __res_state F
 GLIBC_2.18 __rpc_thread_createerr F
@@ -2642,8 +2648,14 @@  GLIBC_2.34 res_hnok F
 GLIBC_2.34 res_mailok F
 GLIBC_2.34 res_mkquery F
 GLIBC_2.34 res_nmkquery F
+GLIBC_2.34 res_nquery F
+GLIBC_2.34 res_nquerydomain F
+GLIBC_2.34 res_nsearch F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
+GLIBC_2.34 res_query F
+GLIBC_2.34 res_querydomain F
+GLIBC_2.34 res_search F
 GLIBC_2.34 res_send F
 GLIBC_2.34 sem_clockwait F
 GLIBC_2.34 sem_close F
diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libresolv.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libresolv.abilist
index 9550bc22e1..9782b54587 100644
--- a/sysdeps/unix/sysv/linux/microblaze/le/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/le/libresolv.abilist
@@ -26,13 +26,7 @@  GLIBC_2.18 __res_close F
 GLIBC_2.18 __res_hostalias F
 GLIBC_2.18 __res_isourserver F
 GLIBC_2.18 __res_nameinquery F
-GLIBC_2.18 __res_nquery F
-GLIBC_2.18 __res_nquerydomain F
-GLIBC_2.18 __res_nsearch F
 GLIBC_2.18 __res_queriesmatch F
-GLIBC_2.18 __res_query F
-GLIBC_2.18 __res_querydomain F
-GLIBC_2.18 __res_search F
 GLIBC_2.18 __sym_ntop F
 GLIBC_2.18 __sym_ntos F
 GLIBC_2.18 __sym_ston F
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
index 8d62d76ca5..41d8b812c6 100644
--- a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
@@ -978,6 +978,9 @@  GLIBC_2.0 remque F
 GLIBC_2.0 rename F
 GLIBC_2.0 res_init F
 GLIBC_2.0 res_mkquery F
+GLIBC_2.0 res_query F
+GLIBC_2.0 res_querydomain F
+GLIBC_2.0 res_search F
 GLIBC_2.0 revoke F
 GLIBC_2.0 rewind F
 GLIBC_2.0 rewinddir F
@@ -1595,7 +1598,13 @@  GLIBC_2.2 __res_mkquery F
 GLIBC_2.2 __res_nclose F
 GLIBC_2.2 __res_ninit F
 GLIBC_2.2 __res_nmkquery F
+GLIBC_2.2 __res_nquery F
+GLIBC_2.2 __res_nquerydomain F
+GLIBC_2.2 __res_nsearch F
 GLIBC_2.2 __res_nsend F
+GLIBC_2.2 __res_query F
+GLIBC_2.2 __res_querydomain F
+GLIBC_2.2 __res_search F
 GLIBC_2.2 __res_state F
 GLIBC_2.2 __setmntent F
 GLIBC_2.2 __signbit F
@@ -2634,8 +2643,14 @@  GLIBC_2.34 res_hnok F
 GLIBC_2.34 res_mailok F
 GLIBC_2.34 res_mkquery F
 GLIBC_2.34 res_nmkquery F
+GLIBC_2.34 res_nquery F
+GLIBC_2.34 res_nquerydomain F
+GLIBC_2.34 res_nsearch F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
+GLIBC_2.34 res_query F
+GLIBC_2.34 res_querydomain F
+GLIBC_2.34 res_search F
 GLIBC_2.34 res_send F
 GLIBC_2.34 sem_clockwait F
 GLIBC_2.34 sem_close F
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/libresolv.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libresolv.abilist
index f2707204ed..56dcd57b6c 100644
--- a/sysdeps/unix/sysv/linux/mips/mips32/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips32/libresolv.abilist
@@ -42,18 +42,9 @@  GLIBC_2.0 inet_neta F
 GLIBC_2.0 res_gethostbyaddr F
 GLIBC_2.0 res_gethostbyname F
 GLIBC_2.0 res_gethostbyname2 F
-GLIBC_2.0 res_query F
-GLIBC_2.0 res_querydomain F
-GLIBC_2.0 res_search F
 GLIBC_2.0 res_send_setqhook F
 GLIBC_2.0 res_send_setrhook F
 GLIBC_2.2 __res_hostalias F
-GLIBC_2.2 __res_nquery F
-GLIBC_2.2 __res_nquerydomain F
-GLIBC_2.2 __res_nsearch F
-GLIBC_2.2 __res_query F
-GLIBC_2.2 __res_querydomain F
-GLIBC_2.2 __res_search F
 GLIBC_2.3.2 __p_rcode F
 GLIBC_2.9 ns_datetosecs F
 GLIBC_2.9 ns_format_ttl F
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
index 68e086d203..875f68199a 100644
--- a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
@@ -978,6 +978,9 @@  GLIBC_2.0 remque F
 GLIBC_2.0 rename F
 GLIBC_2.0 res_init F
 GLIBC_2.0 res_mkquery F
+GLIBC_2.0 res_query F
+GLIBC_2.0 res_querydomain F
+GLIBC_2.0 res_search F
 GLIBC_2.0 revoke F
 GLIBC_2.0 rewind F
 GLIBC_2.0 rewinddir F
@@ -1593,7 +1596,13 @@  GLIBC_2.2 __res_mkquery F
 GLIBC_2.2 __res_nclose F
 GLIBC_2.2 __res_ninit F
 GLIBC_2.2 __res_nmkquery F
+GLIBC_2.2 __res_nquery F
+GLIBC_2.2 __res_nquerydomain F
+GLIBC_2.2 __res_nsearch F
 GLIBC_2.2 __res_nsend F
+GLIBC_2.2 __res_query F
+GLIBC_2.2 __res_querydomain F
+GLIBC_2.2 __res_search F
 GLIBC_2.2 __res_state F
 GLIBC_2.2 __setmntent F
 GLIBC_2.2 __signbit F
@@ -2632,8 +2641,14 @@  GLIBC_2.34 res_hnok F
 GLIBC_2.34 res_mailok F
 GLIBC_2.34 res_mkquery F
 GLIBC_2.34 res_nmkquery F
+GLIBC_2.34 res_nquery F
+GLIBC_2.34 res_nquerydomain F
+GLIBC_2.34 res_nsearch F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
+GLIBC_2.34 res_query F
+GLIBC_2.34 res_querydomain F
+GLIBC_2.34 res_search F
 GLIBC_2.34 res_send F
 GLIBC_2.34 sem_clockwait F
 GLIBC_2.34 sem_close F
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
index 14c19658c6..bca901db65 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
@@ -978,6 +978,9 @@  GLIBC_2.0 remque F
 GLIBC_2.0 rename F
 GLIBC_2.0 res_init F
 GLIBC_2.0 res_mkquery F
+GLIBC_2.0 res_query F
+GLIBC_2.0 res_querydomain F
+GLIBC_2.0 res_search F
 GLIBC_2.0 revoke F
 GLIBC_2.0 rewind F
 GLIBC_2.0 rewinddir F
@@ -1593,7 +1596,13 @@  GLIBC_2.2 __res_mkquery F
 GLIBC_2.2 __res_nclose F
 GLIBC_2.2 __res_ninit F
 GLIBC_2.2 __res_nmkquery F
+GLIBC_2.2 __res_nquery F
+GLIBC_2.2 __res_nquerydomain F
+GLIBC_2.2 __res_nsearch F
 GLIBC_2.2 __res_nsend F
+GLIBC_2.2 __res_query F
+GLIBC_2.2 __res_querydomain F
+GLIBC_2.2 __res_search F
 GLIBC_2.2 __res_state F
 GLIBC_2.2 __setmntent F
 GLIBC_2.2 __signbit F
@@ -2640,8 +2649,14 @@  GLIBC_2.34 res_hnok F
 GLIBC_2.34 res_mailok F
 GLIBC_2.34 res_mkquery F
 GLIBC_2.34 res_nmkquery F
+GLIBC_2.34 res_nquery F
+GLIBC_2.34 res_nquerydomain F
+GLIBC_2.34 res_nsearch F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
+GLIBC_2.34 res_query F
+GLIBC_2.34 res_querydomain F
+GLIBC_2.34 res_search F
 GLIBC_2.34 res_send F
 GLIBC_2.34 sem_clockwait F
 GLIBC_2.34 sem_close F
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/libresolv.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libresolv.abilist
index f2707204ed..56dcd57b6c 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/n32/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips64/n32/libresolv.abilist
@@ -42,18 +42,9 @@  GLIBC_2.0 inet_neta F
 GLIBC_2.0 res_gethostbyaddr F
 GLIBC_2.0 res_gethostbyname F
 GLIBC_2.0 res_gethostbyname2 F
-GLIBC_2.0 res_query F
-GLIBC_2.0 res_querydomain F
-GLIBC_2.0 res_search F
 GLIBC_2.0 res_send_setqhook F
 GLIBC_2.0 res_send_setrhook F
 GLIBC_2.2 __res_hostalias F
-GLIBC_2.2 __res_nquery F
-GLIBC_2.2 __res_nquerydomain F
-GLIBC_2.2 __res_nsearch F
-GLIBC_2.2 __res_query F
-GLIBC_2.2 __res_querydomain F
-GLIBC_2.2 __res_search F
 GLIBC_2.3.2 __p_rcode F
 GLIBC_2.9 ns_datetosecs F
 GLIBC_2.9 ns_format_ttl F
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
index 479115297c..29ddd75b77 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
@@ -976,6 +976,9 @@  GLIBC_2.0 remque F
 GLIBC_2.0 rename F
 GLIBC_2.0 res_init F
 GLIBC_2.0 res_mkquery F
+GLIBC_2.0 res_query F
+GLIBC_2.0 res_querydomain F
+GLIBC_2.0 res_search F
 GLIBC_2.0 revoke F
 GLIBC_2.0 rewind F
 GLIBC_2.0 rewinddir F
@@ -1589,7 +1592,13 @@  GLIBC_2.2 __res_mkquery F
 GLIBC_2.2 __res_nclose F
 GLIBC_2.2 __res_ninit F
 GLIBC_2.2 __res_nmkquery F
+GLIBC_2.2 __res_nquery F
+GLIBC_2.2 __res_nquerydomain F
+GLIBC_2.2 __res_nsearch F
 GLIBC_2.2 __res_nsend F
+GLIBC_2.2 __res_query F
+GLIBC_2.2 __res_querydomain F
+GLIBC_2.2 __res_search F
 GLIBC_2.2 __res_state F
 GLIBC_2.2 __setmntent F
 GLIBC_2.2 __signbit F
@@ -2552,8 +2561,14 @@  GLIBC_2.34 res_hnok F
 GLIBC_2.34 res_mailok F
 GLIBC_2.34 res_mkquery F
 GLIBC_2.34 res_nmkquery F
+GLIBC_2.34 res_nquery F
+GLIBC_2.34 res_nquerydomain F
+GLIBC_2.34 res_nsearch F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
+GLIBC_2.34 res_query F
+GLIBC_2.34 res_querydomain F
+GLIBC_2.34 res_search F
 GLIBC_2.34 res_send F
 GLIBC_2.34 sem_clockwait F
 GLIBC_2.34 sem_close F
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/libresolv.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libresolv.abilist
index 4f5160f474..8325eae8a5 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/n64/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/libresolv.abilist
@@ -42,18 +42,9 @@  GLIBC_2.0 inet_neta F
 GLIBC_2.0 res_gethostbyaddr F
 GLIBC_2.0 res_gethostbyname F
 GLIBC_2.0 res_gethostbyname2 F
-GLIBC_2.0 res_query F
-GLIBC_2.0 res_querydomain F
-GLIBC_2.0 res_search F
 GLIBC_2.0 res_send_setqhook F
 GLIBC_2.0 res_send_setrhook F
 GLIBC_2.2 __res_hostalias F
-GLIBC_2.2 __res_nquery F
-GLIBC_2.2 __res_nquerydomain F
-GLIBC_2.2 __res_nsearch F
-GLIBC_2.2 __res_query F
-GLIBC_2.2 __res_querydomain F
-GLIBC_2.2 __res_search F
 GLIBC_2.3.2 __p_rcode F
 GLIBC_2.9 ns_datetosecs F
 GLIBC_2.9 ns_format_ttl F
diff --git a/sysdeps/unix/sysv/linux/nios2/libc.abilist b/sysdeps/unix/sysv/linux/nios2/libc.abilist
index b98437e5fc..dfb14647d2 100644
--- a/sysdeps/unix/sysv/linux/nios2/libc.abilist
+++ b/sysdeps/unix/sysv/linux/nios2/libc.abilist
@@ -426,9 +426,15 @@  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_nquery F
+GLIBC_2.21 __res_nquerydomain F
+GLIBC_2.21 __res_nsearch F
 GLIBC_2.21 __res_nsend F
 GLIBC_2.21 __res_ownok F
+GLIBC_2.21 __res_query F
+GLIBC_2.21 __res_querydomain F
 GLIBC_2.21 __res_randomid F
+GLIBC_2.21 __res_search F
 GLIBC_2.21 __res_send F
 GLIBC_2.21 __res_state F
 GLIBC_2.21 __rpc_thread_createerr F
@@ -2684,8 +2690,14 @@  GLIBC_2.34 res_hnok F
 GLIBC_2.34 res_mailok F
 GLIBC_2.34 res_mkquery F
 GLIBC_2.34 res_nmkquery F
+GLIBC_2.34 res_nquery F
+GLIBC_2.34 res_nquerydomain F
+GLIBC_2.34 res_nsearch F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
+GLIBC_2.34 res_query F
+GLIBC_2.34 res_querydomain F
+GLIBC_2.34 res_search F
 GLIBC_2.34 res_send F
 GLIBC_2.34 sem_clockwait F
 GLIBC_2.34 sem_close F
diff --git a/sysdeps/unix/sysv/linux/nios2/libresolv.abilist b/sysdeps/unix/sysv/linux/nios2/libresolv.abilist
index 23c5250a0c..e1d606503a 100644
--- a/sysdeps/unix/sysv/linux/nios2/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/nios2/libresolv.abilist
@@ -26,13 +26,7 @@  GLIBC_2.21 __res_close F
 GLIBC_2.21 __res_hostalias F
 GLIBC_2.21 __res_isourserver F
 GLIBC_2.21 __res_nameinquery F
-GLIBC_2.21 __res_nquery F
-GLIBC_2.21 __res_nquerydomain F
-GLIBC_2.21 __res_nsearch F
 GLIBC_2.21 __res_queriesmatch F
-GLIBC_2.21 __res_query F
-GLIBC_2.21 __res_querydomain F
-GLIBC_2.21 __res_search F
 GLIBC_2.21 __sym_ntop F
 GLIBC_2.21 __sym_ntos F
 GLIBC_2.21 __sym_ston F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
index 6c311d2a5f..930dccea8e 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
@@ -989,6 +989,9 @@  GLIBC_2.0 remque F
 GLIBC_2.0 rename F
 GLIBC_2.0 res_init F
 GLIBC_2.0 res_mkquery F
+GLIBC_2.0 res_query F
+GLIBC_2.0 res_querydomain F
+GLIBC_2.0 res_search F
 GLIBC_2.0 revoke F
 GLIBC_2.0 rewind F
 GLIBC_2.0 rewinddir F
@@ -1948,7 +1951,13 @@  GLIBC_2.2 __res_mkquery F
 GLIBC_2.2 __res_nclose F
 GLIBC_2.2 __res_ninit F
 GLIBC_2.2 __res_nmkquery F
+GLIBC_2.2 __res_nquery F
+GLIBC_2.2 __res_nquerydomain F
+GLIBC_2.2 __res_nsearch F
 GLIBC_2.2 __res_nsend F
+GLIBC_2.2 __res_query F
+GLIBC_2.2 __res_querydomain F
+GLIBC_2.2 __res_search F
 GLIBC_2.2 __res_state F
 GLIBC_2.2 __setmntent F
 GLIBC_2.2 __statfs F
@@ -2696,8 +2705,14 @@  GLIBC_2.34 res_hnok F
 GLIBC_2.34 res_mailok F
 GLIBC_2.34 res_mkquery F
 GLIBC_2.34 res_nmkquery F
+GLIBC_2.34 res_nquery F
+GLIBC_2.34 res_nquerydomain F
+GLIBC_2.34 res_nsearch F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
+GLIBC_2.34 res_query F
+GLIBC_2.34 res_querydomain F
+GLIBC_2.34 res_search F
 GLIBC_2.34 res_send F
 GLIBC_2.34 sem_clockwait F
 GLIBC_2.34 sem_close F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libresolv.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libresolv.abilist
index f2707204ed..56dcd57b6c 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libresolv.abilist
@@ -42,18 +42,9 @@  GLIBC_2.0 inet_neta F
 GLIBC_2.0 res_gethostbyaddr F
 GLIBC_2.0 res_gethostbyname F
 GLIBC_2.0 res_gethostbyname2 F
-GLIBC_2.0 res_query F
-GLIBC_2.0 res_querydomain F
-GLIBC_2.0 res_search F
 GLIBC_2.0 res_send_setqhook F
 GLIBC_2.0 res_send_setrhook F
 GLIBC_2.2 __res_hostalias F
-GLIBC_2.2 __res_nquery F
-GLIBC_2.2 __res_nquerydomain F
-GLIBC_2.2 __res_nsearch F
-GLIBC_2.2 __res_query F
-GLIBC_2.2 __res_querydomain F
-GLIBC_2.2 __res_search F
 GLIBC_2.3.2 __p_rcode F
 GLIBC_2.9 ns_datetosecs F
 GLIBC_2.9 ns_format_ttl F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
index c6d7f1cff4..29bb3ddc35 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
@@ -989,6 +989,9 @@  GLIBC_2.0 remque F
 GLIBC_2.0 rename F
 GLIBC_2.0 res_init F
 GLIBC_2.0 res_mkquery F
+GLIBC_2.0 res_query F
+GLIBC_2.0 res_querydomain F
+GLIBC_2.0 res_search F
 GLIBC_2.0 revoke F
 GLIBC_2.0 rewind F
 GLIBC_2.0 rewinddir F
@@ -1952,7 +1955,13 @@  GLIBC_2.2 __res_mkquery F
 GLIBC_2.2 __res_nclose F
 GLIBC_2.2 __res_ninit F
 GLIBC_2.2 __res_nmkquery F
+GLIBC_2.2 __res_nquery F
+GLIBC_2.2 __res_nquerydomain F
+GLIBC_2.2 __res_nsearch F
 GLIBC_2.2 __res_nsend F
+GLIBC_2.2 __res_query F
+GLIBC_2.2 __res_querydomain F
+GLIBC_2.2 __res_search F
 GLIBC_2.2 __res_state F
 GLIBC_2.2 __setmntent F
 GLIBC_2.2 __statfs F
@@ -2729,8 +2738,14 @@  GLIBC_2.34 res_hnok F
 GLIBC_2.34 res_mailok F
 GLIBC_2.34 res_mkquery F
 GLIBC_2.34 res_nmkquery F
+GLIBC_2.34 res_nquery F
+GLIBC_2.34 res_nquerydomain F
+GLIBC_2.34 res_nsearch F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
+GLIBC_2.34 res_query F
+GLIBC_2.34 res_querydomain F
+GLIBC_2.34 res_search F
 GLIBC_2.34 res_send F
 GLIBC_2.34 sem_clockwait F
 GLIBC_2.34 sem_close F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
index f8e69c7fd3..5d0b01d486 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
@@ -472,9 +472,15 @@  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_nquery F
+GLIBC_2.3 __res_nquerydomain F
+GLIBC_2.3 __res_nsearch F
 GLIBC_2.3 __res_nsend F
 GLIBC_2.3 __res_ownok F
+GLIBC_2.3 __res_query F
+GLIBC_2.3 __res_querydomain F
 GLIBC_2.3 __res_randomid F
+GLIBC_2.3 __res_search F
 GLIBC_2.3 __res_send F
 GLIBC_2.3 __res_state F
 GLIBC_2.3 __rpc_thread_createerr F
@@ -2463,8 +2469,14 @@  GLIBC_2.34 res_hnok F
 GLIBC_2.34 res_mailok F
 GLIBC_2.34 res_mkquery F
 GLIBC_2.34 res_nmkquery F
+GLIBC_2.34 res_nquery F
+GLIBC_2.34 res_nquerydomain F
+GLIBC_2.34 res_nsearch F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
+GLIBC_2.34 res_query F
+GLIBC_2.34 res_querydomain F
+GLIBC_2.34 res_search F
 GLIBC_2.34 res_send F
 GLIBC_2.34 sem_clockwait F
 GLIBC_2.34 sem_close F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libresolv.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libresolv.abilist
index 4d1fb69bc6..55dfc1d558 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libresolv.abilist
@@ -25,13 +25,7 @@  GLIBC_2.3 __res_close F
 GLIBC_2.3 __res_hostalias F
 GLIBC_2.3 __res_isourserver F
 GLIBC_2.3 __res_nameinquery F
-GLIBC_2.3 __res_nquery F
-GLIBC_2.3 __res_nquerydomain F
-GLIBC_2.3 __res_nsearch F
 GLIBC_2.3 __res_queriesmatch F
-GLIBC_2.3 __res_query F
-GLIBC_2.3 __res_querydomain F
-GLIBC_2.3 __res_search F
 GLIBC_2.3 __sym_ntop F
 GLIBC_2.3 __sym_ntos F
 GLIBC_2.3 __sym_ston F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
index 6b0a84c8f6..b82e3af690 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
@@ -474,9 +474,15 @@  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_nquery F
+GLIBC_2.17 __res_nquerydomain F
+GLIBC_2.17 __res_nsearch F
 GLIBC_2.17 __res_nsend F
 GLIBC_2.17 __res_ownok F
+GLIBC_2.17 __res_query F
+GLIBC_2.17 __res_querydomain F
 GLIBC_2.17 __res_randomid F
+GLIBC_2.17 __res_search F
 GLIBC_2.17 __res_send F
 GLIBC_2.17 __res_state F
 GLIBC_2.17 __rpc_thread_createerr F
@@ -2765,8 +2771,14 @@  GLIBC_2.34 res_hnok F
 GLIBC_2.34 res_mailok F
 GLIBC_2.34 res_mkquery F
 GLIBC_2.34 res_nmkquery F
+GLIBC_2.34 res_nquery F
+GLIBC_2.34 res_nquerydomain F
+GLIBC_2.34 res_nsearch F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
+GLIBC_2.34 res_query F
+GLIBC_2.34 res_querydomain F
+GLIBC_2.34 res_search F
 GLIBC_2.34 res_send F
 GLIBC_2.34 sem_clockwait F
 GLIBC_2.34 sem_close F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libresolv.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libresolv.abilist
index 702d13c633..3d4bfe3179 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libresolv.abilist
@@ -26,13 +26,7 @@  GLIBC_2.17 __res_close F
 GLIBC_2.17 __res_hostalias F
 GLIBC_2.17 __res_isourserver F
 GLIBC_2.17 __res_nameinquery F
-GLIBC_2.17 __res_nquery F
-GLIBC_2.17 __res_nquerydomain F
-GLIBC_2.17 __res_nsearch F
 GLIBC_2.17 __res_queriesmatch F
-GLIBC_2.17 __res_query F
-GLIBC_2.17 __res_querydomain F
-GLIBC_2.17 __res_search F
 GLIBC_2.17 __sym_ntop F
 GLIBC_2.17 __sym_ntos F
 GLIBC_2.17 __sym_ston F
diff --git a/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist b/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
index 080d87a80b..03a9a617b8 100644
--- a/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
@@ -374,9 +374,15 @@  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_nquery F
+GLIBC_2.33 __res_nquerydomain F
+GLIBC_2.33 __res_nsearch F
 GLIBC_2.33 __res_nsend F
 GLIBC_2.33 __res_ownok F
+GLIBC_2.33 __res_query F
+GLIBC_2.33 __res_querydomain F
 GLIBC_2.33 __res_randomid F
+GLIBC_2.33 __res_search F
 GLIBC_2.33 __res_send F
 GLIBC_2.33 __res_state F
 GLIBC_2.33 __riscv_flush_icache F
@@ -2330,8 +2336,14 @@  GLIBC_2.34 res_hnok F
 GLIBC_2.34 res_mailok F
 GLIBC_2.34 res_mkquery F
 GLIBC_2.34 res_nmkquery F
+GLIBC_2.34 res_nquery F
+GLIBC_2.34 res_nquerydomain F
+GLIBC_2.34 res_nsearch F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
+GLIBC_2.34 res_query F
+GLIBC_2.34 res_querydomain F
+GLIBC_2.34 res_search F
 GLIBC_2.34 res_send F
 GLIBC_2.34 sem_clockwait F
 GLIBC_2.34 sem_close F
diff --git a/sysdeps/unix/sysv/linux/riscv/rv32/libresolv.abilist b/sysdeps/unix/sysv/linux/riscv/rv32/libresolv.abilist
index 50daff9908..e4e29c8a20 100644
--- a/sysdeps/unix/sysv/linux/riscv/rv32/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/riscv/rv32/libresolv.abilist
@@ -25,13 +25,7 @@  GLIBC_2.33 __res_close F
 GLIBC_2.33 __res_hostalias F
 GLIBC_2.33 __res_isourserver F
 GLIBC_2.33 __res_nameinquery F
-GLIBC_2.33 __res_nquery F
-GLIBC_2.33 __res_nquerydomain F
-GLIBC_2.33 __res_nsearch F
 GLIBC_2.33 __res_queriesmatch F
-GLIBC_2.33 __res_query F
-GLIBC_2.33 __res_querydomain F
-GLIBC_2.33 __res_search F
 GLIBC_2.33 __sym_ntop F
 GLIBC_2.33 __sym_ntos F
 GLIBC_2.33 __sym_ston F
diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
index 53b33d1504..42c0f86aaa 100644
--- a/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
@@ -385,9 +385,15 @@  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_nquery F
+GLIBC_2.27 __res_nquerydomain F
+GLIBC_2.27 __res_nsearch F
 GLIBC_2.27 __res_nsend F
 GLIBC_2.27 __res_ownok F
+GLIBC_2.27 __res_query F
+GLIBC_2.27 __res_querydomain F
 GLIBC_2.27 __res_randomid F
+GLIBC_2.27 __res_search F
 GLIBC_2.27 __res_send F
 GLIBC_2.27 __res_state F
 GLIBC_2.27 __riscv_flush_icache F
@@ -2530,8 +2536,14 @@  GLIBC_2.34 res_hnok F
 GLIBC_2.34 res_mailok F
 GLIBC_2.34 res_mkquery F
 GLIBC_2.34 res_nmkquery F
+GLIBC_2.34 res_nquery F
+GLIBC_2.34 res_nquerydomain F
+GLIBC_2.34 res_nsearch F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
+GLIBC_2.34 res_query F
+GLIBC_2.34 res_querydomain F
+GLIBC_2.34 res_search F
 GLIBC_2.34 res_send F
 GLIBC_2.34 sem_clockwait F
 GLIBC_2.34 sem_close F
diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libresolv.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libresolv.abilist
index 050ca355e2..57f214e869 100644
--- a/sysdeps/unix/sysv/linux/riscv/rv64/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/riscv/rv64/libresolv.abilist
@@ -25,13 +25,7 @@  GLIBC_2.27 __res_close F
 GLIBC_2.27 __res_hostalias F
 GLIBC_2.27 __res_isourserver F
 GLIBC_2.27 __res_nameinquery F
-GLIBC_2.27 __res_nquery F
-GLIBC_2.27 __res_nquerydomain F
-GLIBC_2.27 __res_nsearch F
 GLIBC_2.27 __res_queriesmatch F
-GLIBC_2.27 __res_query F
-GLIBC_2.27 __res_querydomain F
-GLIBC_2.27 __res_search F
 GLIBC_2.27 __sym_ntop F
 GLIBC_2.27 __sym_ntos F
 GLIBC_2.27 __sym_ston F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
index d1d59f0021..3f15b3edc5 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
@@ -980,6 +980,9 @@  GLIBC_2.0 remque F
 GLIBC_2.0 rename F
 GLIBC_2.0 res_init F
 GLIBC_2.0 res_mkquery F
+GLIBC_2.0 res_query F
+GLIBC_2.0 res_querydomain F
+GLIBC_2.0 res_search F
 GLIBC_2.0 revoke F
 GLIBC_2.0 rewind F
 GLIBC_2.0 rewinddir F
@@ -1946,7 +1949,13 @@  GLIBC_2.2 __res_mkquery F
 GLIBC_2.2 __res_nclose F
 GLIBC_2.2 __res_ninit F
 GLIBC_2.2 __res_nmkquery F
+GLIBC_2.2 __res_nquery F
+GLIBC_2.2 __res_nquerydomain F
+GLIBC_2.2 __res_nsearch F
 GLIBC_2.2 __res_nsend F
+GLIBC_2.2 __res_query F
+GLIBC_2.2 __res_querydomain F
+GLIBC_2.2 __res_search F
 GLIBC_2.2 __res_state F
 GLIBC_2.2 __setmntent F
 GLIBC_2.2 __statfs F
@@ -2694,8 +2703,14 @@  GLIBC_2.34 res_hnok F
 GLIBC_2.34 res_mailok F
 GLIBC_2.34 res_mkquery F
 GLIBC_2.34 res_nmkquery F
+GLIBC_2.34 res_nquery F
+GLIBC_2.34 res_nquerydomain F
+GLIBC_2.34 res_nsearch F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
+GLIBC_2.34 res_query F
+GLIBC_2.34 res_querydomain F
+GLIBC_2.34 res_search F
 GLIBC_2.34 res_send F
 GLIBC_2.34 sem_clockwait F
 GLIBC_2.34 sem_close F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libresolv.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libresolv.abilist
index f2707204ed..56dcd57b6c 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/libresolv.abilist
@@ -42,18 +42,9 @@  GLIBC_2.0 inet_neta F
 GLIBC_2.0 res_gethostbyaddr F
 GLIBC_2.0 res_gethostbyname F
 GLIBC_2.0 res_gethostbyname2 F
-GLIBC_2.0 res_query F
-GLIBC_2.0 res_querydomain F
-GLIBC_2.0 res_search F
 GLIBC_2.0 res_send_setqhook F
 GLIBC_2.0 res_send_setrhook F
 GLIBC_2.2 __res_hostalias F
-GLIBC_2.2 __res_nquery F
-GLIBC_2.2 __res_nquerydomain F
-GLIBC_2.2 __res_nsearch F
-GLIBC_2.2 __res_query F
-GLIBC_2.2 __res_querydomain F
-GLIBC_2.2 __res_search F
 GLIBC_2.3.2 __p_rcode F
 GLIBC_2.9 ns_datetosecs F
 GLIBC_2.9 ns_format_ttl F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
index ca3e7ebc6d..c24face132 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
@@ -416,9 +416,15 @@  GLIBC_2.2 __res_mkquery F
 GLIBC_2.2 __res_nclose F
 GLIBC_2.2 __res_ninit F
 GLIBC_2.2 __res_nmkquery F
+GLIBC_2.2 __res_nquery F
+GLIBC_2.2 __res_nquerydomain F
+GLIBC_2.2 __res_nsearch F
 GLIBC_2.2 __res_nsend F
 GLIBC_2.2 __res_ownok F
+GLIBC_2.2 __res_query F
+GLIBC_2.2 __res_querydomain F
 GLIBC_2.2 __res_randomid F
+GLIBC_2.2 __res_search F
 GLIBC_2.2 __res_send F
 GLIBC_2.2 __res_state F
 GLIBC_2.2 __sbrk F
@@ -2500,8 +2506,14 @@  GLIBC_2.34 res_hnok F
 GLIBC_2.34 res_mailok F
 GLIBC_2.34 res_mkquery F
 GLIBC_2.34 res_nmkquery F
+GLIBC_2.34 res_nquery F
+GLIBC_2.34 res_nquerydomain F
+GLIBC_2.34 res_nsearch F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
+GLIBC_2.34 res_query F
+GLIBC_2.34 res_querydomain F
+GLIBC_2.34 res_search F
 GLIBC_2.34 res_send F
 GLIBC_2.34 sem_clockwait F
 GLIBC_2.34 sem_close F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libresolv.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libresolv.abilist
index 3b8ffd2766..7f2b4f6cab 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/libresolv.abilist
@@ -25,13 +25,7 @@  GLIBC_2.2 __res_close F
 GLIBC_2.2 __res_hostalias F
 GLIBC_2.2 __res_isourserver F
 GLIBC_2.2 __res_nameinquery F
-GLIBC_2.2 __res_nquery F
-GLIBC_2.2 __res_nquerydomain F
-GLIBC_2.2 __res_nsearch F
 GLIBC_2.2 __res_queriesmatch F
-GLIBC_2.2 __res_query F
-GLIBC_2.2 __res_querydomain F
-GLIBC_2.2 __res_search F
 GLIBC_2.2 __sym_ntop F
 GLIBC_2.2 __sym_ntos F
 GLIBC_2.2 __sym_ston F
diff --git a/sysdeps/unix/sysv/linux/sh/be/libc.abilist b/sysdeps/unix/sysv/linux/sh/be/libc.abilist
index fcde356a18..ddcf105058 100644
--- a/sysdeps/unix/sysv/linux/sh/be/libc.abilist
+++ b/sysdeps/unix/sysv/linux/sh/be/libc.abilist
@@ -22,6 +22,9 @@  GLIBC_2.0 logout F
 GLIBC_2.0 logwtmp F
 GLIBC_2.0 openpty 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.1 aio_cancel F
 GLIBC_2.1 aio_cancel64 F
 GLIBC_2.1 aio_error F
@@ -436,8 +439,14 @@  GLIBC_2.2 __res_mkquery F
 GLIBC_2.2 __res_nclose F
 GLIBC_2.2 __res_ninit F
 GLIBC_2.2 __res_nmkquery F
+GLIBC_2.2 __res_nquery F
+GLIBC_2.2 __res_nquerydomain F
+GLIBC_2.2 __res_nsearch F
 GLIBC_2.2 __res_nsend F
+GLIBC_2.2 __res_query F
+GLIBC_2.2 __res_querydomain F
 GLIBC_2.2 __res_randomid F
+GLIBC_2.2 __res_search F
 GLIBC_2.2 __res_state F
 GLIBC_2.2 __sbrk F
 GLIBC_2.2 __sched_get_priority_max F
@@ -2549,8 +2558,14 @@  GLIBC_2.34 res_hnok F
 GLIBC_2.34 res_mailok F
 GLIBC_2.34 res_mkquery F
 GLIBC_2.34 res_nmkquery F
+GLIBC_2.34 res_nquery F
+GLIBC_2.34 res_nquerydomain F
+GLIBC_2.34 res_nsearch F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
+GLIBC_2.34 res_query F
+GLIBC_2.34 res_querydomain F
+GLIBC_2.34 res_search F
 GLIBC_2.34 res_send F
 GLIBC_2.34 sem_clockwait F
 GLIBC_2.34 sem_close F
diff --git a/sysdeps/unix/sysv/linux/sh/be/libresolv.abilist b/sysdeps/unix/sysv/linux/sh/be/libresolv.abilist
index f2707204ed..56dcd57b6c 100644
--- a/sysdeps/unix/sysv/linux/sh/be/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/sh/be/libresolv.abilist
@@ -42,18 +42,9 @@  GLIBC_2.0 inet_neta F
 GLIBC_2.0 res_gethostbyaddr F
 GLIBC_2.0 res_gethostbyname F
 GLIBC_2.0 res_gethostbyname2 F
-GLIBC_2.0 res_query F
-GLIBC_2.0 res_querydomain F
-GLIBC_2.0 res_search F
 GLIBC_2.0 res_send_setqhook F
 GLIBC_2.0 res_send_setrhook F
 GLIBC_2.2 __res_hostalias F
-GLIBC_2.2 __res_nquery F
-GLIBC_2.2 __res_nquerydomain F
-GLIBC_2.2 __res_nsearch F
-GLIBC_2.2 __res_query F
-GLIBC_2.2 __res_querydomain F
-GLIBC_2.2 __res_search F
 GLIBC_2.3.2 __p_rcode F
 GLIBC_2.9 ns_datetosecs F
 GLIBC_2.9 ns_format_ttl F
diff --git a/sysdeps/unix/sysv/linux/sh/le/libc.abilist b/sysdeps/unix/sysv/linux/sh/le/libc.abilist
index 18dffb1d62..916630a82c 100644
--- a/sysdeps/unix/sysv/linux/sh/le/libc.abilist
+++ b/sysdeps/unix/sysv/linux/sh/le/libc.abilist
@@ -22,6 +22,9 @@  GLIBC_2.0 logout F
 GLIBC_2.0 logwtmp F
 GLIBC_2.0 openpty 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.1 aio_cancel F
 GLIBC_2.1 aio_cancel64 F
 GLIBC_2.1 aio_error F
@@ -436,8 +439,14 @@  GLIBC_2.2 __res_mkquery F
 GLIBC_2.2 __res_nclose F
 GLIBC_2.2 __res_ninit F
 GLIBC_2.2 __res_nmkquery F
+GLIBC_2.2 __res_nquery F
+GLIBC_2.2 __res_nquerydomain F
+GLIBC_2.2 __res_nsearch F
 GLIBC_2.2 __res_nsend F
+GLIBC_2.2 __res_query F
+GLIBC_2.2 __res_querydomain F
 GLIBC_2.2 __res_randomid F
+GLIBC_2.2 __res_search F
 GLIBC_2.2 __res_state F
 GLIBC_2.2 __sbrk F
 GLIBC_2.2 __sched_get_priority_max F
@@ -2546,8 +2555,14 @@  GLIBC_2.34 res_hnok F
 GLIBC_2.34 res_mailok F
 GLIBC_2.34 res_mkquery F
 GLIBC_2.34 res_nmkquery F
+GLIBC_2.34 res_nquery F
+GLIBC_2.34 res_nquerydomain F
+GLIBC_2.34 res_nsearch F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
+GLIBC_2.34 res_query F
+GLIBC_2.34 res_querydomain F
+GLIBC_2.34 res_search F
 GLIBC_2.34 res_send F
 GLIBC_2.34 sem_clockwait F
 GLIBC_2.34 sem_close F
diff --git a/sysdeps/unix/sysv/linux/sh/le/libresolv.abilist b/sysdeps/unix/sysv/linux/sh/le/libresolv.abilist
index f2707204ed..56dcd57b6c 100644
--- a/sysdeps/unix/sysv/linux/sh/le/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/sh/le/libresolv.abilist
@@ -42,18 +42,9 @@  GLIBC_2.0 inet_neta F
 GLIBC_2.0 res_gethostbyaddr F
 GLIBC_2.0 res_gethostbyname F
 GLIBC_2.0 res_gethostbyname2 F
-GLIBC_2.0 res_query F
-GLIBC_2.0 res_querydomain F
-GLIBC_2.0 res_search F
 GLIBC_2.0 res_send_setqhook F
 GLIBC_2.0 res_send_setrhook F
 GLIBC_2.2 __res_hostalias F
-GLIBC_2.2 __res_nquery F
-GLIBC_2.2 __res_nquerydomain F
-GLIBC_2.2 __res_nsearch F
-GLIBC_2.2 __res_query F
-GLIBC_2.2 __res_querydomain F
-GLIBC_2.2 __res_search F
 GLIBC_2.3.2 __p_rcode F
 GLIBC_2.9 ns_datetosecs F
 GLIBC_2.9 ns_format_ttl F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
index 61fd09d562..c411653766 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
@@ -983,6 +983,9 @@  GLIBC_2.0 remque F
 GLIBC_2.0 rename F
 GLIBC_2.0 res_init F
 GLIBC_2.0 res_mkquery F
+GLIBC_2.0 res_query F
+GLIBC_2.0 res_querydomain F
+GLIBC_2.0 res_search F
 GLIBC_2.0 revoke F
 GLIBC_2.0 rewind F
 GLIBC_2.0 rewinddir F
@@ -1944,7 +1947,13 @@  GLIBC_2.2 __res_mkquery F
 GLIBC_2.2 __res_nclose F
 GLIBC_2.2 __res_ninit F
 GLIBC_2.2 __res_nmkquery F
+GLIBC_2.2 __res_nquery F
+GLIBC_2.2 __res_nquerydomain F
+GLIBC_2.2 __res_nsearch F
 GLIBC_2.2 __res_nsend F
+GLIBC_2.2 __res_query F
+GLIBC_2.2 __res_querydomain F
+GLIBC_2.2 __res_search F
 GLIBC_2.2 __res_state F
 GLIBC_2.2 __setmntent F
 GLIBC_2.2 __statfs F
@@ -2689,8 +2698,14 @@  GLIBC_2.34 res_hnok F
 GLIBC_2.34 res_mailok F
 GLIBC_2.34 res_mkquery F
 GLIBC_2.34 res_nmkquery F
+GLIBC_2.34 res_nquery F
+GLIBC_2.34 res_nquerydomain F
+GLIBC_2.34 res_nsearch F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
+GLIBC_2.34 res_query F
+GLIBC_2.34 res_querydomain F
+GLIBC_2.34 res_search F
 GLIBC_2.34 res_send F
 GLIBC_2.34 sem_clockwait F
 GLIBC_2.34 sem_close F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libresolv.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libresolv.abilist
index f2707204ed..56dcd57b6c 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libresolv.abilist
@@ -42,18 +42,9 @@  GLIBC_2.0 inet_neta F
 GLIBC_2.0 res_gethostbyaddr F
 GLIBC_2.0 res_gethostbyname F
 GLIBC_2.0 res_gethostbyname2 F
-GLIBC_2.0 res_query F
-GLIBC_2.0 res_querydomain F
-GLIBC_2.0 res_search F
 GLIBC_2.0 res_send_setqhook F
 GLIBC_2.0 res_send_setrhook F
 GLIBC_2.2 __res_hostalias F
-GLIBC_2.2 __res_nquery F
-GLIBC_2.2 __res_nquerydomain F
-GLIBC_2.2 __res_nsearch F
-GLIBC_2.2 __res_query F
-GLIBC_2.2 __res_querydomain F
-GLIBC_2.2 __res_search F
 GLIBC_2.3.2 __p_rcode F
 GLIBC_2.9 ns_datetosecs F
 GLIBC_2.9 ns_format_ttl F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
index fa300e44d6..8421b56ac5 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
@@ -22,6 +22,9 @@  GLIBC_2.0 logout F
 GLIBC_2.0 logwtmp F
 GLIBC_2.0 openpty 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.1 aio_cancel F
 GLIBC_2.1 aio_cancel64 F
 GLIBC_2.1 aio_error F
@@ -477,8 +480,14 @@  GLIBC_2.2 __res_mkquery F
 GLIBC_2.2 __res_nclose F
 GLIBC_2.2 __res_ninit F
 GLIBC_2.2 __res_nmkquery F
+GLIBC_2.2 __res_nquery F
+GLIBC_2.2 __res_nquerydomain F
+GLIBC_2.2 __res_nsearch F
 GLIBC_2.2 __res_nsend F
+GLIBC_2.2 __res_query F
+GLIBC_2.2 __res_querydomain F
 GLIBC_2.2 __res_randomid F
+GLIBC_2.2 __res_search F
 GLIBC_2.2 __res_state F
 GLIBC_2.2 __sbrk F
 GLIBC_2.2 __sched_get_priority_max F
@@ -2524,8 +2533,14 @@  GLIBC_2.34 res_hnok F
 GLIBC_2.34 res_mailok F
 GLIBC_2.34 res_mkquery F
 GLIBC_2.34 res_nmkquery F
+GLIBC_2.34 res_nquery F
+GLIBC_2.34 res_nquerydomain F
+GLIBC_2.34 res_nsearch F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
+GLIBC_2.34 res_query F
+GLIBC_2.34 res_querydomain F
+GLIBC_2.34 res_search F
 GLIBC_2.34 res_send F
 GLIBC_2.34 sem_clockwait F
 GLIBC_2.34 sem_close F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libresolv.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libresolv.abilist
index 4f5160f474..8325eae8a5 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libresolv.abilist
@@ -42,18 +42,9 @@  GLIBC_2.0 inet_neta F
 GLIBC_2.0 res_gethostbyaddr F
 GLIBC_2.0 res_gethostbyname F
 GLIBC_2.0 res_gethostbyname2 F
-GLIBC_2.0 res_query F
-GLIBC_2.0 res_querydomain F
-GLIBC_2.0 res_search F
 GLIBC_2.0 res_send_setqhook F
 GLIBC_2.0 res_send_setrhook F
 GLIBC_2.2 __res_hostalias F
-GLIBC_2.2 __res_nquery F
-GLIBC_2.2 __res_nquerydomain F
-GLIBC_2.2 __res_nsearch F
-GLIBC_2.2 __res_query F
-GLIBC_2.2 __res_querydomain F
-GLIBC_2.2 __res_search F
 GLIBC_2.3.2 __p_rcode F
 GLIBC_2.9 ns_datetosecs F
 GLIBC_2.9 ns_format_ttl F
diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
index 3160273a6f..04720305d4 100644
--- a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
@@ -400,9 +400,15 @@  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_nquery F
+GLIBC_2.2.5 __res_nquerydomain F
+GLIBC_2.2.5 __res_nsearch F
 GLIBC_2.2.5 __res_nsend F
 GLIBC_2.2.5 __res_ownok F
+GLIBC_2.2.5 __res_query F
+GLIBC_2.2.5 __res_querydomain F
 GLIBC_2.2.5 __res_randomid F
+GLIBC_2.2.5 __res_search F
 GLIBC_2.2.5 __res_send F
 GLIBC_2.2.5 __res_state F
 GLIBC_2.2.5 __rpc_thread_createerr F
@@ -2478,8 +2484,14 @@  GLIBC_2.34 res_hnok F
 GLIBC_2.34 res_mailok F
 GLIBC_2.34 res_mkquery F
 GLIBC_2.34 res_nmkquery F
+GLIBC_2.34 res_nquery F
+GLIBC_2.34 res_nquerydomain F
+GLIBC_2.34 res_nsearch F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
+GLIBC_2.34 res_query F
+GLIBC_2.34 res_querydomain F
+GLIBC_2.34 res_search F
 GLIBC_2.34 res_send F
 GLIBC_2.34 sem_clockwait F
 GLIBC_2.34 sem_close F
diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libresolv.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libresolv.abilist
index e2a6207778..bd3596d3a3 100644
--- a/sysdeps/unix/sysv/linux/x86_64/64/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/64/libresolv.abilist
@@ -25,13 +25,7 @@  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_nameinquery F
-GLIBC_2.2.5 __res_nquery F
-GLIBC_2.2.5 __res_nquerydomain F
-GLIBC_2.2.5 __res_nsearch F
 GLIBC_2.2.5 __res_queriesmatch F
-GLIBC_2.2.5 __res_query F
-GLIBC_2.2.5 __res_querydomain F
-GLIBC_2.2.5 __res_search F
 GLIBC_2.2.5 __sym_ntop F
 GLIBC_2.2.5 __sym_ntos F
 GLIBC_2.2.5 __sym_ston F
diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
index 886414793c..3981f2eb31 100644
--- a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
@@ -389,9 +389,15 @@  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_nquery F
+GLIBC_2.16 __res_nquerydomain F
+GLIBC_2.16 __res_nsearch F
 GLIBC_2.16 __res_nsend F
 GLIBC_2.16 __res_ownok F
+GLIBC_2.16 __res_query F
+GLIBC_2.16 __res_querydomain F
 GLIBC_2.16 __res_randomid F
+GLIBC_2.16 __res_search F
 GLIBC_2.16 __res_send F
 GLIBC_2.16 __res_state F
 GLIBC_2.16 __rpc_thread_createerr F
@@ -2584,8 +2590,14 @@  GLIBC_2.34 res_hnok F
 GLIBC_2.34 res_mailok F
 GLIBC_2.34 res_mkquery F
 GLIBC_2.34 res_nmkquery F
+GLIBC_2.34 res_nquery F
+GLIBC_2.34 res_nquerydomain F
+GLIBC_2.34 res_nsearch F
 GLIBC_2.34 res_nsend F
 GLIBC_2.34 res_ownok F
+GLIBC_2.34 res_query F
+GLIBC_2.34 res_querydomain F
+GLIBC_2.34 res_search F
 GLIBC_2.34 res_send F
 GLIBC_2.34 sem_clockwait F
 GLIBC_2.34 sem_close F
diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libresolv.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libresolv.abilist
index b7564c49cc..aa5227882b 100644
--- a/sysdeps/unix/sysv/linux/x86_64/x32/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/x32/libresolv.abilist
@@ -26,13 +26,7 @@  GLIBC_2.16 __res_close F
 GLIBC_2.16 __res_hostalias F
 GLIBC_2.16 __res_isourserver F
 GLIBC_2.16 __res_nameinquery F
-GLIBC_2.16 __res_nquery F
-GLIBC_2.16 __res_nquerydomain F
-GLIBC_2.16 __res_nsearch F
 GLIBC_2.16 __res_queriesmatch F
-GLIBC_2.16 __res_query F
-GLIBC_2.16 __res_querydomain F
-GLIBC_2.16 __res_search F
 GLIBC_2.16 __sym_ntop F
 GLIBC_2.16 __sym_ntos F
 GLIBC_2.16 __sym_ston F