diff mbox series

[15/30] resolv: Move dn_skipname to its own file and into libc

Message ID b3e15d430c7bbb53049bc4db7d2d6b54990a1e4a.1625755445.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:03 p.m. UTC 
  And reformat it to GNU style.

dn_skipname is used outside glibc, so do not deprecate it,
and export it as dn_skipname (not __dn_skipname).  Due to internal
users, provide a __libc_dn_skipname alias, and keep __dn_skipname
as a pure compatibility symbol.

__dn_skipname@GLIBC_2.0 was moved using the script, and
dn_skipname@@GLIBC_2.34 was added using make update-all-abi.
---
 include/resolv.h                              |   3 +-
 resolv/Makefile                               |   1 +
 resolv/Versions                               |   4 +-
 resolv/dn_skipname.c                          | 103 ++++++++++++++++++
 resolv/nss_dns/dns-canon.c                    |   4 +-
 resolv/nss_dns/dns-network.c                  |   2 +-
 resolv/res_comp.c                             |  13 ---
 resolv/resolv.h                               |   1 -
 sysdeps/mach/hurd/i386/libc.abilist           |   2 +
 sysdeps/mach/hurd/i386/libresolv.abilist      |   1 -
 sysdeps/unix/sysv/linux/aarch64/libc.abilist  |   2 +
 .../unix/sysv/linux/aarch64/libresolv.abilist |   1 -
 sysdeps/unix/sysv/linux/alpha/libc.abilist    |   2 +
 .../unix/sysv/linux/alpha/libresolv.abilist   |   1 -
 sysdeps/unix/sysv/linux/arc/libc.abilist      |   2 +
 sysdeps/unix/sysv/linux/arc/libresolv.abilist |   1 -
 sysdeps/unix/sysv/linux/arm/be/libc.abilist   |   2 +
 .../unix/sysv/linux/arm/be/libresolv.abilist  |   1 -
 sysdeps/unix/sysv/linux/arm/le/libc.abilist   |   2 +
 .../unix/sysv/linux/arm/le/libresolv.abilist  |   1 -
 sysdeps/unix/sysv/linux/csky/libc.abilist     |   2 +
 .../unix/sysv/linux/csky/libresolv.abilist    |   1 -
 sysdeps/unix/sysv/linux/hppa/libc.abilist     |   2 +
 .../unix/sysv/linux/hppa/libresolv.abilist    |   1 -
 sysdeps/unix/sysv/linux/i386/libc.abilist     |   2 +
 .../unix/sysv/linux/i386/libresolv.abilist    |   1 -
 sysdeps/unix/sysv/linux/ia64/libc.abilist     |   2 +
 .../unix/sysv/linux/ia64/libresolv.abilist    |   1 -
 .../sysv/linux/m68k/coldfire/libc.abilist     |   2 +
 .../linux/m68k/coldfire/libresolv.abilist     |   1 -
 .../unix/sysv/linux/m68k/m680x0/libc.abilist  |   2 +
 .../sysv/linux/m68k/m680x0/libresolv.abilist  |   1 -
 .../sysv/linux/microblaze/be/libc.abilist     |   2 +
 .../linux/microblaze/be/libresolv.abilist     |   1 -
 .../sysv/linux/microblaze/le/libc.abilist     |   2 +
 .../linux/microblaze/le/libresolv.abilist     |   1 -
 .../sysv/linux/mips/mips32/fpu/libc.abilist   |   2 +
 .../sysv/linux/mips/mips32/libresolv.abilist  |   1 -
 .../sysv/linux/mips/mips32/nofpu/libc.abilist |   2 +
 .../sysv/linux/mips/mips64/n32/libc.abilist   |   2 +
 .../linux/mips/mips64/n32/libresolv.abilist   |   1 -
 .../sysv/linux/mips/mips64/n64/libc.abilist   |   2 +
 .../linux/mips/mips64/n64/libresolv.abilist   |   1 -
 sysdeps/unix/sysv/linux/nios2/libc.abilist    |   2 +
 .../unix/sysv/linux/nios2/libresolv.abilist   |   1 -
 .../linux/powerpc/powerpc32/fpu/libc.abilist  |   2 +
 .../linux/powerpc/powerpc32/libresolv.abilist |   1 -
 .../powerpc/powerpc32/nofpu/libc.abilist      |   2 +
 .../linux/powerpc/powerpc64/be/libc.abilist   |   2 +
 .../powerpc/powerpc64/be/libresolv.abilist    |   1 -
 .../linux/powerpc/powerpc64/le/libc.abilist   |   2 +
 .../powerpc/powerpc64/le/libresolv.abilist    |   1 -
 .../unix/sysv/linux/riscv/rv32/libc.abilist   |   2 +
 .../sysv/linux/riscv/rv32/libresolv.abilist   |   1 -
 .../unix/sysv/linux/riscv/rv64/libc.abilist   |   2 +
 .../sysv/linux/riscv/rv64/libresolv.abilist   |   1 -
 .../unix/sysv/linux/s390/s390-32/libc.abilist |   2 +
 .../sysv/linux/s390/s390-32/libresolv.abilist |   1 -
 .../unix/sysv/linux/s390/s390-64/libc.abilist |   2 +
 .../sysv/linux/s390/s390-64/libresolv.abilist |   1 -
 sysdeps/unix/sysv/linux/sh/be/libc.abilist    |   2 +
 .../unix/sysv/linux/sh/be/libresolv.abilist   |   1 -
 sysdeps/unix/sysv/linux/sh/le/libc.abilist    |   2 +
 .../unix/sysv/linux/sh/le/libresolv.abilist   |   1 -
 .../sysv/linux/sparc/sparc32/libc.abilist     |   2 +
 .../linux/sparc/sparc32/libresolv.abilist     |   1 -
 .../sysv/linux/sparc/sparc64/libc.abilist     |   2 +
 .../linux/sparc/sparc64/libresolv.abilist     |   1 -
 .../unix/sysv/linux/x86_64/64/libc.abilist    |   2 +
 .../sysv/linux/x86_64/64/libresolv.abilist    |   1 -
 .../unix/sysv/linux/x86_64/x32/libc.abilist   |   2 +
 .../sysv/linux/x86_64/x32/libresolv.abilist   |   1 -
 72 files changed, 178 insertions(+), 50 deletions(-)
 create mode 100644 resolv/dn_skipname.c

Comments

Carlos O'Donell July 15, 2021, 5:01 a.m. UTC | #1 
On 7/8/21 11:03 AM, Florian Weimer via Libc-alpha wrote:
> And reformat it to GNU style.
> 
> dn_skipname is used outside glibc, so do not deprecate it,
> and export it as dn_skipname (not __dn_skipname).  Due to internal
> users, provide a __libc_dn_skipname alias, and keep __dn_skipname
> as a pure compatibility symbol.
> 
> __dn_skipname@GLIBC_2.0 was moved using the script, and
> dn_skipname@@GLIBC_2.34 was added using make update-all-abi.

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>

> ---
>  include/resolv.h                              |   3 +-
>  resolv/Makefile                               |   1 +
>  resolv/Versions                               |   4 +-
>  resolv/dn_skipname.c                          | 103 ++++++++++++++++++
>  resolv/nss_dns/dns-canon.c                    |   4 +-
>  resolv/nss_dns/dns-network.c                  |   2 +-
>  resolv/res_comp.c                             |  13 ---
>  resolv/resolv.h                               |   1 -
>  sysdeps/mach/hurd/i386/libc.abilist           |   2 +
>  sysdeps/mach/hurd/i386/libresolv.abilist      |   1 -
>  sysdeps/unix/sysv/linux/aarch64/libc.abilist  |   2 +
>  .../unix/sysv/linux/aarch64/libresolv.abilist |   1 -
>  sysdeps/unix/sysv/linux/alpha/libc.abilist    |   2 +
>  .../unix/sysv/linux/alpha/libresolv.abilist   |   1 -
>  sysdeps/unix/sysv/linux/arc/libc.abilist      |   2 +
>  sysdeps/unix/sysv/linux/arc/libresolv.abilist |   1 -
>  sysdeps/unix/sysv/linux/arm/be/libc.abilist   |   2 +
>  .../unix/sysv/linux/arm/be/libresolv.abilist  |   1 -
>  sysdeps/unix/sysv/linux/arm/le/libc.abilist   |   2 +
>  .../unix/sysv/linux/arm/le/libresolv.abilist  |   1 -
>  sysdeps/unix/sysv/linux/csky/libc.abilist     |   2 +
>  .../unix/sysv/linux/csky/libresolv.abilist    |   1 -
>  sysdeps/unix/sysv/linux/hppa/libc.abilist     |   2 +
>  .../unix/sysv/linux/hppa/libresolv.abilist    |   1 -
>  sysdeps/unix/sysv/linux/i386/libc.abilist     |   2 +
>  .../unix/sysv/linux/i386/libresolv.abilist    |   1 -
>  sysdeps/unix/sysv/linux/ia64/libc.abilist     |   2 +
>  .../unix/sysv/linux/ia64/libresolv.abilist    |   1 -
>  .../sysv/linux/m68k/coldfire/libc.abilist     |   2 +
>  .../linux/m68k/coldfire/libresolv.abilist     |   1 -
>  .../unix/sysv/linux/m68k/m680x0/libc.abilist  |   2 +
>  .../sysv/linux/m68k/m680x0/libresolv.abilist  |   1 -
>  .../sysv/linux/microblaze/be/libc.abilist     |   2 +
>  .../linux/microblaze/be/libresolv.abilist     |   1 -
>  .../sysv/linux/microblaze/le/libc.abilist     |   2 +
>  .../linux/microblaze/le/libresolv.abilist     |   1 -
>  .../sysv/linux/mips/mips32/fpu/libc.abilist   |   2 +
>  .../sysv/linux/mips/mips32/libresolv.abilist  |   1 -
>  .../sysv/linux/mips/mips32/nofpu/libc.abilist |   2 +
>  .../sysv/linux/mips/mips64/n32/libc.abilist   |   2 +
>  .../linux/mips/mips64/n32/libresolv.abilist   |   1 -
>  .../sysv/linux/mips/mips64/n64/libc.abilist   |   2 +
>  .../linux/mips/mips64/n64/libresolv.abilist   |   1 -
>  sysdeps/unix/sysv/linux/nios2/libc.abilist    |   2 +
>  .../unix/sysv/linux/nios2/libresolv.abilist   |   1 -
>  .../linux/powerpc/powerpc32/fpu/libc.abilist  |   2 +
>  .../linux/powerpc/powerpc32/libresolv.abilist |   1 -
>  .../powerpc/powerpc32/nofpu/libc.abilist      |   2 +
>  .../linux/powerpc/powerpc64/be/libc.abilist   |   2 +
>  .../powerpc/powerpc64/be/libresolv.abilist    |   1 -
>  .../linux/powerpc/powerpc64/le/libc.abilist   |   2 +
>  .../powerpc/powerpc64/le/libresolv.abilist    |   1 -
>  .../unix/sysv/linux/riscv/rv32/libc.abilist   |   2 +
>  .../sysv/linux/riscv/rv32/libresolv.abilist   |   1 -
>  .../unix/sysv/linux/riscv/rv64/libc.abilist   |   2 +
>  .../sysv/linux/riscv/rv64/libresolv.abilist   |   1 -
>  .../unix/sysv/linux/s390/s390-32/libc.abilist |   2 +
>  .../sysv/linux/s390/s390-32/libresolv.abilist |   1 -
>  .../unix/sysv/linux/s390/s390-64/libc.abilist |   2 +
>  .../sysv/linux/s390/s390-64/libresolv.abilist |   1 -
>  sysdeps/unix/sysv/linux/sh/be/libc.abilist    |   2 +
>  .../unix/sysv/linux/sh/be/libresolv.abilist   |   1 -
>  sysdeps/unix/sysv/linux/sh/le/libc.abilist    |   2 +
>  .../unix/sysv/linux/sh/le/libresolv.abilist   |   1 -
>  .../sysv/linux/sparc/sparc32/libc.abilist     |   2 +
>  .../linux/sparc/sparc32/libresolv.abilist     |   1 -
>  .../sysv/linux/sparc/sparc64/libc.abilist     |   2 +
>  .../linux/sparc/sparc64/libresolv.abilist     |   1 -
>  .../unix/sysv/linux/x86_64/64/libc.abilist    |   2 +
>  .../sysv/linux/x86_64/64/libresolv.abilist    |   1 -
>  .../unix/sysv/linux/x86_64/x32/libc.abilist   |   2 +
>  .../sysv/linux/x86_64/x32/libresolv.abilist   |   1 -
>  72 files changed, 178 insertions(+), 50 deletions(-)
>  create mode 100644 resolv/dn_skipname.c
> 
> diff --git a/include/resolv.h b/include/resolv.h
> index 602f184643..378b36d612 100644
> --- a/include/resolv.h
> +++ b/include/resolv.h
> @@ -44,7 +44,6 @@ libresolv_hidden_proto (_sethtent)
>  libresolv_hidden_proto (_gethtent)
>  libresolv_hidden_proto (_gethtbyaddr)
>  libresolv_hidden_proto (_gethtbyname2)
> -libresolv_hidden_proto (__dn_skipname)

OK.

>  libresolv_hidden_proto (__res_hnok)
>  libresolv_hidden_proto (__res_dnok)
>  libresolv_hidden_proto (__putlong)
> @@ -66,6 +65,8 @@ libresolv_hidden_proto (__dn_count_labels)
>  
>  extern __typeof (dn_expand) __libc_dn_expand;
>  libc_hidden_proto (__libc_dn_expand)
> +extern __typeof (dn_skipname) __libc_dn_skipname;
> +libc_hidden_proto (__libc_dn_skipname)

OK.

>  
>  # endif /* _RESOLV_H_ && !_ISOMAC */
>  #endif
> diff --git a/resolv/Makefile b/resolv/Makefile
> index 936518523d..e1a608f4ac 100644
> --- a/resolv/Makefile
> +++ b/resolv/Makefile
> @@ -30,6 +30,7 @@ headers	:= resolv.h bits/types/res_state.h \
>  routines := \
>    dn_comp \
>    dn_expand \
> +  dn_skipname \

OK.

>    herror \
>    inet_addr \
>    inet_ntop \
> diff --git a/resolv/Versions b/resolv/Versions
> index e36cf45cfa..634c7833a8 100644
> --- a/resolv/Versions
> +++ b/resolv/Versions
> @@ -1,6 +1,7 @@
>  libc {
>    GLIBC_2.0 {
>      __dn_comp;
> +    __dn_skipname;

OK.

>      __h_errno_location;
>      __res_randomid;
>      _res;
> @@ -45,6 +46,7 @@ libc {
>  %endif
>      dn_comp;
>      dn_expand;
> +    dn_skipname;

OK.

>      ns_name_compress;
>      ns_name_ntop;
>      ns_name_pack;
> @@ -61,6 +63,7 @@ libc {
>      __inet_aton_exact;
>      __inet_pton_length;
>      __libc_dn_expand;
> +    __libc_dn_skipname;

OK.

>      __ns_name_compress;
>      __ns_name_ntop;
>      __ns_name_pack;
> @@ -82,7 +85,6 @@ libresolv {
>      __b64_ntop;
>      __b64_pton;
>      __dn_count_labels;
> -    __dn_skipname;

OK.

>      __fp_nquery;
>      __fp_query;
>      __fp_resstat;
> diff --git a/resolv/dn_skipname.c b/resolv/dn_skipname.c
> new file mode 100644
> index 0000000000..b9a587faff
> --- /dev/null
> +++ b/resolv/dn_skipname.c
> @@ -0,0 +1,103 @@
> +/* Skipping over a compressed DNS domain name in wire format.

OK.

> +   Copyright (C) 1995-2021 Free Software Foundation, Inc.
> +   This file is part of the GNU C Library.
> +
> +   The GNU C Library is free software; you can redistribute it and/or
> +   modify it under the terms of the GNU Lesser General Public
> +   License as published by the Free Software Foundation; either
> +   version 2.1 of the License, or (at your option) any later version.
> +
> +   The GNU C Library is distributed in the hope that it will be useful,
> +   but WITHOUT ANY WARRANTY; without even the implied warranty of
> +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> +   Lesser General Public License for more details.
> +
> +   You should have received a copy of the GNU Lesser General Public
> +   License along with the GNU C Library; if not, see
> +   <https://www.gnu.org/licenses/>.  */
> +
> +/*
> + * Copyright (c) 1985, 1993
> + *    The Regents of the University of California.  All rights reserved.
> + *
> + * Redistribution and use in source and binary forms, with or without
> + * modification, are permitted provided that the following conditions
> + * are met:
> + * 1. Redistributions of source code must retain the above copyright
> + *    notice, this list of conditions and the following disclaimer.
> + * 2. Redistributions in binary form must reproduce the above copyright
> + *    notice, this list of conditions and the following disclaimer in the
> + *    documentation and/or other materials provided with the distribution.
> + * 4. Neither the name of the University nor the names of its contributors
> + *    may be used to endorse or promote products derived from this software
> + *    without specific prior written permission.
> + *
> + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
> + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
> + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
> + * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
> + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
> + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
> + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
> + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
> + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
> + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
> + * SUCH DAMAGE.
> + */
> +
> +/*
> + * Portions Copyright (c) 1993 by Digital Equipment Corporation.
> + *
> + * Permission to use, copy, modify, and distribute this software for any
> + * purpose with or without fee is hereby granted, provided that the above
> + * copyright notice and this permission notice appear in all copies, and that
> + * the name of Digital Equipment Corporation not be used in advertising or
> + * publicity pertaining to distribution of the document or software without
> + * specific, written prior permission.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
> + * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
> + * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
> + * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
> + * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
> + * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
> + * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
> + * SOFTWARE.
> + */
> +
> +/*
> + * Portions Copyright (c) 1996-1999 by Internet Software Consortium.
> + *
> + * Permission to use, copy, modify, and distribute this software for any
> + * purpose with or without fee is hereby granted, provided that the above
> + * copyright notice and this permission notice appear in all copies.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
> + * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
> + * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
> + * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
> + * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
> + * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
> + * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
> + * SOFTWARE.
> + */
> +
> +#include <arpa/nameser.h>
> +#include <resolv.h>
> +#include <shlib-compat.h>
> +
> +/* Skips over a compressed domain name. Returns the size or -1.  */
> +int
> +___dn_skipname (const unsigned char *ptr, const unsigned char *eom)
> +{
> +  const unsigned char *saveptr = ptr;
> +  if (__ns_name_skip (&ptr, eom) < 0)
> +    return -1;
> +  return ptr - saveptr;

OK. Match.

> +}
> +versioned_symbol (libc, ___dn_skipname, dn_skipname, GLIBC_2_34);
> +versioned_symbol (libc, ___dn_skipname, __libc_dn_skipname, GLIBC_PRIVATE);
> +libc_hidden_ver (___dn_skipname, __libc_dn_skipname)
> +#if OTHER_SHLIB_COMPAT (libresolv, GLIBC_2_0, GLIBC_2_34)
> +compat_symbol (libresolv, ___dn_skipname, __dn_skipname, GLIBC_2_0);
> +#endif
> diff --git a/resolv/nss_dns/dns-canon.c b/resolv/nss_dns/dns-canon.c
> index b7340d7b9e..c5718ce3ab 100644
> --- a/resolv/nss_dns/dns-canon.c
> +++ b/resolv/nss_dns/dns-canon.c
> @@ -90,7 +90,7 @@ _nss_dns_getcanonname_r (const char *name, char *buffer, size_t buflen,
>  	  unsigned char *endptr = ansp.ptr + r;
>  
>  	  /* Skip over the query.  This is the name, type, and class.  */
> -	  int s = __dn_skipname (ptr, endptr);
> +	  int s = __libc_dn_skipname (ptr, endptr);

OK.

>  	  if (s < 0)
>  	    {
>  	    unavail:
> @@ -108,7 +108,7 @@ _nss_dns_getcanonname_r (const char *name, char *buffer, size_t buflen,
>  		 then type, class, TTL, and the length of the RDATA.
>  		 We remember the name start.  */
>  	      unsigned char *namestart = ptr;
> -	      s = __dn_skipname (ptr, endptr);
> +	      s = __libc_dn_skipname (ptr, endptr);

OK.

>  	      if (s < 0)
>  		goto unavail;
>  
> diff --git a/resolv/nss_dns/dns-network.c b/resolv/nss_dns/dns-network.c
> index 2be9bfe2b3..801313caec 100644
> --- a/resolv/nss_dns/dns-network.c
> +++ b/resolv/nss_dns/dns-network.c
> @@ -322,7 +322,7 @@ getanswer_r (const querybuf *answer, int anslen, struct netent *result,
>    /* Skip the question part.  */
>    while (question_count-- > 0)
>      {
> -      int n = __dn_skipname (cp, end_of_message);
> +      int n = __libc_dn_skipname (cp, end_of_message);

OK.

>        if (n < 0 || end_of_message - (cp + n) < QFIXEDSZ)
>         {
>           __set_h_errno (NO_RECOVERY);
> diff --git a/resolv/res_comp.c b/resolv/res_comp.c
> index 1930f17302..16f7e02111 100644
> --- a/resolv/res_comp.c
> +++ b/resolv/res_comp.c
> @@ -92,19 +92,6 @@
>  #include <string.h>
>  #include <unistd.h>
>  
> -/*
> - * Skip over a compressed domain name. Return the size or -1.
> - */
> -int
> -dn_skipname(const u_char *ptr, const u_char *eom) {
> -	const u_char *saveptr = ptr;
> -
> -	if (ns_name_skip(&ptr, eom) == -1)
> -		return (-1);
> -	return (ptr - saveptr);
> -}
> -libresolv_hidden_def (dn_skipname)
> -

OK. Remove.

>  /* Return true if the string consists of printable ASCII characters
>     only.  */
>  static bool
> diff --git a/resolv/resolv.h b/resolv/resolv.h
> index 78ad81577a..3056e1aafe 100644
> --- a/resolv/resolv.h
> +++ b/resolv/resolv.h
> @@ -211,7 +211,6 @@ __END_DECLS
>  #define b64_ntop		__b64_ntop
>  #define b64_pton		__b64_pton
>  #define dn_count_labels		__dn_count_labels
> -#define dn_skipname		__dn_skipname

OK. Export as dn_skipname now.

>  #define fp_resstat		__fp_resstat
>  #define loc_aton		__loc_aton
>  #define loc_ntoa		__loc_ntoa
> diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist
> index 5692245dbb..3e9d6345bb 100644
> --- a/sysdeps/mach/hurd/i386/libc.abilist
> +++ b/sysdeps/mach/hurd/i386/libc.abilist
> @@ -246,6 +246,7 @@ GLIBC_2.2.6 __dgettext F
>  GLIBC_2.2.6 __divdi3 F
>  GLIBC_2.2.6 __dn_comp F
>  GLIBC_2.2.6 __dn_expand F
> +GLIBC_2.2.6 __dn_skipname F
>  GLIBC_2.2.6 __dup2 F
>  GLIBC_2.2.6 __duplocale F
>  GLIBC_2.2.6 __environ D 0x4
> @@ -2238,6 +2239,7 @@ GLIBC_2.34 dlsym F
>  GLIBC_2.34 dlvsym F
>  GLIBC_2.34 dn_comp F
>  GLIBC_2.34 dn_expand F
> +GLIBC_2.34 dn_skipname F
>  GLIBC_2.34 execveat F
>  GLIBC_2.34 forkpty F
>  GLIBC_2.34 login F
> diff --git a/sysdeps/mach/hurd/i386/libresolv.abilist b/sysdeps/mach/hurd/i386/libresolv.abilist
> index 0132f6cef2..0c8d828f26 100644
> --- a/sysdeps/mach/hurd/i386/libresolv.abilist
> +++ b/sysdeps/mach/hurd/i386/libresolv.abilist
> @@ -1,7 +1,6 @@
>  GLIBC_2.2.6 __b64_ntop F
>  GLIBC_2.2.6 __b64_pton F
>  GLIBC_2.2.6 __dn_count_labels F
> -GLIBC_2.2.6 __dn_skipname F
>  GLIBC_2.2.6 __fp_nquery F
>  GLIBC_2.2.6 __fp_query F
>  GLIBC_2.2.6 __fp_resstat F
> diff --git a/sysdeps/unix/sysv/linux/aarch64/libc.abilist b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
> index 714de3bb0d..3745fe29eb 100644
> --- a/sysdeps/unix/sysv/linux/aarch64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
> @@ -168,6 +168,7 @@ GLIBC_2.17 __default_morecore F
>  GLIBC_2.17 __dgettext F
>  GLIBC_2.17 __dn_comp F
>  GLIBC_2.17 __dn_expand F
> +GLIBC_2.17 __dn_skipname F
>  GLIBC_2.17 __dprintf_chk F
>  GLIBC_2.17 __dup2 F
>  GLIBC_2.17 __duplocale F
> @@ -2433,6 +2434,7 @@ GLIBC_2.34 dlsym F
>  GLIBC_2.34 dlvsym F
>  GLIBC_2.34 dn_comp F
>  GLIBC_2.34 dn_expand F
> +GLIBC_2.34 dn_skipname F
>  GLIBC_2.34 execveat F
>  GLIBC_2.34 forkpty F
>  GLIBC_2.34 gai_cancel F
> diff --git a/sysdeps/unix/sysv/linux/aarch64/libresolv.abilist b/sysdeps/unix/sysv/linux/aarch64/libresolv.abilist
> index 50019b9bdd..beb6e0efe3 100644
> --- a/sysdeps/unix/sysv/linux/aarch64/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/aarch64/libresolv.abilist
> @@ -1,7 +1,6 @@
>  GLIBC_2.17 __b64_ntop F
>  GLIBC_2.17 __b64_pton F
>  GLIBC_2.17 __dn_count_labels F
> -GLIBC_2.17 __dn_skipname F
>  GLIBC_2.17 __fp_nquery F
>  GLIBC_2.17 __fp_query F
>  GLIBC_2.17 __fp_resstat F
> diff --git a/sysdeps/unix/sysv/linux/alpha/libc.abilist b/sysdeps/unix/sysv/linux/alpha/libc.abilist
> index 61c47275c3..55030a922a 100644
> --- a/sysdeps/unix/sysv/linux/alpha/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist
> @@ -125,6 +125,7 @@ GLIBC_2.0 __divlu F
>  GLIBC_2.0 __divq F
>  GLIBC_2.0 __divqu F
>  GLIBC_2.0 __dn_comp F
> +GLIBC_2.0 __dn_skipname F
>  GLIBC_2.0 __dup2 F
>  GLIBC_2.0 __environ D 0x8
>  GLIBC_2.0 __errno_location F
> @@ -2526,6 +2527,7 @@ GLIBC_2.34 dlsym F
>  GLIBC_2.34 dlvsym F
>  GLIBC_2.34 dn_comp F
>  GLIBC_2.34 dn_expand F
> +GLIBC_2.34 dn_skipname F
>  GLIBC_2.34 execveat F
>  GLIBC_2.34 forkpty F
>  GLIBC_2.34 gai_cancel F
> diff --git a/sysdeps/unix/sysv/linux/alpha/libresolv.abilist b/sysdeps/unix/sysv/linux/alpha/libresolv.abilist
> index cee6c22004..7c80f1818a 100644
> --- a/sysdeps/unix/sysv/linux/alpha/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/alpha/libresolv.abilist
> @@ -1,7 +1,6 @@
>  GLIBC_2.0 __b64_ntop F
>  GLIBC_2.0 __b64_pton F
>  GLIBC_2.0 __dn_count_labels F
> -GLIBC_2.0 __dn_skipname F
>  GLIBC_2.0 __fp_nquery F
>  GLIBC_2.0 __fp_query F
>  GLIBC_2.0 __fp_resstat F
> diff --git a/sysdeps/unix/sysv/linux/arc/libc.abilist b/sysdeps/unix/sysv/linux/arc/libc.abilist
> index 4dca04958f..8211028280 100644
> --- a/sysdeps/unix/sysv/linux/arc/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/arc/libc.abilist
> @@ -168,6 +168,7 @@ GLIBC_2.32 __default_morecore F
>  GLIBC_2.32 __dgettext F
>  GLIBC_2.32 __dn_comp F
>  GLIBC_2.32 __dn_expand F
> +GLIBC_2.32 __dn_skipname F
>  GLIBC_2.32 __dprintf_chk F
>  GLIBC_2.32 __dup2 F
>  GLIBC_2.32 __duplocale F
> @@ -2192,6 +2193,7 @@ GLIBC_2.34 dlsym F
>  GLIBC_2.34 dlvsym F
>  GLIBC_2.34 dn_comp F
>  GLIBC_2.34 dn_expand F
> +GLIBC_2.34 dn_skipname F
>  GLIBC_2.34 execveat F
>  GLIBC_2.34 forkpty F
>  GLIBC_2.34 gai_cancel F
> diff --git a/sysdeps/unix/sysv/linux/arc/libresolv.abilist b/sysdeps/unix/sysv/linux/arc/libresolv.abilist
> index f9326b9b22..81ab66bc6d 100644
> --- a/sysdeps/unix/sysv/linux/arc/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/arc/libresolv.abilist
> @@ -1,7 +1,6 @@
>  GLIBC_2.32 __b64_ntop F
>  GLIBC_2.32 __b64_pton F
>  GLIBC_2.32 __dn_count_labels F
> -GLIBC_2.32 __dn_skipname F
>  GLIBC_2.32 __fp_nquery F
>  GLIBC_2.32 __fp_query F
>  GLIBC_2.32 __fp_resstat F
> diff --git a/sysdeps/unix/sysv/linux/arm/be/libc.abilist b/sysdeps/unix/sysv/linux/arm/be/libc.abilist
> index 6caf581b98..1f97005a6e 100644
> --- a/sysdeps/unix/sysv/linux/arm/be/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/arm/be/libc.abilist
> @@ -317,6 +317,7 @@ GLIBC_2.34 dlsym F
>  GLIBC_2.34 dlvsym F
>  GLIBC_2.34 dn_comp F
>  GLIBC_2.34 dn_expand F
> +GLIBC_2.34 dn_skipname F
>  GLIBC_2.34 execveat F
>  GLIBC_2.34 forkpty F
>  GLIBC_2.34 gai_cancel F
> @@ -649,6 +650,7 @@ GLIBC_2.4 __default_morecore F
>  GLIBC_2.4 __dgettext F
>  GLIBC_2.4 __dn_comp F
>  GLIBC_2.4 __dn_expand F
> +GLIBC_2.4 __dn_skipname F
>  GLIBC_2.4 __dup2 F
>  GLIBC_2.4 __duplocale F
>  GLIBC_2.4 __endmntent F
> diff --git a/sysdeps/unix/sysv/linux/arm/be/libresolv.abilist b/sysdeps/unix/sysv/linux/arm/be/libresolv.abilist
> index e67eec5b80..5c4871fbec 100644
> --- a/sysdeps/unix/sysv/linux/arm/be/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/arm/be/libresolv.abilist
> @@ -1,7 +1,6 @@
>  GLIBC_2.4 __b64_ntop F
>  GLIBC_2.4 __b64_pton F
>  GLIBC_2.4 __dn_count_labels F
> -GLIBC_2.4 __dn_skipname F
>  GLIBC_2.4 __fp_nquery F
>  GLIBC_2.4 __fp_query F
>  GLIBC_2.4 __fp_resstat F
> diff --git a/sysdeps/unix/sysv/linux/arm/le/libc.abilist b/sysdeps/unix/sysv/linux/arm/le/libc.abilist
> index e0d0789930..a7ce26c5e1 100644
> --- a/sysdeps/unix/sysv/linux/arm/le/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/arm/le/libc.abilist
> @@ -314,6 +314,7 @@ GLIBC_2.34 dlsym F
>  GLIBC_2.34 dlvsym F
>  GLIBC_2.34 dn_comp F
>  GLIBC_2.34 dn_expand F
> +GLIBC_2.34 dn_skipname F
>  GLIBC_2.34 execveat F
>  GLIBC_2.34 forkpty F
>  GLIBC_2.34 gai_cancel F
> @@ -646,6 +647,7 @@ GLIBC_2.4 __default_morecore F
>  GLIBC_2.4 __dgettext F
>  GLIBC_2.4 __dn_comp F
>  GLIBC_2.4 __dn_expand F
> +GLIBC_2.4 __dn_skipname F
>  GLIBC_2.4 __dup2 F
>  GLIBC_2.4 __duplocale F
>  GLIBC_2.4 __endmntent F
> diff --git a/sysdeps/unix/sysv/linux/arm/le/libresolv.abilist b/sysdeps/unix/sysv/linux/arm/le/libresolv.abilist
> index e67eec5b80..5c4871fbec 100644
> --- a/sysdeps/unix/sysv/linux/arm/le/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/arm/le/libresolv.abilist
> @@ -1,7 +1,6 @@
>  GLIBC_2.4 __b64_ntop F
>  GLIBC_2.4 __b64_pton F
>  GLIBC_2.4 __dn_count_labels F
> -GLIBC_2.4 __dn_skipname F
>  GLIBC_2.4 __fp_nquery F
>  GLIBC_2.4 __fp_query F
>  GLIBC_2.4 __fp_resstat F
> diff --git a/sysdeps/unix/sysv/linux/csky/libc.abilist b/sysdeps/unix/sysv/linux/csky/libc.abilist
> index f259a65b82..a9ada43f4f 100644
> --- a/sysdeps/unix/sysv/linux/csky/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/csky/libc.abilist
> @@ -168,6 +168,7 @@ GLIBC_2.29 __default_morecore F
>  GLIBC_2.29 __dgettext F
>  GLIBC_2.29 __dn_comp F
>  GLIBC_2.29 __dn_expand F
> +GLIBC_2.29 __dn_skipname F
>  GLIBC_2.29 __dprintf_chk F
>  GLIBC_2.29 __dup2 F
>  GLIBC_2.29 __duplocale F
> @@ -2458,6 +2459,7 @@ GLIBC_2.34 dlsym F
>  GLIBC_2.34 dlvsym F
>  GLIBC_2.34 dn_comp F
>  GLIBC_2.34 dn_expand F
> +GLIBC_2.34 dn_skipname F
>  GLIBC_2.34 execveat F
>  GLIBC_2.34 forkpty F
>  GLIBC_2.34 gai_cancel F
> diff --git a/sysdeps/unix/sysv/linux/csky/libresolv.abilist b/sysdeps/unix/sysv/linux/csky/libresolv.abilist
> index 798af0930d..3a2239bdee 100644
> --- a/sysdeps/unix/sysv/linux/csky/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/csky/libresolv.abilist
> @@ -1,7 +1,6 @@
>  GLIBC_2.29 __b64_ntop F
>  GLIBC_2.29 __b64_pton F
>  GLIBC_2.29 __dn_count_labels F
> -GLIBC_2.29 __dn_skipname F
>  GLIBC_2.29 __fp_nquery F
>  GLIBC_2.29 __fp_query F
>  GLIBC_2.29 __fp_resstat F
> diff --git a/sysdeps/unix/sysv/linux/hppa/libc.abilist b/sysdeps/unix/sysv/linux/hppa/libc.abilist
> index 83c9b2e5f6..a5c1ca11a7 100644
> --- a/sysdeps/unix/sysv/linux/hppa/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/hppa/libc.abilist
> @@ -1,4 +1,5 @@
>  GLIBC_2.0 __dn_comp F
> +GLIBC_2.0 __dn_skipname F
>  GLIBC_2.0 dladdr F
>  GLIBC_2.0 dlclose F
>  GLIBC_2.0 dlerror F
> @@ -2405,6 +2406,7 @@ GLIBC_2.34 dlsym F
>  GLIBC_2.34 dlvsym F
>  GLIBC_2.34 dn_comp F
>  GLIBC_2.34 dn_expand F
> +GLIBC_2.34 dn_skipname F
>  GLIBC_2.34 execveat F
>  GLIBC_2.34 forkpty F
>  GLIBC_2.34 gai_cancel F
> diff --git a/sysdeps/unix/sysv/linux/hppa/libresolv.abilist b/sysdeps/unix/sysv/linux/hppa/libresolv.abilist
> index 8ee174124c..48ff3bffa1 100644
> --- a/sysdeps/unix/sysv/linux/hppa/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/hppa/libresolv.abilist
> @@ -1,7 +1,6 @@
>  GLIBC_2.0 __b64_ntop F
>  GLIBC_2.0 __b64_pton F
>  GLIBC_2.0 __dn_count_labels F
> -GLIBC_2.0 __dn_skipname F
>  GLIBC_2.0 __fp_nquery F
>  GLIBC_2.0 __fp_query F
>  GLIBC_2.0 __fp_resstat F
> diff --git a/sysdeps/unix/sysv/linux/i386/libc.abilist b/sysdeps/unix/sysv/linux/i386/libc.abilist
> index 62a140ecf3..8fa262b560 100644
> --- a/sysdeps/unix/sysv/linux/i386/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/i386/libc.abilist
> @@ -123,6 +123,7 @@ GLIBC_2.0 __deregister_frame_info F
>  GLIBC_2.0 __dgettext F
>  GLIBC_2.0 __divdi3 F
>  GLIBC_2.0 __dn_comp F
> +GLIBC_2.0 __dn_skipname F
>  GLIBC_2.0 __dup2 F
>  GLIBC_2.0 __environ D 0x4
>  GLIBC_2.0 __errno_location F
> @@ -2589,6 +2590,7 @@ GLIBC_2.34 dlsym F
>  GLIBC_2.34 dlvsym F
>  GLIBC_2.34 dn_comp F
>  GLIBC_2.34 dn_expand F
> +GLIBC_2.34 dn_skipname F
>  GLIBC_2.34 execveat F
>  GLIBC_2.34 forkpty F
>  GLIBC_2.34 gai_cancel F
> diff --git a/sysdeps/unix/sysv/linux/i386/libresolv.abilist b/sysdeps/unix/sysv/linux/i386/libresolv.abilist
> index 8ee174124c..48ff3bffa1 100644
> --- a/sysdeps/unix/sysv/linux/i386/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/i386/libresolv.abilist
> @@ -1,7 +1,6 @@
>  GLIBC_2.0 __b64_ntop F
>  GLIBC_2.0 __b64_pton F
>  GLIBC_2.0 __dn_count_labels F
> -GLIBC_2.0 __dn_skipname F
>  GLIBC_2.0 __fp_nquery F
>  GLIBC_2.0 __fp_query F
>  GLIBC_2.0 __fp_resstat F
> diff --git a/sysdeps/unix/sysv/linux/ia64/libc.abilist b/sysdeps/unix/sysv/linux/ia64/libc.abilist
> index 24ae204834..78dbe02b3b 100644
> --- a/sysdeps/unix/sysv/linux/ia64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/ia64/libc.abilist
> @@ -1,4 +1,5 @@
>  GLIBC_2.0 __dn_comp F
> +GLIBC_2.0 __dn_skipname F
>  GLIBC_2.0 dladdr F
>  GLIBC_2.0 dlclose F
>  GLIBC_2.0 dlerror F
> @@ -2364,6 +2365,7 @@ GLIBC_2.34 dlsym F
>  GLIBC_2.34 dlvsym F
>  GLIBC_2.34 dn_comp F
>  GLIBC_2.34 dn_expand F
> +GLIBC_2.34 dn_skipname F
>  GLIBC_2.34 execveat F
>  GLIBC_2.34 forkpty F
>  GLIBC_2.34 gai_cancel F
> diff --git a/sysdeps/unix/sysv/linux/ia64/libresolv.abilist b/sysdeps/unix/sysv/linux/ia64/libresolv.abilist
> index cee6c22004..7c80f1818a 100644
> --- a/sysdeps/unix/sysv/linux/ia64/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/ia64/libresolv.abilist
> @@ -1,7 +1,6 @@
>  GLIBC_2.0 __b64_ntop F
>  GLIBC_2.0 __b64_pton F
>  GLIBC_2.0 __dn_count_labels F
> -GLIBC_2.0 __dn_skipname F
>  GLIBC_2.0 __fp_nquery F
>  GLIBC_2.0 __fp_query F
>  GLIBC_2.0 __fp_resstat F
> diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
> index 162ef0bc36..125a40dc15 100644
> --- a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
> @@ -318,6 +318,7 @@ GLIBC_2.34 dlsym F
>  GLIBC_2.34 dlvsym F
>  GLIBC_2.34 dn_comp F
>  GLIBC_2.34 dn_expand F
> +GLIBC_2.34 dn_skipname F
>  GLIBC_2.34 execveat F
>  GLIBC_2.34 forkpty F
>  GLIBC_2.34 gai_cancel F
> @@ -635,6 +636,7 @@ GLIBC_2.4 __dgettext F
>  GLIBC_2.4 __divdi3 F
>  GLIBC_2.4 __dn_comp F
>  GLIBC_2.4 __dn_expand F
> +GLIBC_2.4 __dn_skipname F
>  GLIBC_2.4 __dup2 F
>  GLIBC_2.4 __duplocale F
>  GLIBC_2.4 __endmntent F
> diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libresolv.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libresolv.abilist
> index e67eec5b80..5c4871fbec 100644
> --- a/sysdeps/unix/sysv/linux/m68k/coldfire/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libresolv.abilist
> @@ -1,7 +1,6 @@
>  GLIBC_2.4 __b64_ntop F
>  GLIBC_2.4 __b64_pton F
>  GLIBC_2.4 __dn_count_labels F
> -GLIBC_2.4 __dn_skipname F
>  GLIBC_2.4 __fp_nquery F
>  GLIBC_2.4 __fp_query F
>  GLIBC_2.4 __fp_resstat F
> diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
> index 2983e2a063..3c31d4f442 100644
> --- a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
> @@ -123,6 +123,7 @@ GLIBC_2.0 __deregister_frame_info F
>  GLIBC_2.0 __dgettext F
>  GLIBC_2.0 __divdi3 F
>  GLIBC_2.0 __dn_comp F
> +GLIBC_2.0 __dn_skipname F
>  GLIBC_2.0 __dup2 F
>  GLIBC_2.0 __environ D 0x4
>  GLIBC_2.0 __errno_location F
> @@ -2532,6 +2533,7 @@ GLIBC_2.34 dlsym F
>  GLIBC_2.34 dlvsym F
>  GLIBC_2.34 dn_comp F
>  GLIBC_2.34 dn_expand F
> +GLIBC_2.34 dn_skipname F
>  GLIBC_2.34 execveat F
>  GLIBC_2.34 forkpty F
>  GLIBC_2.34 gai_cancel F
> diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libresolv.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libresolv.abilist
> index 8ee174124c..48ff3bffa1 100644
> --- a/sysdeps/unix/sysv/linux/m68k/m680x0/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libresolv.abilist
> @@ -1,7 +1,6 @@
>  GLIBC_2.0 __b64_ntop F
>  GLIBC_2.0 __b64_pton F
>  GLIBC_2.0 __dn_count_labels F
> -GLIBC_2.0 __dn_skipname F
>  GLIBC_2.0 __fp_nquery F
>  GLIBC_2.0 __fp_query F
>  GLIBC_2.0 __fp_resstat F
> diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
> index ebdeb8aefa..30b5703ab6 100644
> --- a/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
> @@ -169,6 +169,7 @@ GLIBC_2.18 __default_morecore F
>  GLIBC_2.18 __dgettext F
>  GLIBC_2.18 __dn_comp F
>  GLIBC_2.18 __dn_expand F
> +GLIBC_2.18 __dn_skipname F
>  GLIBC_2.18 __dprintf_chk F
>  GLIBC_2.18 __dup2 F
>  GLIBC_2.18 __duplocale F
> @@ -2509,6 +2510,7 @@ GLIBC_2.34 dlsym F
>  GLIBC_2.34 dlvsym F
>  GLIBC_2.34 dn_comp F
>  GLIBC_2.34 dn_expand F
> +GLIBC_2.34 dn_skipname F
>  GLIBC_2.34 execveat F
>  GLIBC_2.34 forkpty F
>  GLIBC_2.34 gai_cancel F
> diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libresolv.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libresolv.abilist
> index b7206367f8..eeb54aff28 100644
> --- a/sysdeps/unix/sysv/linux/microblaze/be/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/microblaze/be/libresolv.abilist
> @@ -1,7 +1,6 @@
>  GLIBC_2.18 __b64_ntop F
>  GLIBC_2.18 __b64_pton F
>  GLIBC_2.18 __dn_count_labels F
> -GLIBC_2.18 __dn_skipname F
>  GLIBC_2.18 __fp_nquery F
>  GLIBC_2.18 __fp_query F
>  GLIBC_2.18 __fp_resstat F
> diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
> index b564531dfe..daaf5dbdee 100644
> --- a/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
> @@ -169,6 +169,7 @@ GLIBC_2.18 __default_morecore F
>  GLIBC_2.18 __dgettext F
>  GLIBC_2.18 __dn_comp F
>  GLIBC_2.18 __dn_expand F
> +GLIBC_2.18 __dn_skipname F
>  GLIBC_2.18 __dprintf_chk F
>  GLIBC_2.18 __dup2 F
>  GLIBC_2.18 __duplocale F
> @@ -2506,6 +2507,7 @@ GLIBC_2.34 dlsym F
>  GLIBC_2.34 dlvsym F
>  GLIBC_2.34 dn_comp F
>  GLIBC_2.34 dn_expand F
> +GLIBC_2.34 dn_skipname F
>  GLIBC_2.34 execveat F
>  GLIBC_2.34 forkpty F
>  GLIBC_2.34 gai_cancel F
> diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libresolv.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libresolv.abilist
> index b7206367f8..eeb54aff28 100644
> --- a/sysdeps/unix/sysv/linux/microblaze/le/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/microblaze/le/libresolv.abilist
> @@ -1,7 +1,6 @@
>  GLIBC_2.18 __b64_ntop F
>  GLIBC_2.18 __b64_pton F
>  GLIBC_2.18 __dn_count_labels F
> -GLIBC_2.18 __dn_skipname F
>  GLIBC_2.18 __fp_nquery F
>  GLIBC_2.18 __fp_query F
>  GLIBC_2.18 __fp_resstat F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
> index 30ed1ecb5a..72a0f54281 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
> @@ -122,6 +122,7 @@ GLIBC_2.0 __deregister_frame F
>  GLIBC_2.0 __deregister_frame_info F
>  GLIBC_2.0 __dgettext F
>  GLIBC_2.0 __dn_comp F
> +GLIBC_2.0 __dn_skipname F
>  GLIBC_2.0 __dup2 F
>  GLIBC_2.0 __environ D 0x4
>  GLIBC_2.0 __errno_location F
> @@ -2497,6 +2498,7 @@ GLIBC_2.34 dlsym F
>  GLIBC_2.34 dlvsym F
>  GLIBC_2.34 dn_comp F
>  GLIBC_2.34 dn_expand F
> +GLIBC_2.34 dn_skipname F
>  GLIBC_2.34 execveat F
>  GLIBC_2.34 forkpty F
>  GLIBC_2.34 gai_cancel F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips32/libresolv.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libresolv.abilist
> index 8ee174124c..48ff3bffa1 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips32/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips32/libresolv.abilist
> @@ -1,7 +1,6 @@
>  GLIBC_2.0 __b64_ntop F
>  GLIBC_2.0 __b64_pton F
>  GLIBC_2.0 __dn_count_labels F
> -GLIBC_2.0 __dn_skipname F
>  GLIBC_2.0 __fp_nquery F
>  GLIBC_2.0 __fp_query F
>  GLIBC_2.0 __fp_resstat F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
> index 6288970497..cf390ad8cc 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
> @@ -122,6 +122,7 @@ GLIBC_2.0 __deregister_frame F
>  GLIBC_2.0 __deregister_frame_info F
>  GLIBC_2.0 __dgettext F
>  GLIBC_2.0 __dn_comp F
> +GLIBC_2.0 __dn_skipname F
>  GLIBC_2.0 __dup2 F
>  GLIBC_2.0 __environ D 0x4
>  GLIBC_2.0 __errno_location F
> @@ -2495,6 +2496,7 @@ GLIBC_2.34 dlsym F
>  GLIBC_2.34 dlvsym F
>  GLIBC_2.34 dn_comp F
>  GLIBC_2.34 dn_expand F
> +GLIBC_2.34 dn_skipname F
>  GLIBC_2.34 execveat F
>  GLIBC_2.34 forkpty F
>  GLIBC_2.34 gai_cancel F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
> index 7f379f189b..19d80bd992 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
> @@ -122,6 +122,7 @@ GLIBC_2.0 __deregister_frame F
>  GLIBC_2.0 __deregister_frame_info F
>  GLIBC_2.0 __dgettext F
>  GLIBC_2.0 __dn_comp F
> +GLIBC_2.0 __dn_skipname F
>  GLIBC_2.0 __dup2 F
>  GLIBC_2.0 __environ D 0x4
>  GLIBC_2.0 __errno_location F
> @@ -2503,6 +2504,7 @@ GLIBC_2.34 dlsym F
>  GLIBC_2.34 dlvsym F
>  GLIBC_2.34 dn_comp F
>  GLIBC_2.34 dn_expand F
> +GLIBC_2.34 dn_skipname F
>  GLIBC_2.34 execveat F
>  GLIBC_2.34 forkpty F
>  GLIBC_2.34 gai_cancel F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/libresolv.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libresolv.abilist
> index 8ee174124c..48ff3bffa1 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips64/n32/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips64/n32/libresolv.abilist
> @@ -1,7 +1,6 @@
>  GLIBC_2.0 __b64_ntop F
>  GLIBC_2.0 __b64_pton F
>  GLIBC_2.0 __dn_count_labels F
> -GLIBC_2.0 __dn_skipname F
>  GLIBC_2.0 __fp_nquery F
>  GLIBC_2.0 __fp_query F
>  GLIBC_2.0 __fp_resstat F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
> index adc8f70e9f..37add15070 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
> @@ -122,6 +122,7 @@ GLIBC_2.0 __deregister_frame F
>  GLIBC_2.0 __deregister_frame_info F
>  GLIBC_2.0 __dgettext F
>  GLIBC_2.0 __dn_comp F
> +GLIBC_2.0 __dn_skipname F
>  GLIBC_2.0 __dup2 F
>  GLIBC_2.0 __environ D 0x8
>  GLIBC_2.0 __errno_location F
> @@ -2415,6 +2416,7 @@ GLIBC_2.34 dlsym F
>  GLIBC_2.34 dlvsym F
>  GLIBC_2.34 dn_comp F
>  GLIBC_2.34 dn_expand F
> +GLIBC_2.34 dn_skipname F
>  GLIBC_2.34 execveat F
>  GLIBC_2.34 forkpty F
>  GLIBC_2.34 gai_cancel F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/libresolv.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libresolv.abilist
> index cee6c22004..7c80f1818a 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips64/n64/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/libresolv.abilist
> @@ -1,7 +1,6 @@
>  GLIBC_2.0 __b64_ntop F
>  GLIBC_2.0 __b64_pton F
>  GLIBC_2.0 __dn_count_labels F
> -GLIBC_2.0 __dn_skipname F
>  GLIBC_2.0 __fp_nquery F
>  GLIBC_2.0 __fp_query F
>  GLIBC_2.0 __fp_resstat F
> diff --git a/sysdeps/unix/sysv/linux/nios2/libc.abilist b/sysdeps/unix/sysv/linux/nios2/libc.abilist
> index e2f59dc3fa..9c16508db9 100644
> --- a/sysdeps/unix/sysv/linux/nios2/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/nios2/libc.abilist
> @@ -173,6 +173,7 @@ GLIBC_2.21 __divdf3 F
>  GLIBC_2.21 __divsf3 F
>  GLIBC_2.21 __dn_comp F
>  GLIBC_2.21 __dn_expand F
> +GLIBC_2.21 __dn_skipname F
>  GLIBC_2.21 __dprintf_chk F
>  GLIBC_2.21 __dup2 F
>  GLIBC_2.21 __duplocale F
> @@ -2548,6 +2549,7 @@ GLIBC_2.34 dlsym F
>  GLIBC_2.34 dlvsym F
>  GLIBC_2.34 dn_comp F
>  GLIBC_2.34 dn_expand F
> +GLIBC_2.34 dn_skipname F
>  GLIBC_2.34 execveat F
>  GLIBC_2.34 forkpty F
>  GLIBC_2.34 gai_cancel F
> diff --git a/sysdeps/unix/sysv/linux/nios2/libresolv.abilist b/sysdeps/unix/sysv/linux/nios2/libresolv.abilist
> index 9f7f9db8a9..c4fbc8c68b 100644
> --- a/sysdeps/unix/sysv/linux/nios2/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/nios2/libresolv.abilist
> @@ -1,7 +1,6 @@
>  GLIBC_2.21 __b64_ntop F
>  GLIBC_2.21 __b64_pton F
>  GLIBC_2.21 __dn_count_labels F
> -GLIBC_2.21 __dn_skipname F
>  GLIBC_2.21 __fp_nquery F
>  GLIBC_2.21 __fp_query F
>  GLIBC_2.21 __fp_resstat F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
> index dce5b10559..c3370392f6 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
> @@ -125,6 +125,7 @@ GLIBC_2.0 __deregister_frame_info F
>  GLIBC_2.0 __dgettext F
>  GLIBC_2.0 __divdi3 F
>  GLIBC_2.0 __dn_comp F
> +GLIBC_2.0 __dn_skipname F
>  GLIBC_2.0 __dup2 F
>  GLIBC_2.0 __environ D 0x4
>  GLIBC_2.0 __errno_location F
> @@ -2559,6 +2560,7 @@ GLIBC_2.34 dlsym F
>  GLIBC_2.34 dlvsym F
>  GLIBC_2.34 dn_comp F
>  GLIBC_2.34 dn_expand F
> +GLIBC_2.34 dn_skipname F
>  GLIBC_2.34 execveat F
>  GLIBC_2.34 forkpty F
>  GLIBC_2.34 gai_cancel F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libresolv.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libresolv.abilist
> index 8ee174124c..48ff3bffa1 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libresolv.abilist
> @@ -1,7 +1,6 @@
>  GLIBC_2.0 __b64_ntop F
>  GLIBC_2.0 __b64_pton F
>  GLIBC_2.0 __dn_count_labels F
> -GLIBC_2.0 __dn_skipname F
>  GLIBC_2.0 __fp_nquery F
>  GLIBC_2.0 __fp_query F
>  GLIBC_2.0 __fp_resstat F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
> index b336af10c6..5ccb7785c1 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
> @@ -125,6 +125,7 @@ GLIBC_2.0 __deregister_frame_info F
>  GLIBC_2.0 __dgettext F
>  GLIBC_2.0 __divdi3 F
>  GLIBC_2.0 __dn_comp F
> +GLIBC_2.0 __dn_skipname F
>  GLIBC_2.0 __dup2 F
>  GLIBC_2.0 __environ D 0x4
>  GLIBC_2.0 __errno_location F
> @@ -2592,6 +2593,7 @@ GLIBC_2.34 dlsym F
>  GLIBC_2.34 dlvsym F
>  GLIBC_2.34 dn_comp F
>  GLIBC_2.34 dn_expand F
> +GLIBC_2.34 dn_skipname F
>  GLIBC_2.34 execveat F
>  GLIBC_2.34 forkpty F
>  GLIBC_2.34 gai_cancel F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
> index a072b8f50c..7cbb47385c 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
> @@ -320,6 +320,7 @@ GLIBC_2.3 __default_morecore F
>  GLIBC_2.3 __dgettext F
>  GLIBC_2.3 __dn_comp F
>  GLIBC_2.3 __dn_expand F
> +GLIBC_2.3 __dn_skipname F
>  GLIBC_2.3 __dup2 F
>  GLIBC_2.3 __duplocale F
>  GLIBC_2.3 __endmntent F
> @@ -2327,6 +2328,7 @@ GLIBC_2.34 dlsym F
>  GLIBC_2.34 dlvsym F
>  GLIBC_2.34 dn_comp F
>  GLIBC_2.34 dn_expand F
> +GLIBC_2.34 dn_skipname F
>  GLIBC_2.34 execveat F
>  GLIBC_2.34 forkpty F
>  GLIBC_2.34 gai_cancel F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libresolv.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libresolv.abilist
> index 72f9b070d8..b3d9c35c10 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libresolv.abilist
> @@ -1,7 +1,6 @@
>  GLIBC_2.3 __b64_ntop F
>  GLIBC_2.3 __b64_pton F
>  GLIBC_2.3 __dn_count_labels F
> -GLIBC_2.3 __dn_skipname F
>  GLIBC_2.3 __fp_nquery F
>  GLIBC_2.3 __fp_query F
>  GLIBC_2.3 __fp_resstat F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
> index 96aac6c2a7..58d3c10e58 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
> @@ -167,6 +167,7 @@ GLIBC_2.17 __default_morecore F
>  GLIBC_2.17 __dgettext F
>  GLIBC_2.17 __dn_comp F
>  GLIBC_2.17 __dn_expand F
> +GLIBC_2.17 __dn_skipname F
>  GLIBC_2.17 __dprintf_chk F
>  GLIBC_2.17 __dup2 F
>  GLIBC_2.17 __duplocale F
> @@ -2629,6 +2630,7 @@ GLIBC_2.34 dlsym F
>  GLIBC_2.34 dlvsym F
>  GLIBC_2.34 dn_comp F
>  GLIBC_2.34 dn_expand F
> +GLIBC_2.34 dn_skipname F
>  GLIBC_2.34 execveat F
>  GLIBC_2.34 forkpty F
>  GLIBC_2.34 gai_cancel F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libresolv.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libresolv.abilist
> index 50019b9bdd..beb6e0efe3 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libresolv.abilist
> @@ -1,7 +1,6 @@
>  GLIBC_2.17 __b64_ntop F
>  GLIBC_2.17 __b64_pton F
>  GLIBC_2.17 __dn_count_labels F
> -GLIBC_2.17 __dn_skipname F
>  GLIBC_2.17 __fp_nquery F
>  GLIBC_2.17 __fp_query F
>  GLIBC_2.17 __fp_resstat F
> diff --git a/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist b/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
> index 766840ed64..52f4d0a6c7 100644
> --- a/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
> @@ -168,6 +168,7 @@ GLIBC_2.33 __default_morecore F
>  GLIBC_2.33 __dgettext F
>  GLIBC_2.33 __dn_comp F
>  GLIBC_2.33 __dn_expand F
> +GLIBC_2.33 __dn_skipname F
>  GLIBC_2.33 __dprintf_chk F
>  GLIBC_2.33 __dup2 F
>  GLIBC_2.33 __duplocale F
> @@ -2194,6 +2195,7 @@ GLIBC_2.34 dlsym F
>  GLIBC_2.34 dlvsym F
>  GLIBC_2.34 dn_comp F
>  GLIBC_2.34 dn_expand F
> +GLIBC_2.34 dn_skipname F
>  GLIBC_2.34 execveat F
>  GLIBC_2.34 forkpty F
>  GLIBC_2.34 gai_cancel F
> diff --git a/sysdeps/unix/sysv/linux/riscv/rv32/libresolv.abilist b/sysdeps/unix/sysv/linux/riscv/rv32/libresolv.abilist
> index 5956461241..768d103895 100644
> --- a/sysdeps/unix/sysv/linux/riscv/rv32/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/riscv/rv32/libresolv.abilist
> @@ -1,7 +1,6 @@
>  GLIBC_2.33 __b64_ntop F
>  GLIBC_2.33 __b64_pton F
>  GLIBC_2.33 __dn_count_labels F
> -GLIBC_2.33 __dn_skipname F
>  GLIBC_2.33 __fp_nquery F
>  GLIBC_2.33 __fp_query F
>  GLIBC_2.33 __fp_resstat F
> diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
> index 2330cc492e..b2a5a4c31a 100644
> --- a/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
> @@ -169,6 +169,7 @@ GLIBC_2.27 __default_morecore F
>  GLIBC_2.27 __dgettext F
>  GLIBC_2.27 __dn_comp F
>  GLIBC_2.27 __dn_expand F
> +GLIBC_2.27 __dn_skipname F
>  GLIBC_2.27 __dprintf_chk F
>  GLIBC_2.27 __dup2 F
>  GLIBC_2.27 __duplocale F
> @@ -2394,6 +2395,7 @@ GLIBC_2.34 dlsym F
>  GLIBC_2.34 dlvsym F
>  GLIBC_2.34 dn_comp F
>  GLIBC_2.34 dn_expand F
> +GLIBC_2.34 dn_skipname F
>  GLIBC_2.34 execveat F
>  GLIBC_2.34 forkpty F
>  GLIBC_2.34 gai_cancel F
> diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libresolv.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libresolv.abilist
> index db984b40af..998b7a2105 100644
> --- a/sysdeps/unix/sysv/linux/riscv/rv64/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/riscv/rv64/libresolv.abilist
> @@ -1,7 +1,6 @@
>  GLIBC_2.27 __b64_ntop F
>  GLIBC_2.27 __b64_pton F
>  GLIBC_2.27 __dn_count_labels F
> -GLIBC_2.27 __dn_skipname F
>  GLIBC_2.27 __fp_nquery F
>  GLIBC_2.27 __fp_query F
>  GLIBC_2.27 __fp_resstat F
> diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
> index 202748823f..2040feb493 100644
> --- a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
> @@ -123,6 +123,7 @@ GLIBC_2.0 __deregister_frame_info F
>  GLIBC_2.0 __dgettext F
>  GLIBC_2.0 __divdi3 F
>  GLIBC_2.0 __dn_comp F
> +GLIBC_2.0 __dn_skipname F
>  GLIBC_2.0 __dup2 F
>  GLIBC_2.0 __environ D 0x4
>  GLIBC_2.0 __errno_location F
> @@ -2557,6 +2558,7 @@ GLIBC_2.34 dlsym F
>  GLIBC_2.34 dlvsym F
>  GLIBC_2.34 dn_comp F
>  GLIBC_2.34 dn_expand F
> +GLIBC_2.34 dn_skipname F
>  GLIBC_2.34 execveat F
>  GLIBC_2.34 forkpty F
>  GLIBC_2.34 gai_cancel F
> diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libresolv.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libresolv.abilist
> index 8ee174124c..48ff3bffa1 100644
> --- a/sysdeps/unix/sysv/linux/s390/s390-32/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/s390/s390-32/libresolv.abilist
> @@ -1,7 +1,6 @@
>  GLIBC_2.0 __b64_ntop F
>  GLIBC_2.0 __b64_pton F
>  GLIBC_2.0 __dn_count_labels F
> -GLIBC_2.0 __dn_skipname F
>  GLIBC_2.0 __fp_nquery F
>  GLIBC_2.0 __fp_query F
>  GLIBC_2.0 __fp_resstat F
> diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
> index a9266ad20a..483a29477b 100644
> --- a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
> @@ -262,6 +262,7 @@ GLIBC_2.2 __deregister_frame_info F
>  GLIBC_2.2 __dgettext F
>  GLIBC_2.2 __dn_comp F
>  GLIBC_2.2 __dn_expand F
> +GLIBC_2.2 __dn_skipname F
>  GLIBC_2.2 __dup2 F
>  GLIBC_2.2 __duplocale F
>  GLIBC_2.2 __endmntent F
> @@ -2364,6 +2365,7 @@ GLIBC_2.34 dlsym F
>  GLIBC_2.34 dlvsym F
>  GLIBC_2.34 dn_comp F
>  GLIBC_2.34 dn_expand F
> +GLIBC_2.34 dn_skipname F
>  GLIBC_2.34 execveat F
>  GLIBC_2.34 forkpty F
>  GLIBC_2.34 gai_cancel F
> diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libresolv.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libresolv.abilist
> index e3ed8ccd8e..23e952fcac 100644
> --- a/sysdeps/unix/sysv/linux/s390/s390-64/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/s390/s390-64/libresolv.abilist
> @@ -1,7 +1,6 @@
>  GLIBC_2.2 __b64_ntop F
>  GLIBC_2.2 __b64_pton F
>  GLIBC_2.2 __dn_count_labels F
> -GLIBC_2.2 __dn_skipname F
>  GLIBC_2.2 __fp_nquery F
>  GLIBC_2.2 __fp_query F
>  GLIBC_2.2 __fp_resstat F
> diff --git a/sysdeps/unix/sysv/linux/sh/be/libc.abilist b/sysdeps/unix/sysv/linux/sh/be/libc.abilist
> index 32a81a467c..d38e23b612 100644
> --- a/sysdeps/unix/sysv/linux/sh/be/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/sh/be/libc.abilist
> @@ -3,6 +3,7 @@ GCC_3.0 __deregister_frame_info_bases F
>  GCC_3.0 __register_frame_info_bases F
>  GCC_3.0 __register_frame_info_table_bases F
>  GLIBC_2.0 __dn_comp F
> +GLIBC_2.0 __dn_skipname F
>  GLIBC_2.0 dladdr F
>  GLIBC_2.0 dlclose F
>  GLIBC_2.0 dlerror F
> @@ -2412,6 +2413,7 @@ GLIBC_2.34 dlsym F
>  GLIBC_2.34 dlvsym F
>  GLIBC_2.34 dn_comp F
>  GLIBC_2.34 dn_expand F
> +GLIBC_2.34 dn_skipname F
>  GLIBC_2.34 execveat F
>  GLIBC_2.34 forkpty F
>  GLIBC_2.34 gai_cancel F
> diff --git a/sysdeps/unix/sysv/linux/sh/be/libresolv.abilist b/sysdeps/unix/sysv/linux/sh/be/libresolv.abilist
> index 8ee174124c..48ff3bffa1 100644
> --- a/sysdeps/unix/sysv/linux/sh/be/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/sh/be/libresolv.abilist
> @@ -1,7 +1,6 @@
>  GLIBC_2.0 __b64_ntop F
>  GLIBC_2.0 __b64_pton F
>  GLIBC_2.0 __dn_count_labels F
> -GLIBC_2.0 __dn_skipname F
>  GLIBC_2.0 __fp_nquery F
>  GLIBC_2.0 __fp_query F
>  GLIBC_2.0 __fp_resstat F
> diff --git a/sysdeps/unix/sysv/linux/sh/le/libc.abilist b/sysdeps/unix/sysv/linux/sh/le/libc.abilist
> index 884b53816e..4890dfbfe4 100644
> --- a/sysdeps/unix/sysv/linux/sh/le/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/sh/le/libc.abilist
> @@ -3,6 +3,7 @@ GCC_3.0 __deregister_frame_info_bases F
>  GCC_3.0 __register_frame_info_bases F
>  GCC_3.0 __register_frame_info_table_bases F
>  GLIBC_2.0 __dn_comp F
> +GLIBC_2.0 __dn_skipname F
>  GLIBC_2.0 dladdr F
>  GLIBC_2.0 dlclose F
>  GLIBC_2.0 dlerror F
> @@ -2409,6 +2410,7 @@ GLIBC_2.34 dlsym F
>  GLIBC_2.34 dlvsym F
>  GLIBC_2.34 dn_comp F
>  GLIBC_2.34 dn_expand F
> +GLIBC_2.34 dn_skipname F
>  GLIBC_2.34 execveat F
>  GLIBC_2.34 forkpty F
>  GLIBC_2.34 gai_cancel F
> diff --git a/sysdeps/unix/sysv/linux/sh/le/libresolv.abilist b/sysdeps/unix/sysv/linux/sh/le/libresolv.abilist
> index 8ee174124c..48ff3bffa1 100644
> --- a/sysdeps/unix/sysv/linux/sh/le/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/sh/le/libresolv.abilist
> @@ -1,7 +1,6 @@
>  GLIBC_2.0 __b64_ntop F
>  GLIBC_2.0 __b64_pton F
>  GLIBC_2.0 __dn_count_labels F
> -GLIBC_2.0 __dn_skipname F
>  GLIBC_2.0 __fp_nquery F
>  GLIBC_2.0 __fp_query F
>  GLIBC_2.0 __fp_resstat F
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
> index 2bb890e734..bc737ffc66 100644
> --- a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
> @@ -128,6 +128,7 @@ GLIBC_2.0 __deregister_frame F
>  GLIBC_2.0 __deregister_frame_info F
>  GLIBC_2.0 __dgettext F
>  GLIBC_2.0 __dn_comp F
> +GLIBC_2.0 __dn_skipname F
>  GLIBC_2.0 __dup2 F
>  GLIBC_2.0 __environ D 0x4
>  GLIBC_2.0 __errno_location F
> @@ -2552,6 +2553,7 @@ GLIBC_2.34 dlsym F
>  GLIBC_2.34 dlvsym F
>  GLIBC_2.34 dn_comp F
>  GLIBC_2.34 dn_expand F
> +GLIBC_2.34 dn_skipname F
>  GLIBC_2.34 execveat F
>  GLIBC_2.34 forkpty F
>  GLIBC_2.34 gai_cancel F
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libresolv.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libresolv.abilist
> index 8ee174124c..48ff3bffa1 100644
> --- a/sysdeps/unix/sysv/linux/sparc/sparc32/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libresolv.abilist
> @@ -1,7 +1,6 @@
>  GLIBC_2.0 __b64_ntop F
>  GLIBC_2.0 __b64_pton F
>  GLIBC_2.0 __dn_count_labels F
> -GLIBC_2.0 __dn_skipname F
>  GLIBC_2.0 __fp_nquery F
>  GLIBC_2.0 __fp_query F
>  GLIBC_2.0 __fp_resstat F
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
> index 5116c47b9f..a745ed2a70 100644
> --- a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
> @@ -3,6 +3,7 @@ GCC_3.0 __deregister_frame_info_bases F
>  GCC_3.0 __register_frame_info_bases F
>  GCC_3.0 __register_frame_info_table_bases F
>  GLIBC_2.0 __dn_comp F
> +GLIBC_2.0 __dn_skipname F
>  GLIBC_2.0 dladdr F
>  GLIBC_2.0 dlclose F
>  GLIBC_2.0 dlerror F
> @@ -2387,6 +2388,7 @@ GLIBC_2.34 dlsym F
>  GLIBC_2.34 dlvsym F
>  GLIBC_2.34 dn_comp F
>  GLIBC_2.34 dn_expand F
> +GLIBC_2.34 dn_skipname F
>  GLIBC_2.34 execveat F
>  GLIBC_2.34 forkpty F
>  GLIBC_2.34 gai_cancel F
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libresolv.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libresolv.abilist
> index cee6c22004..7c80f1818a 100644
> --- a/sysdeps/unix/sysv/linux/sparc/sparc64/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libresolv.abilist
> @@ -1,7 +1,6 @@
>  GLIBC_2.0 __b64_ntop F
>  GLIBC_2.0 __b64_pton F
>  GLIBC_2.0 __dn_count_labels F
> -GLIBC_2.0 __dn_skipname F
>  GLIBC_2.0 __fp_nquery F
>  GLIBC_2.0 __fp_query F
>  GLIBC_2.0 __fp_resstat F
> diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
> index 6616970cf5..5d35b3bb7a 100644
> --- a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
> @@ -250,6 +250,7 @@ GLIBC_2.2.5 __default_morecore F
>  GLIBC_2.2.5 __dgettext F
>  GLIBC_2.2.5 __dn_comp F
>  GLIBC_2.2.5 __dn_expand F
> +GLIBC_2.2.5 __dn_skipname F
>  GLIBC_2.2.5 __dup2 F
>  GLIBC_2.2.5 __duplocale F
>  GLIBC_2.2.5 __endmntent F
> @@ -2342,6 +2343,7 @@ GLIBC_2.34 dlsym F
>  GLIBC_2.34 dlvsym F
>  GLIBC_2.34 dn_comp F
>  GLIBC_2.34 dn_expand F
> +GLIBC_2.34 dn_skipname F
>  GLIBC_2.34 execveat F
>  GLIBC_2.34 forkpty F
>  GLIBC_2.34 gai_cancel F
> diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libresolv.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libresolv.abilist
> index 640facbd02..93c5e8111c 100644
> --- a/sysdeps/unix/sysv/linux/x86_64/64/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/x86_64/64/libresolv.abilist
> @@ -1,7 +1,6 @@
>  GLIBC_2.2.5 __b64_ntop F
>  GLIBC_2.2.5 __b64_pton F
>  GLIBC_2.2.5 __dn_count_labels F
> -GLIBC_2.2.5 __dn_skipname F
>  GLIBC_2.2.5 __fp_nquery F
>  GLIBC_2.2.5 __fp_query F
>  GLIBC_2.2.5 __fp_resstat F
> diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
> index 8fd921f505..bf06824cd4 100644
> --- a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
> @@ -168,6 +168,7 @@ GLIBC_2.16 __default_morecore F
>  GLIBC_2.16 __dgettext F
>  GLIBC_2.16 __dn_comp F
>  GLIBC_2.16 __dn_expand F
> +GLIBC_2.16 __dn_skipname F
>  GLIBC_2.16 __dprintf_chk F
>  GLIBC_2.16 __dup2 F
>  GLIBC_2.16 __duplocale F
> @@ -2448,6 +2449,7 @@ GLIBC_2.34 dlsym F
>  GLIBC_2.34 dlvsym F
>  GLIBC_2.34 dn_comp F
>  GLIBC_2.34 dn_expand F
> +GLIBC_2.34 dn_skipname F
>  GLIBC_2.34 execveat F
>  GLIBC_2.34 forkpty F
>  GLIBC_2.34 gai_cancel F
> diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libresolv.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libresolv.abilist
> index 6990240c4e..5c84955527 100644
> --- a/sysdeps/unix/sysv/linux/x86_64/x32/libresolv.abilist
> +++ b/sysdeps/unix/sysv/linux/x86_64/x32/libresolv.abilist
> @@ -1,7 +1,6 @@
>  GLIBC_2.16 __b64_ntop F
>  GLIBC_2.16 __b64_pton F
>  GLIBC_2.16 __dn_count_labels F
> -GLIBC_2.16 __dn_skipname F
>  GLIBC_2.16 __fp_nquery F
>  GLIBC_2.16 __fp_query F
>  GLIBC_2.16 __fp_resstat F
> 

OK.
diff mbox series

Patch

diff --git a/include/resolv.h b/include/resolv.h
index 602f184643..378b36d612 100644
--- a/include/resolv.h
+++ b/include/resolv.h
@@ -44,7 +44,6 @@  libresolv_hidden_proto (_sethtent)
 libresolv_hidden_proto (_gethtent)
 libresolv_hidden_proto (_gethtbyaddr)
 libresolv_hidden_proto (_gethtbyname2)
-libresolv_hidden_proto (__dn_skipname)
 libresolv_hidden_proto (__res_hnok)
 libresolv_hidden_proto (__res_dnok)
 libresolv_hidden_proto (__putlong)
@@ -66,6 +65,8 @@  libresolv_hidden_proto (__dn_count_labels)
 
 extern __typeof (dn_expand) __libc_dn_expand;
 libc_hidden_proto (__libc_dn_expand)
+extern __typeof (dn_skipname) __libc_dn_skipname;
+libc_hidden_proto (__libc_dn_skipname)
 
 # endif /* _RESOLV_H_ && !_ISOMAC */
 #endif
diff --git a/resolv/Makefile b/resolv/Makefile
index 936518523d..e1a608f4ac 100644
--- a/resolv/Makefile
+++ b/resolv/Makefile
@@ -30,6 +30,7 @@  headers	:= resolv.h bits/types/res_state.h \
 routines := \
   dn_comp \
   dn_expand \
+  dn_skipname \
   herror \
   inet_addr \
   inet_ntop \
diff --git a/resolv/Versions b/resolv/Versions
index e36cf45cfa..634c7833a8 100644
--- a/resolv/Versions
+++ b/resolv/Versions
@@ -1,6 +1,7 @@ 
 libc {
   GLIBC_2.0 {
     __dn_comp;
+    __dn_skipname;
     __h_errno_location;
     __res_randomid;
     _res;
@@ -45,6 +46,7 @@  libc {
 %endif
     dn_comp;
     dn_expand;
+    dn_skipname;
     ns_name_compress;
     ns_name_ntop;
     ns_name_pack;
@@ -61,6 +63,7 @@  libc {
     __inet_aton_exact;
     __inet_pton_length;
     __libc_dn_expand;
+    __libc_dn_skipname;
     __ns_name_compress;
     __ns_name_ntop;
     __ns_name_pack;
@@ -82,7 +85,6 @@  libresolv {
     __b64_ntop;
     __b64_pton;
     __dn_count_labels;
-    __dn_skipname;
     __fp_nquery;
     __fp_query;
     __fp_resstat;
diff --git a/resolv/dn_skipname.c b/resolv/dn_skipname.c
new file mode 100644
index 0000000000..b9a587faff
--- /dev/null
+++ b/resolv/dn_skipname.c
@@ -0,0 +1,103 @@ 
+/* Skipping over a compressed DNS domain name in wire format.
+   Copyright (C) 1995-2021 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <https://www.gnu.org/licenses/>.  */
+
+/*
+ * Copyright (c) 1985, 1993
+ *    The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
+ * Portions Copyright (c) 1993 by Digital Equipment Corporation.
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies, and that
+ * the name of Digital Equipment Corporation not be used in advertising or
+ * publicity pertaining to distribution of the document or software without
+ * specific, written prior permission.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
+ * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
+ * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ * SOFTWARE.
+ */
+
+/*
+ * Portions Copyright (c) 1996-1999 by Internet Software Consortium.
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
+ * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
+ * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ * SOFTWARE.
+ */
+
+#include <arpa/nameser.h>
+#include <resolv.h>
+#include <shlib-compat.h>
+
+/* Skips over a compressed domain name. Returns the size or -1.  */
+int
+___dn_skipname (const unsigned char *ptr, const unsigned char *eom)
+{
+  const unsigned char *saveptr = ptr;
+  if (__ns_name_skip (&ptr, eom) < 0)
+    return -1;
+  return ptr - saveptr;
+}
+versioned_symbol (libc, ___dn_skipname, dn_skipname, GLIBC_2_34);
+versioned_symbol (libc, ___dn_skipname, __libc_dn_skipname, GLIBC_PRIVATE);
+libc_hidden_ver (___dn_skipname, __libc_dn_skipname)
+#if OTHER_SHLIB_COMPAT (libresolv, GLIBC_2_0, GLIBC_2_34)
+compat_symbol (libresolv, ___dn_skipname, __dn_skipname, GLIBC_2_0);
+#endif
diff --git a/resolv/nss_dns/dns-canon.c b/resolv/nss_dns/dns-canon.c
index b7340d7b9e..c5718ce3ab 100644
--- a/resolv/nss_dns/dns-canon.c
+++ b/resolv/nss_dns/dns-canon.c
@@ -90,7 +90,7 @@  _nss_dns_getcanonname_r (const char *name, char *buffer, size_t buflen,
 	  unsigned char *endptr = ansp.ptr + r;
 
 	  /* Skip over the query.  This is the name, type, and class.  */
-	  int s = __dn_skipname (ptr, endptr);
+	  int s = __libc_dn_skipname (ptr, endptr);
 	  if (s < 0)
 	    {
 	    unavail:
@@ -108,7 +108,7 @@  _nss_dns_getcanonname_r (const char *name, char *buffer, size_t buflen,
 		 then type, class, TTL, and the length of the RDATA.
 		 We remember the name start.  */
 	      unsigned char *namestart = ptr;
-	      s = __dn_skipname (ptr, endptr);
+	      s = __libc_dn_skipname (ptr, endptr);
 	      if (s < 0)
 		goto unavail;
 
diff --git a/resolv/nss_dns/dns-network.c b/resolv/nss_dns/dns-network.c
index 2be9bfe2b3..801313caec 100644
--- a/resolv/nss_dns/dns-network.c
+++ b/resolv/nss_dns/dns-network.c
@@ -322,7 +322,7 @@  getanswer_r (const querybuf *answer, int anslen, struct netent *result,
   /* Skip the question part.  */
   while (question_count-- > 0)
     {
-      int n = __dn_skipname (cp, end_of_message);
+      int n = __libc_dn_skipname (cp, end_of_message);
       if (n < 0 || end_of_message - (cp + n) < QFIXEDSZ)
        {
          __set_h_errno (NO_RECOVERY);
diff --git a/resolv/res_comp.c b/resolv/res_comp.c
index 1930f17302..16f7e02111 100644
--- a/resolv/res_comp.c
+++ b/resolv/res_comp.c
@@ -92,19 +92,6 @@ 
 #include <string.h>
 #include <unistd.h>
 
-/*
- * Skip over a compressed domain name. Return the size or -1.
- */
-int
-dn_skipname(const u_char *ptr, const u_char *eom) {
-	const u_char *saveptr = ptr;
-
-	if (ns_name_skip(&ptr, eom) == -1)
-		return (-1);
-	return (ptr - saveptr);
-}
-libresolv_hidden_def (dn_skipname)
-
 /* Return true if the string consists of printable ASCII characters
    only.  */
 static bool
diff --git a/resolv/resolv.h b/resolv/resolv.h
index 78ad81577a..3056e1aafe 100644
--- a/resolv/resolv.h
+++ b/resolv/resolv.h
@@ -211,7 +211,6 @@  __END_DECLS
 #define b64_ntop		__b64_ntop
 #define b64_pton		__b64_pton
 #define dn_count_labels		__dn_count_labels
-#define dn_skipname		__dn_skipname
 #define fp_resstat		__fp_resstat
 #define loc_aton		__loc_aton
 #define loc_ntoa		__loc_ntoa
diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist
index 5692245dbb..3e9d6345bb 100644
--- a/sysdeps/mach/hurd/i386/libc.abilist
+++ b/sysdeps/mach/hurd/i386/libc.abilist
@@ -246,6 +246,7 @@  GLIBC_2.2.6 __dgettext F
 GLIBC_2.2.6 __divdi3 F
 GLIBC_2.2.6 __dn_comp F
 GLIBC_2.2.6 __dn_expand F
+GLIBC_2.2.6 __dn_skipname F
 GLIBC_2.2.6 __dup2 F
 GLIBC_2.2.6 __duplocale F
 GLIBC_2.2.6 __environ D 0x4
@@ -2238,6 +2239,7 @@  GLIBC_2.34 dlsym F
 GLIBC_2.34 dlvsym F
 GLIBC_2.34 dn_comp F
 GLIBC_2.34 dn_expand F
+GLIBC_2.34 dn_skipname F
 GLIBC_2.34 execveat F
 GLIBC_2.34 forkpty F
 GLIBC_2.34 login F
diff --git a/sysdeps/mach/hurd/i386/libresolv.abilist b/sysdeps/mach/hurd/i386/libresolv.abilist
index 0132f6cef2..0c8d828f26 100644
--- a/sysdeps/mach/hurd/i386/libresolv.abilist
+++ b/sysdeps/mach/hurd/i386/libresolv.abilist
@@ -1,7 +1,6 @@ 
 GLIBC_2.2.6 __b64_ntop F
 GLIBC_2.2.6 __b64_pton F
 GLIBC_2.2.6 __dn_count_labels F
-GLIBC_2.2.6 __dn_skipname F
 GLIBC_2.2.6 __fp_nquery F
 GLIBC_2.2.6 __fp_query F
 GLIBC_2.2.6 __fp_resstat F
diff --git a/sysdeps/unix/sysv/linux/aarch64/libc.abilist b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
index 714de3bb0d..3745fe29eb 100644
--- a/sysdeps/unix/sysv/linux/aarch64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
@@ -168,6 +168,7 @@  GLIBC_2.17 __default_morecore F
 GLIBC_2.17 __dgettext F
 GLIBC_2.17 __dn_comp F
 GLIBC_2.17 __dn_expand F
+GLIBC_2.17 __dn_skipname F
 GLIBC_2.17 __dprintf_chk F
 GLIBC_2.17 __dup2 F
 GLIBC_2.17 __duplocale F
@@ -2433,6 +2434,7 @@  GLIBC_2.34 dlsym F
 GLIBC_2.34 dlvsym F
 GLIBC_2.34 dn_comp F
 GLIBC_2.34 dn_expand F
+GLIBC_2.34 dn_skipname F
 GLIBC_2.34 execveat F
 GLIBC_2.34 forkpty F
 GLIBC_2.34 gai_cancel F
diff --git a/sysdeps/unix/sysv/linux/aarch64/libresolv.abilist b/sysdeps/unix/sysv/linux/aarch64/libresolv.abilist
index 50019b9bdd..beb6e0efe3 100644
--- a/sysdeps/unix/sysv/linux/aarch64/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/aarch64/libresolv.abilist
@@ -1,7 +1,6 @@ 
 GLIBC_2.17 __b64_ntop F
 GLIBC_2.17 __b64_pton F
 GLIBC_2.17 __dn_count_labels F
-GLIBC_2.17 __dn_skipname F
 GLIBC_2.17 __fp_nquery F
 GLIBC_2.17 __fp_query F
 GLIBC_2.17 __fp_resstat F
diff --git a/sysdeps/unix/sysv/linux/alpha/libc.abilist b/sysdeps/unix/sysv/linux/alpha/libc.abilist
index 61c47275c3..55030a922a 100644
--- a/sysdeps/unix/sysv/linux/alpha/libc.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist
@@ -125,6 +125,7 @@  GLIBC_2.0 __divlu F
 GLIBC_2.0 __divq F
 GLIBC_2.0 __divqu F
 GLIBC_2.0 __dn_comp F
+GLIBC_2.0 __dn_skipname F
 GLIBC_2.0 __dup2 F
 GLIBC_2.0 __environ D 0x8
 GLIBC_2.0 __errno_location F
@@ -2526,6 +2527,7 @@  GLIBC_2.34 dlsym F
 GLIBC_2.34 dlvsym F
 GLIBC_2.34 dn_comp F
 GLIBC_2.34 dn_expand F
+GLIBC_2.34 dn_skipname F
 GLIBC_2.34 execveat F
 GLIBC_2.34 forkpty F
 GLIBC_2.34 gai_cancel F
diff --git a/sysdeps/unix/sysv/linux/alpha/libresolv.abilist b/sysdeps/unix/sysv/linux/alpha/libresolv.abilist
index cee6c22004..7c80f1818a 100644
--- a/sysdeps/unix/sysv/linux/alpha/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libresolv.abilist
@@ -1,7 +1,6 @@ 
 GLIBC_2.0 __b64_ntop F
 GLIBC_2.0 __b64_pton F
 GLIBC_2.0 __dn_count_labels F
-GLIBC_2.0 __dn_skipname F
 GLIBC_2.0 __fp_nquery F
 GLIBC_2.0 __fp_query F
 GLIBC_2.0 __fp_resstat F
diff --git a/sysdeps/unix/sysv/linux/arc/libc.abilist b/sysdeps/unix/sysv/linux/arc/libc.abilist
index 4dca04958f..8211028280 100644
--- a/sysdeps/unix/sysv/linux/arc/libc.abilist
+++ b/sysdeps/unix/sysv/linux/arc/libc.abilist
@@ -168,6 +168,7 @@  GLIBC_2.32 __default_morecore F
 GLIBC_2.32 __dgettext F
 GLIBC_2.32 __dn_comp F
 GLIBC_2.32 __dn_expand F
+GLIBC_2.32 __dn_skipname F
 GLIBC_2.32 __dprintf_chk F
 GLIBC_2.32 __dup2 F
 GLIBC_2.32 __duplocale F
@@ -2192,6 +2193,7 @@  GLIBC_2.34 dlsym F
 GLIBC_2.34 dlvsym F
 GLIBC_2.34 dn_comp F
 GLIBC_2.34 dn_expand F
+GLIBC_2.34 dn_skipname F
 GLIBC_2.34 execveat F
 GLIBC_2.34 forkpty F
 GLIBC_2.34 gai_cancel F
diff --git a/sysdeps/unix/sysv/linux/arc/libresolv.abilist b/sysdeps/unix/sysv/linux/arc/libresolv.abilist
index f9326b9b22..81ab66bc6d 100644
--- a/sysdeps/unix/sysv/linux/arc/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/arc/libresolv.abilist
@@ -1,7 +1,6 @@ 
 GLIBC_2.32 __b64_ntop F
 GLIBC_2.32 __b64_pton F
 GLIBC_2.32 __dn_count_labels F
-GLIBC_2.32 __dn_skipname F
 GLIBC_2.32 __fp_nquery F
 GLIBC_2.32 __fp_query F
 GLIBC_2.32 __fp_resstat F
diff --git a/sysdeps/unix/sysv/linux/arm/be/libc.abilist b/sysdeps/unix/sysv/linux/arm/be/libc.abilist
index 6caf581b98..1f97005a6e 100644
--- a/sysdeps/unix/sysv/linux/arm/be/libc.abilist
+++ b/sysdeps/unix/sysv/linux/arm/be/libc.abilist
@@ -317,6 +317,7 @@  GLIBC_2.34 dlsym F
 GLIBC_2.34 dlvsym F
 GLIBC_2.34 dn_comp F
 GLIBC_2.34 dn_expand F
+GLIBC_2.34 dn_skipname F
 GLIBC_2.34 execveat F
 GLIBC_2.34 forkpty F
 GLIBC_2.34 gai_cancel F
@@ -649,6 +650,7 @@  GLIBC_2.4 __default_morecore F
 GLIBC_2.4 __dgettext F
 GLIBC_2.4 __dn_comp F
 GLIBC_2.4 __dn_expand F
+GLIBC_2.4 __dn_skipname F
 GLIBC_2.4 __dup2 F
 GLIBC_2.4 __duplocale F
 GLIBC_2.4 __endmntent F
diff --git a/sysdeps/unix/sysv/linux/arm/be/libresolv.abilist b/sysdeps/unix/sysv/linux/arm/be/libresolv.abilist
index e67eec5b80..5c4871fbec 100644
--- a/sysdeps/unix/sysv/linux/arm/be/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/arm/be/libresolv.abilist
@@ -1,7 +1,6 @@ 
 GLIBC_2.4 __b64_ntop F
 GLIBC_2.4 __b64_pton F
 GLIBC_2.4 __dn_count_labels F
-GLIBC_2.4 __dn_skipname F
 GLIBC_2.4 __fp_nquery F
 GLIBC_2.4 __fp_query F
 GLIBC_2.4 __fp_resstat F
diff --git a/sysdeps/unix/sysv/linux/arm/le/libc.abilist b/sysdeps/unix/sysv/linux/arm/le/libc.abilist
index e0d0789930..a7ce26c5e1 100644
--- a/sysdeps/unix/sysv/linux/arm/le/libc.abilist
+++ b/sysdeps/unix/sysv/linux/arm/le/libc.abilist
@@ -314,6 +314,7 @@  GLIBC_2.34 dlsym F
 GLIBC_2.34 dlvsym F
 GLIBC_2.34 dn_comp F
 GLIBC_2.34 dn_expand F
+GLIBC_2.34 dn_skipname F
 GLIBC_2.34 execveat F
 GLIBC_2.34 forkpty F
 GLIBC_2.34 gai_cancel F
@@ -646,6 +647,7 @@  GLIBC_2.4 __default_morecore F
 GLIBC_2.4 __dgettext F
 GLIBC_2.4 __dn_comp F
 GLIBC_2.4 __dn_expand F
+GLIBC_2.4 __dn_skipname F
 GLIBC_2.4 __dup2 F
 GLIBC_2.4 __duplocale F
 GLIBC_2.4 __endmntent F
diff --git a/sysdeps/unix/sysv/linux/arm/le/libresolv.abilist b/sysdeps/unix/sysv/linux/arm/le/libresolv.abilist
index e67eec5b80..5c4871fbec 100644
--- a/sysdeps/unix/sysv/linux/arm/le/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/arm/le/libresolv.abilist
@@ -1,7 +1,6 @@ 
 GLIBC_2.4 __b64_ntop F
 GLIBC_2.4 __b64_pton F
 GLIBC_2.4 __dn_count_labels F
-GLIBC_2.4 __dn_skipname F
 GLIBC_2.4 __fp_nquery F
 GLIBC_2.4 __fp_query F
 GLIBC_2.4 __fp_resstat F
diff --git a/sysdeps/unix/sysv/linux/csky/libc.abilist b/sysdeps/unix/sysv/linux/csky/libc.abilist
index f259a65b82..a9ada43f4f 100644
--- a/sysdeps/unix/sysv/linux/csky/libc.abilist
+++ b/sysdeps/unix/sysv/linux/csky/libc.abilist
@@ -168,6 +168,7 @@  GLIBC_2.29 __default_morecore F
 GLIBC_2.29 __dgettext F
 GLIBC_2.29 __dn_comp F
 GLIBC_2.29 __dn_expand F
+GLIBC_2.29 __dn_skipname F
 GLIBC_2.29 __dprintf_chk F
 GLIBC_2.29 __dup2 F
 GLIBC_2.29 __duplocale F
@@ -2458,6 +2459,7 @@  GLIBC_2.34 dlsym F
 GLIBC_2.34 dlvsym F
 GLIBC_2.34 dn_comp F
 GLIBC_2.34 dn_expand F
+GLIBC_2.34 dn_skipname F
 GLIBC_2.34 execveat F
 GLIBC_2.34 forkpty F
 GLIBC_2.34 gai_cancel F
diff --git a/sysdeps/unix/sysv/linux/csky/libresolv.abilist b/sysdeps/unix/sysv/linux/csky/libresolv.abilist
index 798af0930d..3a2239bdee 100644
--- a/sysdeps/unix/sysv/linux/csky/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/csky/libresolv.abilist
@@ -1,7 +1,6 @@ 
 GLIBC_2.29 __b64_ntop F
 GLIBC_2.29 __b64_pton F
 GLIBC_2.29 __dn_count_labels F
-GLIBC_2.29 __dn_skipname F
 GLIBC_2.29 __fp_nquery F
 GLIBC_2.29 __fp_query F
 GLIBC_2.29 __fp_resstat F
diff --git a/sysdeps/unix/sysv/linux/hppa/libc.abilist b/sysdeps/unix/sysv/linux/hppa/libc.abilist
index 83c9b2e5f6..a5c1ca11a7 100644
--- a/sysdeps/unix/sysv/linux/hppa/libc.abilist
+++ b/sysdeps/unix/sysv/linux/hppa/libc.abilist
@@ -1,4 +1,5 @@ 
 GLIBC_2.0 __dn_comp F
+GLIBC_2.0 __dn_skipname F
 GLIBC_2.0 dladdr F
 GLIBC_2.0 dlclose F
 GLIBC_2.0 dlerror F
@@ -2405,6 +2406,7 @@  GLIBC_2.34 dlsym F
 GLIBC_2.34 dlvsym F
 GLIBC_2.34 dn_comp F
 GLIBC_2.34 dn_expand F
+GLIBC_2.34 dn_skipname F
 GLIBC_2.34 execveat F
 GLIBC_2.34 forkpty F
 GLIBC_2.34 gai_cancel F
diff --git a/sysdeps/unix/sysv/linux/hppa/libresolv.abilist b/sysdeps/unix/sysv/linux/hppa/libresolv.abilist
index 8ee174124c..48ff3bffa1 100644
--- a/sysdeps/unix/sysv/linux/hppa/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/hppa/libresolv.abilist
@@ -1,7 +1,6 @@ 
 GLIBC_2.0 __b64_ntop F
 GLIBC_2.0 __b64_pton F
 GLIBC_2.0 __dn_count_labels F
-GLIBC_2.0 __dn_skipname F
 GLIBC_2.0 __fp_nquery F
 GLIBC_2.0 __fp_query F
 GLIBC_2.0 __fp_resstat F
diff --git a/sysdeps/unix/sysv/linux/i386/libc.abilist b/sysdeps/unix/sysv/linux/i386/libc.abilist
index 62a140ecf3..8fa262b560 100644
--- a/sysdeps/unix/sysv/linux/i386/libc.abilist
+++ b/sysdeps/unix/sysv/linux/i386/libc.abilist
@@ -123,6 +123,7 @@  GLIBC_2.0 __deregister_frame_info F
 GLIBC_2.0 __dgettext F
 GLIBC_2.0 __divdi3 F
 GLIBC_2.0 __dn_comp F
+GLIBC_2.0 __dn_skipname F
 GLIBC_2.0 __dup2 F
 GLIBC_2.0 __environ D 0x4
 GLIBC_2.0 __errno_location F
@@ -2589,6 +2590,7 @@  GLIBC_2.34 dlsym F
 GLIBC_2.34 dlvsym F
 GLIBC_2.34 dn_comp F
 GLIBC_2.34 dn_expand F
+GLIBC_2.34 dn_skipname F
 GLIBC_2.34 execveat F
 GLIBC_2.34 forkpty F
 GLIBC_2.34 gai_cancel F
diff --git a/sysdeps/unix/sysv/linux/i386/libresolv.abilist b/sysdeps/unix/sysv/linux/i386/libresolv.abilist
index 8ee174124c..48ff3bffa1 100644
--- a/sysdeps/unix/sysv/linux/i386/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/i386/libresolv.abilist
@@ -1,7 +1,6 @@ 
 GLIBC_2.0 __b64_ntop F
 GLIBC_2.0 __b64_pton F
 GLIBC_2.0 __dn_count_labels F
-GLIBC_2.0 __dn_skipname F
 GLIBC_2.0 __fp_nquery F
 GLIBC_2.0 __fp_query F
 GLIBC_2.0 __fp_resstat F
diff --git a/sysdeps/unix/sysv/linux/ia64/libc.abilist b/sysdeps/unix/sysv/linux/ia64/libc.abilist
index 24ae204834..78dbe02b3b 100644
--- a/sysdeps/unix/sysv/linux/ia64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/ia64/libc.abilist
@@ -1,4 +1,5 @@ 
 GLIBC_2.0 __dn_comp F
+GLIBC_2.0 __dn_skipname F
 GLIBC_2.0 dladdr F
 GLIBC_2.0 dlclose F
 GLIBC_2.0 dlerror F
@@ -2364,6 +2365,7 @@  GLIBC_2.34 dlsym F
 GLIBC_2.34 dlvsym F
 GLIBC_2.34 dn_comp F
 GLIBC_2.34 dn_expand F
+GLIBC_2.34 dn_skipname F
 GLIBC_2.34 execveat F
 GLIBC_2.34 forkpty F
 GLIBC_2.34 gai_cancel F
diff --git a/sysdeps/unix/sysv/linux/ia64/libresolv.abilist b/sysdeps/unix/sysv/linux/ia64/libresolv.abilist
index cee6c22004..7c80f1818a 100644
--- a/sysdeps/unix/sysv/linux/ia64/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/ia64/libresolv.abilist
@@ -1,7 +1,6 @@ 
 GLIBC_2.0 __b64_ntop F
 GLIBC_2.0 __b64_pton F
 GLIBC_2.0 __dn_count_labels F
-GLIBC_2.0 __dn_skipname F
 GLIBC_2.0 __fp_nquery F
 GLIBC_2.0 __fp_query F
 GLIBC_2.0 __fp_resstat F
diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
index 162ef0bc36..125a40dc15 100644
--- a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
@@ -318,6 +318,7 @@  GLIBC_2.34 dlsym F
 GLIBC_2.34 dlvsym F
 GLIBC_2.34 dn_comp F
 GLIBC_2.34 dn_expand F
+GLIBC_2.34 dn_skipname F
 GLIBC_2.34 execveat F
 GLIBC_2.34 forkpty F
 GLIBC_2.34 gai_cancel F
@@ -635,6 +636,7 @@  GLIBC_2.4 __dgettext F
 GLIBC_2.4 __divdi3 F
 GLIBC_2.4 __dn_comp F
 GLIBC_2.4 __dn_expand F
+GLIBC_2.4 __dn_skipname F
 GLIBC_2.4 __dup2 F
 GLIBC_2.4 __duplocale F
 GLIBC_2.4 __endmntent F
diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libresolv.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libresolv.abilist
index e67eec5b80..5c4871fbec 100644
--- a/sysdeps/unix/sysv/linux/m68k/coldfire/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libresolv.abilist
@@ -1,7 +1,6 @@ 
 GLIBC_2.4 __b64_ntop F
 GLIBC_2.4 __b64_pton F
 GLIBC_2.4 __dn_count_labels F
-GLIBC_2.4 __dn_skipname F
 GLIBC_2.4 __fp_nquery F
 GLIBC_2.4 __fp_query F
 GLIBC_2.4 __fp_resstat F
diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
index 2983e2a063..3c31d4f442 100644
--- a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
@@ -123,6 +123,7 @@  GLIBC_2.0 __deregister_frame_info F
 GLIBC_2.0 __dgettext F
 GLIBC_2.0 __divdi3 F
 GLIBC_2.0 __dn_comp F
+GLIBC_2.0 __dn_skipname F
 GLIBC_2.0 __dup2 F
 GLIBC_2.0 __environ D 0x4
 GLIBC_2.0 __errno_location F
@@ -2532,6 +2533,7 @@  GLIBC_2.34 dlsym F
 GLIBC_2.34 dlvsym F
 GLIBC_2.34 dn_comp F
 GLIBC_2.34 dn_expand F
+GLIBC_2.34 dn_skipname F
 GLIBC_2.34 execveat F
 GLIBC_2.34 forkpty F
 GLIBC_2.34 gai_cancel F
diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libresolv.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libresolv.abilist
index 8ee174124c..48ff3bffa1 100644
--- a/sysdeps/unix/sysv/linux/m68k/m680x0/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libresolv.abilist
@@ -1,7 +1,6 @@ 
 GLIBC_2.0 __b64_ntop F
 GLIBC_2.0 __b64_pton F
 GLIBC_2.0 __dn_count_labels F
-GLIBC_2.0 __dn_skipname F
 GLIBC_2.0 __fp_nquery F
 GLIBC_2.0 __fp_query F
 GLIBC_2.0 __fp_resstat F
diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
index ebdeb8aefa..30b5703ab6 100644
--- a/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
@@ -169,6 +169,7 @@  GLIBC_2.18 __default_morecore F
 GLIBC_2.18 __dgettext F
 GLIBC_2.18 __dn_comp F
 GLIBC_2.18 __dn_expand F
+GLIBC_2.18 __dn_skipname F
 GLIBC_2.18 __dprintf_chk F
 GLIBC_2.18 __dup2 F
 GLIBC_2.18 __duplocale F
@@ -2509,6 +2510,7 @@  GLIBC_2.34 dlsym F
 GLIBC_2.34 dlvsym F
 GLIBC_2.34 dn_comp F
 GLIBC_2.34 dn_expand F
+GLIBC_2.34 dn_skipname F
 GLIBC_2.34 execveat F
 GLIBC_2.34 forkpty F
 GLIBC_2.34 gai_cancel F
diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libresolv.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libresolv.abilist
index b7206367f8..eeb54aff28 100644
--- a/sysdeps/unix/sysv/linux/microblaze/be/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/be/libresolv.abilist
@@ -1,7 +1,6 @@ 
 GLIBC_2.18 __b64_ntop F
 GLIBC_2.18 __b64_pton F
 GLIBC_2.18 __dn_count_labels F
-GLIBC_2.18 __dn_skipname F
 GLIBC_2.18 __fp_nquery F
 GLIBC_2.18 __fp_query F
 GLIBC_2.18 __fp_resstat F
diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
index b564531dfe..daaf5dbdee 100644
--- a/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
@@ -169,6 +169,7 @@  GLIBC_2.18 __default_morecore F
 GLIBC_2.18 __dgettext F
 GLIBC_2.18 __dn_comp F
 GLIBC_2.18 __dn_expand F
+GLIBC_2.18 __dn_skipname F
 GLIBC_2.18 __dprintf_chk F
 GLIBC_2.18 __dup2 F
 GLIBC_2.18 __duplocale F
@@ -2506,6 +2507,7 @@  GLIBC_2.34 dlsym F
 GLIBC_2.34 dlvsym F
 GLIBC_2.34 dn_comp F
 GLIBC_2.34 dn_expand F
+GLIBC_2.34 dn_skipname F
 GLIBC_2.34 execveat F
 GLIBC_2.34 forkpty F
 GLIBC_2.34 gai_cancel F
diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libresolv.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libresolv.abilist
index b7206367f8..eeb54aff28 100644
--- a/sysdeps/unix/sysv/linux/microblaze/le/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/le/libresolv.abilist
@@ -1,7 +1,6 @@ 
 GLIBC_2.18 __b64_ntop F
 GLIBC_2.18 __b64_pton F
 GLIBC_2.18 __dn_count_labels F
-GLIBC_2.18 __dn_skipname F
 GLIBC_2.18 __fp_nquery F
 GLIBC_2.18 __fp_query F
 GLIBC_2.18 __fp_resstat F
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
index 30ed1ecb5a..72a0f54281 100644
--- a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
@@ -122,6 +122,7 @@  GLIBC_2.0 __deregister_frame F
 GLIBC_2.0 __deregister_frame_info F
 GLIBC_2.0 __dgettext F
 GLIBC_2.0 __dn_comp F
+GLIBC_2.0 __dn_skipname F
 GLIBC_2.0 __dup2 F
 GLIBC_2.0 __environ D 0x4
 GLIBC_2.0 __errno_location F
@@ -2497,6 +2498,7 @@  GLIBC_2.34 dlsym F
 GLIBC_2.34 dlvsym F
 GLIBC_2.34 dn_comp F
 GLIBC_2.34 dn_expand F
+GLIBC_2.34 dn_skipname F
 GLIBC_2.34 execveat F
 GLIBC_2.34 forkpty F
 GLIBC_2.34 gai_cancel F
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/libresolv.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libresolv.abilist
index 8ee174124c..48ff3bffa1 100644
--- a/sysdeps/unix/sysv/linux/mips/mips32/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips32/libresolv.abilist
@@ -1,7 +1,6 @@ 
 GLIBC_2.0 __b64_ntop F
 GLIBC_2.0 __b64_pton F
 GLIBC_2.0 __dn_count_labels F
-GLIBC_2.0 __dn_skipname F
 GLIBC_2.0 __fp_nquery F
 GLIBC_2.0 __fp_query F
 GLIBC_2.0 __fp_resstat F
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
index 6288970497..cf390ad8cc 100644
--- a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
@@ -122,6 +122,7 @@  GLIBC_2.0 __deregister_frame F
 GLIBC_2.0 __deregister_frame_info F
 GLIBC_2.0 __dgettext F
 GLIBC_2.0 __dn_comp F
+GLIBC_2.0 __dn_skipname F
 GLIBC_2.0 __dup2 F
 GLIBC_2.0 __environ D 0x4
 GLIBC_2.0 __errno_location F
@@ -2495,6 +2496,7 @@  GLIBC_2.34 dlsym F
 GLIBC_2.34 dlvsym F
 GLIBC_2.34 dn_comp F
 GLIBC_2.34 dn_expand F
+GLIBC_2.34 dn_skipname F
 GLIBC_2.34 execveat F
 GLIBC_2.34 forkpty F
 GLIBC_2.34 gai_cancel F
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
index 7f379f189b..19d80bd992 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
@@ -122,6 +122,7 @@  GLIBC_2.0 __deregister_frame F
 GLIBC_2.0 __deregister_frame_info F
 GLIBC_2.0 __dgettext F
 GLIBC_2.0 __dn_comp F
+GLIBC_2.0 __dn_skipname F
 GLIBC_2.0 __dup2 F
 GLIBC_2.0 __environ D 0x4
 GLIBC_2.0 __errno_location F
@@ -2503,6 +2504,7 @@  GLIBC_2.34 dlsym F
 GLIBC_2.34 dlvsym F
 GLIBC_2.34 dn_comp F
 GLIBC_2.34 dn_expand F
+GLIBC_2.34 dn_skipname F
 GLIBC_2.34 execveat F
 GLIBC_2.34 forkpty F
 GLIBC_2.34 gai_cancel F
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/libresolv.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libresolv.abilist
index 8ee174124c..48ff3bffa1 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/n32/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips64/n32/libresolv.abilist
@@ -1,7 +1,6 @@ 
 GLIBC_2.0 __b64_ntop F
 GLIBC_2.0 __b64_pton F
 GLIBC_2.0 __dn_count_labels F
-GLIBC_2.0 __dn_skipname F
 GLIBC_2.0 __fp_nquery F
 GLIBC_2.0 __fp_query F
 GLIBC_2.0 __fp_resstat F
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
index adc8f70e9f..37add15070 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
@@ -122,6 +122,7 @@  GLIBC_2.0 __deregister_frame F
 GLIBC_2.0 __deregister_frame_info F
 GLIBC_2.0 __dgettext F
 GLIBC_2.0 __dn_comp F
+GLIBC_2.0 __dn_skipname F
 GLIBC_2.0 __dup2 F
 GLIBC_2.0 __environ D 0x8
 GLIBC_2.0 __errno_location F
@@ -2415,6 +2416,7 @@  GLIBC_2.34 dlsym F
 GLIBC_2.34 dlvsym F
 GLIBC_2.34 dn_comp F
 GLIBC_2.34 dn_expand F
+GLIBC_2.34 dn_skipname F
 GLIBC_2.34 execveat F
 GLIBC_2.34 forkpty F
 GLIBC_2.34 gai_cancel F
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/libresolv.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libresolv.abilist
index cee6c22004..7c80f1818a 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/n64/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/libresolv.abilist
@@ -1,7 +1,6 @@ 
 GLIBC_2.0 __b64_ntop F
 GLIBC_2.0 __b64_pton F
 GLIBC_2.0 __dn_count_labels F
-GLIBC_2.0 __dn_skipname F
 GLIBC_2.0 __fp_nquery F
 GLIBC_2.0 __fp_query F
 GLIBC_2.0 __fp_resstat F
diff --git a/sysdeps/unix/sysv/linux/nios2/libc.abilist b/sysdeps/unix/sysv/linux/nios2/libc.abilist
index e2f59dc3fa..9c16508db9 100644
--- a/sysdeps/unix/sysv/linux/nios2/libc.abilist
+++ b/sysdeps/unix/sysv/linux/nios2/libc.abilist
@@ -173,6 +173,7 @@  GLIBC_2.21 __divdf3 F
 GLIBC_2.21 __divsf3 F
 GLIBC_2.21 __dn_comp F
 GLIBC_2.21 __dn_expand F
+GLIBC_2.21 __dn_skipname F
 GLIBC_2.21 __dprintf_chk F
 GLIBC_2.21 __dup2 F
 GLIBC_2.21 __duplocale F
@@ -2548,6 +2549,7 @@  GLIBC_2.34 dlsym F
 GLIBC_2.34 dlvsym F
 GLIBC_2.34 dn_comp F
 GLIBC_2.34 dn_expand F
+GLIBC_2.34 dn_skipname F
 GLIBC_2.34 execveat F
 GLIBC_2.34 forkpty F
 GLIBC_2.34 gai_cancel F
diff --git a/sysdeps/unix/sysv/linux/nios2/libresolv.abilist b/sysdeps/unix/sysv/linux/nios2/libresolv.abilist
index 9f7f9db8a9..c4fbc8c68b 100644
--- a/sysdeps/unix/sysv/linux/nios2/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/nios2/libresolv.abilist
@@ -1,7 +1,6 @@ 
 GLIBC_2.21 __b64_ntop F
 GLIBC_2.21 __b64_pton F
 GLIBC_2.21 __dn_count_labels F
-GLIBC_2.21 __dn_skipname F
 GLIBC_2.21 __fp_nquery F
 GLIBC_2.21 __fp_query F
 GLIBC_2.21 __fp_resstat F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
index dce5b10559..c3370392f6 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
@@ -125,6 +125,7 @@  GLIBC_2.0 __deregister_frame_info F
 GLIBC_2.0 __dgettext F
 GLIBC_2.0 __divdi3 F
 GLIBC_2.0 __dn_comp F
+GLIBC_2.0 __dn_skipname F
 GLIBC_2.0 __dup2 F
 GLIBC_2.0 __environ D 0x4
 GLIBC_2.0 __errno_location F
@@ -2559,6 +2560,7 @@  GLIBC_2.34 dlsym F
 GLIBC_2.34 dlvsym F
 GLIBC_2.34 dn_comp F
 GLIBC_2.34 dn_expand F
+GLIBC_2.34 dn_skipname F
 GLIBC_2.34 execveat F
 GLIBC_2.34 forkpty F
 GLIBC_2.34 gai_cancel F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libresolv.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libresolv.abilist
index 8ee174124c..48ff3bffa1 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libresolv.abilist
@@ -1,7 +1,6 @@ 
 GLIBC_2.0 __b64_ntop F
 GLIBC_2.0 __b64_pton F
 GLIBC_2.0 __dn_count_labels F
-GLIBC_2.0 __dn_skipname F
 GLIBC_2.0 __fp_nquery F
 GLIBC_2.0 __fp_query F
 GLIBC_2.0 __fp_resstat F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
index b336af10c6..5ccb7785c1 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
@@ -125,6 +125,7 @@  GLIBC_2.0 __deregister_frame_info F
 GLIBC_2.0 __dgettext F
 GLIBC_2.0 __divdi3 F
 GLIBC_2.0 __dn_comp F
+GLIBC_2.0 __dn_skipname F
 GLIBC_2.0 __dup2 F
 GLIBC_2.0 __environ D 0x4
 GLIBC_2.0 __errno_location F
@@ -2592,6 +2593,7 @@  GLIBC_2.34 dlsym F
 GLIBC_2.34 dlvsym F
 GLIBC_2.34 dn_comp F
 GLIBC_2.34 dn_expand F
+GLIBC_2.34 dn_skipname F
 GLIBC_2.34 execveat F
 GLIBC_2.34 forkpty F
 GLIBC_2.34 gai_cancel F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
index a072b8f50c..7cbb47385c 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
@@ -320,6 +320,7 @@  GLIBC_2.3 __default_morecore F
 GLIBC_2.3 __dgettext F
 GLIBC_2.3 __dn_comp F
 GLIBC_2.3 __dn_expand F
+GLIBC_2.3 __dn_skipname F
 GLIBC_2.3 __dup2 F
 GLIBC_2.3 __duplocale F
 GLIBC_2.3 __endmntent F
@@ -2327,6 +2328,7 @@  GLIBC_2.34 dlsym F
 GLIBC_2.34 dlvsym F
 GLIBC_2.34 dn_comp F
 GLIBC_2.34 dn_expand F
+GLIBC_2.34 dn_skipname F
 GLIBC_2.34 execveat F
 GLIBC_2.34 forkpty F
 GLIBC_2.34 gai_cancel F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libresolv.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libresolv.abilist
index 72f9b070d8..b3d9c35c10 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libresolv.abilist
@@ -1,7 +1,6 @@ 
 GLIBC_2.3 __b64_ntop F
 GLIBC_2.3 __b64_pton F
 GLIBC_2.3 __dn_count_labels F
-GLIBC_2.3 __dn_skipname F
 GLIBC_2.3 __fp_nquery F
 GLIBC_2.3 __fp_query F
 GLIBC_2.3 __fp_resstat F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
index 96aac6c2a7..58d3c10e58 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
@@ -167,6 +167,7 @@  GLIBC_2.17 __default_morecore F
 GLIBC_2.17 __dgettext F
 GLIBC_2.17 __dn_comp F
 GLIBC_2.17 __dn_expand F
+GLIBC_2.17 __dn_skipname F
 GLIBC_2.17 __dprintf_chk F
 GLIBC_2.17 __dup2 F
 GLIBC_2.17 __duplocale F
@@ -2629,6 +2630,7 @@  GLIBC_2.34 dlsym F
 GLIBC_2.34 dlvsym F
 GLIBC_2.34 dn_comp F
 GLIBC_2.34 dn_expand F
+GLIBC_2.34 dn_skipname F
 GLIBC_2.34 execveat F
 GLIBC_2.34 forkpty F
 GLIBC_2.34 gai_cancel F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libresolv.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libresolv.abilist
index 50019b9bdd..beb6e0efe3 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libresolv.abilist
@@ -1,7 +1,6 @@ 
 GLIBC_2.17 __b64_ntop F
 GLIBC_2.17 __b64_pton F
 GLIBC_2.17 __dn_count_labels F
-GLIBC_2.17 __dn_skipname F
 GLIBC_2.17 __fp_nquery F
 GLIBC_2.17 __fp_query F
 GLIBC_2.17 __fp_resstat F
diff --git a/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist b/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
index 766840ed64..52f4d0a6c7 100644
--- a/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
@@ -168,6 +168,7 @@  GLIBC_2.33 __default_morecore F
 GLIBC_2.33 __dgettext F
 GLIBC_2.33 __dn_comp F
 GLIBC_2.33 __dn_expand F
+GLIBC_2.33 __dn_skipname F
 GLIBC_2.33 __dprintf_chk F
 GLIBC_2.33 __dup2 F
 GLIBC_2.33 __duplocale F
@@ -2194,6 +2195,7 @@  GLIBC_2.34 dlsym F
 GLIBC_2.34 dlvsym F
 GLIBC_2.34 dn_comp F
 GLIBC_2.34 dn_expand F
+GLIBC_2.34 dn_skipname F
 GLIBC_2.34 execveat F
 GLIBC_2.34 forkpty F
 GLIBC_2.34 gai_cancel F
diff --git a/sysdeps/unix/sysv/linux/riscv/rv32/libresolv.abilist b/sysdeps/unix/sysv/linux/riscv/rv32/libresolv.abilist
index 5956461241..768d103895 100644
--- a/sysdeps/unix/sysv/linux/riscv/rv32/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/riscv/rv32/libresolv.abilist
@@ -1,7 +1,6 @@ 
 GLIBC_2.33 __b64_ntop F
 GLIBC_2.33 __b64_pton F
 GLIBC_2.33 __dn_count_labels F
-GLIBC_2.33 __dn_skipname F
 GLIBC_2.33 __fp_nquery F
 GLIBC_2.33 __fp_query F
 GLIBC_2.33 __fp_resstat F
diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
index 2330cc492e..b2a5a4c31a 100644
--- a/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
@@ -169,6 +169,7 @@  GLIBC_2.27 __default_morecore F
 GLIBC_2.27 __dgettext F
 GLIBC_2.27 __dn_comp F
 GLIBC_2.27 __dn_expand F
+GLIBC_2.27 __dn_skipname F
 GLIBC_2.27 __dprintf_chk F
 GLIBC_2.27 __dup2 F
 GLIBC_2.27 __duplocale F
@@ -2394,6 +2395,7 @@  GLIBC_2.34 dlsym F
 GLIBC_2.34 dlvsym F
 GLIBC_2.34 dn_comp F
 GLIBC_2.34 dn_expand F
+GLIBC_2.34 dn_skipname F
 GLIBC_2.34 execveat F
 GLIBC_2.34 forkpty F
 GLIBC_2.34 gai_cancel F
diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libresolv.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libresolv.abilist
index db984b40af..998b7a2105 100644
--- a/sysdeps/unix/sysv/linux/riscv/rv64/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/riscv/rv64/libresolv.abilist
@@ -1,7 +1,6 @@ 
 GLIBC_2.27 __b64_ntop F
 GLIBC_2.27 __b64_pton F
 GLIBC_2.27 __dn_count_labels F
-GLIBC_2.27 __dn_skipname F
 GLIBC_2.27 __fp_nquery F
 GLIBC_2.27 __fp_query F
 GLIBC_2.27 __fp_resstat F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
index 202748823f..2040feb493 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
@@ -123,6 +123,7 @@  GLIBC_2.0 __deregister_frame_info F
 GLIBC_2.0 __dgettext F
 GLIBC_2.0 __divdi3 F
 GLIBC_2.0 __dn_comp F
+GLIBC_2.0 __dn_skipname F
 GLIBC_2.0 __dup2 F
 GLIBC_2.0 __environ D 0x4
 GLIBC_2.0 __errno_location F
@@ -2557,6 +2558,7 @@  GLIBC_2.34 dlsym F
 GLIBC_2.34 dlvsym F
 GLIBC_2.34 dn_comp F
 GLIBC_2.34 dn_expand F
+GLIBC_2.34 dn_skipname F
 GLIBC_2.34 execveat F
 GLIBC_2.34 forkpty F
 GLIBC_2.34 gai_cancel F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libresolv.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libresolv.abilist
index 8ee174124c..48ff3bffa1 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/libresolv.abilist
@@ -1,7 +1,6 @@ 
 GLIBC_2.0 __b64_ntop F
 GLIBC_2.0 __b64_pton F
 GLIBC_2.0 __dn_count_labels F
-GLIBC_2.0 __dn_skipname F
 GLIBC_2.0 __fp_nquery F
 GLIBC_2.0 __fp_query F
 GLIBC_2.0 __fp_resstat F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
index a9266ad20a..483a29477b 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
@@ -262,6 +262,7 @@  GLIBC_2.2 __deregister_frame_info F
 GLIBC_2.2 __dgettext F
 GLIBC_2.2 __dn_comp F
 GLIBC_2.2 __dn_expand F
+GLIBC_2.2 __dn_skipname F
 GLIBC_2.2 __dup2 F
 GLIBC_2.2 __duplocale F
 GLIBC_2.2 __endmntent F
@@ -2364,6 +2365,7 @@  GLIBC_2.34 dlsym F
 GLIBC_2.34 dlvsym F
 GLIBC_2.34 dn_comp F
 GLIBC_2.34 dn_expand F
+GLIBC_2.34 dn_skipname F
 GLIBC_2.34 execveat F
 GLIBC_2.34 forkpty F
 GLIBC_2.34 gai_cancel F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libresolv.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libresolv.abilist
index e3ed8ccd8e..23e952fcac 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/libresolv.abilist
@@ -1,7 +1,6 @@ 
 GLIBC_2.2 __b64_ntop F
 GLIBC_2.2 __b64_pton F
 GLIBC_2.2 __dn_count_labels F
-GLIBC_2.2 __dn_skipname F
 GLIBC_2.2 __fp_nquery F
 GLIBC_2.2 __fp_query F
 GLIBC_2.2 __fp_resstat F
diff --git a/sysdeps/unix/sysv/linux/sh/be/libc.abilist b/sysdeps/unix/sysv/linux/sh/be/libc.abilist
index 32a81a467c..d38e23b612 100644
--- a/sysdeps/unix/sysv/linux/sh/be/libc.abilist
+++ b/sysdeps/unix/sysv/linux/sh/be/libc.abilist
@@ -3,6 +3,7 @@  GCC_3.0 __deregister_frame_info_bases F
 GCC_3.0 __register_frame_info_bases F
 GCC_3.0 __register_frame_info_table_bases F
 GLIBC_2.0 __dn_comp F
+GLIBC_2.0 __dn_skipname F
 GLIBC_2.0 dladdr F
 GLIBC_2.0 dlclose F
 GLIBC_2.0 dlerror F
@@ -2412,6 +2413,7 @@  GLIBC_2.34 dlsym F
 GLIBC_2.34 dlvsym F
 GLIBC_2.34 dn_comp F
 GLIBC_2.34 dn_expand F
+GLIBC_2.34 dn_skipname F
 GLIBC_2.34 execveat F
 GLIBC_2.34 forkpty F
 GLIBC_2.34 gai_cancel F
diff --git a/sysdeps/unix/sysv/linux/sh/be/libresolv.abilist b/sysdeps/unix/sysv/linux/sh/be/libresolv.abilist
index 8ee174124c..48ff3bffa1 100644
--- a/sysdeps/unix/sysv/linux/sh/be/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/sh/be/libresolv.abilist
@@ -1,7 +1,6 @@ 
 GLIBC_2.0 __b64_ntop F
 GLIBC_2.0 __b64_pton F
 GLIBC_2.0 __dn_count_labels F
-GLIBC_2.0 __dn_skipname F
 GLIBC_2.0 __fp_nquery F
 GLIBC_2.0 __fp_query F
 GLIBC_2.0 __fp_resstat F
diff --git a/sysdeps/unix/sysv/linux/sh/le/libc.abilist b/sysdeps/unix/sysv/linux/sh/le/libc.abilist
index 884b53816e..4890dfbfe4 100644
--- a/sysdeps/unix/sysv/linux/sh/le/libc.abilist
+++ b/sysdeps/unix/sysv/linux/sh/le/libc.abilist
@@ -3,6 +3,7 @@  GCC_3.0 __deregister_frame_info_bases F
 GCC_3.0 __register_frame_info_bases F
 GCC_3.0 __register_frame_info_table_bases F
 GLIBC_2.0 __dn_comp F
+GLIBC_2.0 __dn_skipname F
 GLIBC_2.0 dladdr F
 GLIBC_2.0 dlclose F
 GLIBC_2.0 dlerror F
@@ -2409,6 +2410,7 @@  GLIBC_2.34 dlsym F
 GLIBC_2.34 dlvsym F
 GLIBC_2.34 dn_comp F
 GLIBC_2.34 dn_expand F
+GLIBC_2.34 dn_skipname F
 GLIBC_2.34 execveat F
 GLIBC_2.34 forkpty F
 GLIBC_2.34 gai_cancel F
diff --git a/sysdeps/unix/sysv/linux/sh/le/libresolv.abilist b/sysdeps/unix/sysv/linux/sh/le/libresolv.abilist
index 8ee174124c..48ff3bffa1 100644
--- a/sysdeps/unix/sysv/linux/sh/le/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/sh/le/libresolv.abilist
@@ -1,7 +1,6 @@ 
 GLIBC_2.0 __b64_ntop F
 GLIBC_2.0 __b64_pton F
 GLIBC_2.0 __dn_count_labels F
-GLIBC_2.0 __dn_skipname F
 GLIBC_2.0 __fp_nquery F
 GLIBC_2.0 __fp_query F
 GLIBC_2.0 __fp_resstat F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
index 2bb890e734..bc737ffc66 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
@@ -128,6 +128,7 @@  GLIBC_2.0 __deregister_frame F
 GLIBC_2.0 __deregister_frame_info F
 GLIBC_2.0 __dgettext F
 GLIBC_2.0 __dn_comp F
+GLIBC_2.0 __dn_skipname F
 GLIBC_2.0 __dup2 F
 GLIBC_2.0 __environ D 0x4
 GLIBC_2.0 __errno_location F
@@ -2552,6 +2553,7 @@  GLIBC_2.34 dlsym F
 GLIBC_2.34 dlvsym F
 GLIBC_2.34 dn_comp F
 GLIBC_2.34 dn_expand F
+GLIBC_2.34 dn_skipname F
 GLIBC_2.34 execveat F
 GLIBC_2.34 forkpty F
 GLIBC_2.34 gai_cancel F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libresolv.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libresolv.abilist
index 8ee174124c..48ff3bffa1 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libresolv.abilist
@@ -1,7 +1,6 @@ 
 GLIBC_2.0 __b64_ntop F
 GLIBC_2.0 __b64_pton F
 GLIBC_2.0 __dn_count_labels F
-GLIBC_2.0 __dn_skipname F
 GLIBC_2.0 __fp_nquery F
 GLIBC_2.0 __fp_query F
 GLIBC_2.0 __fp_resstat F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
index 5116c47b9f..a745ed2a70 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
@@ -3,6 +3,7 @@  GCC_3.0 __deregister_frame_info_bases F
 GCC_3.0 __register_frame_info_bases F
 GCC_3.0 __register_frame_info_table_bases F
 GLIBC_2.0 __dn_comp F
+GLIBC_2.0 __dn_skipname F
 GLIBC_2.0 dladdr F
 GLIBC_2.0 dlclose F
 GLIBC_2.0 dlerror F
@@ -2387,6 +2388,7 @@  GLIBC_2.34 dlsym F
 GLIBC_2.34 dlvsym F
 GLIBC_2.34 dn_comp F
 GLIBC_2.34 dn_expand F
+GLIBC_2.34 dn_skipname F
 GLIBC_2.34 execveat F
 GLIBC_2.34 forkpty F
 GLIBC_2.34 gai_cancel F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libresolv.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libresolv.abilist
index cee6c22004..7c80f1818a 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libresolv.abilist
@@ -1,7 +1,6 @@ 
 GLIBC_2.0 __b64_ntop F
 GLIBC_2.0 __b64_pton F
 GLIBC_2.0 __dn_count_labels F
-GLIBC_2.0 __dn_skipname F
 GLIBC_2.0 __fp_nquery F
 GLIBC_2.0 __fp_query F
 GLIBC_2.0 __fp_resstat F
diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
index 6616970cf5..5d35b3bb7a 100644
--- a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
@@ -250,6 +250,7 @@  GLIBC_2.2.5 __default_morecore F
 GLIBC_2.2.5 __dgettext F
 GLIBC_2.2.5 __dn_comp F
 GLIBC_2.2.5 __dn_expand F
+GLIBC_2.2.5 __dn_skipname F
 GLIBC_2.2.5 __dup2 F
 GLIBC_2.2.5 __duplocale F
 GLIBC_2.2.5 __endmntent F
@@ -2342,6 +2343,7 @@  GLIBC_2.34 dlsym F
 GLIBC_2.34 dlvsym F
 GLIBC_2.34 dn_comp F
 GLIBC_2.34 dn_expand F
+GLIBC_2.34 dn_skipname F
 GLIBC_2.34 execveat F
 GLIBC_2.34 forkpty F
 GLIBC_2.34 gai_cancel F
diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libresolv.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libresolv.abilist
index 640facbd02..93c5e8111c 100644
--- a/sysdeps/unix/sysv/linux/x86_64/64/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/64/libresolv.abilist
@@ -1,7 +1,6 @@ 
 GLIBC_2.2.5 __b64_ntop F
 GLIBC_2.2.5 __b64_pton F
 GLIBC_2.2.5 __dn_count_labels F
-GLIBC_2.2.5 __dn_skipname F
 GLIBC_2.2.5 __fp_nquery F
 GLIBC_2.2.5 __fp_query F
 GLIBC_2.2.5 __fp_resstat F
diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
index 8fd921f505..bf06824cd4 100644
--- a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
@@ -168,6 +168,7 @@  GLIBC_2.16 __default_morecore F
 GLIBC_2.16 __dgettext F
 GLIBC_2.16 __dn_comp F
 GLIBC_2.16 __dn_expand F
+GLIBC_2.16 __dn_skipname F
 GLIBC_2.16 __dprintf_chk F
 GLIBC_2.16 __dup2 F
 GLIBC_2.16 __duplocale F
@@ -2448,6 +2449,7 @@  GLIBC_2.34 dlsym F
 GLIBC_2.34 dlvsym F
 GLIBC_2.34 dn_comp F
 GLIBC_2.34 dn_expand F
+GLIBC_2.34 dn_skipname F
 GLIBC_2.34 execveat F
 GLIBC_2.34 forkpty F
 GLIBC_2.34 gai_cancel F
diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libresolv.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libresolv.abilist
index 6990240c4e..5c84955527 100644
--- a/sysdeps/unix/sysv/linux/x86_64/x32/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/x32/libresolv.abilist
@@ -1,7 +1,6 @@ 
 GLIBC_2.16 __b64_ntop F
 GLIBC_2.16 __b64_pton F
 GLIBC_2.16 __dn_count_labels F
-GLIBC_2.16 __dn_skipname F
 GLIBC_2.16 __fp_nquery F
 GLIBC_2.16 __fp_query F
 GLIBC_2.16 __fp_resstat F