[glibc/azanella/clang] libio: Use __libc_getdelim instead of __getdelim

[Adhemerval Zanella <azanella@sourceware.org>]

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=a82b0e7ea0ec86ac3543ed1d9f617b664d4774d2

commit a82b0e7ea0ec86ac3543ed1d9f617b664d4774d2
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date:   Mon Mar 14 14:28:57 2022 -0300

    libio: Use __libc_getdelim instead of __getdelim

Diff:
---
 iconv/gconv_parseconfdir.h              | 2 +-
 include/stdio.h                         | 3 ++-
 libio/iogetdelim.c                      | 5 +++--
 stdio-common/getline.c                  | 2 +-
 sysdeps/unix/sysv/linux/readonly-area.c | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/iconv/gconv_parseconfdir.h b/iconv/gconv_parseconfdir.h
index c0de548833..b8e174ed6f 100644
--- a/iconv/gconv_parseconfdir.h
+++ b/iconv/gconv_parseconfdir.h
@@ -23,7 +23,7 @@
 
 #if IS_IN (libc)
 # include <libio/libioP.h>
-# define __getdelim(line, len, c, fp) __getdelim (line, len, c, fp)
+# define __getdelim(line, len, c, fp) __libc_getdelim (line, len, c, fp)
 
 # undef isspace
 # define isspace(__c) __isspace_l ((__c), _nl_C_locobj_ptr)
diff --git a/include/stdio.h b/include/stdio.h
index 39b4978130..b8f6f8f8b1 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -212,7 +212,8 @@ stdio_hidden_ldbl_proto (fprintf);
 stdio_hidden_ldbl_proto (vfprintf);
 stdio_hidden_ldbl_proto (sprintf);
 libc_hidden_proto (ungetc)
-libc_hidden_proto (__getdelim)
+__typeof (getdelim) __libc_getdelim;
+hidden_proto2 (getdelim, __libc_getdelim);
 libc_hidden_proto (fwrite)
 libc_hidden_proto (perror)
 libc_hidden_proto (remove)
diff --git a/libio/iogetdelim.c b/libio/iogetdelim.c
index b6c4c07b45..d24cb07e50 100644
--- a/libio/iogetdelim.c
+++ b/libio/iogetdelim.c
@@ -37,7 +37,7 @@
    null terminator), or -1 on error or EOF.  */
 
 ssize_t
-__getdelim (char **lineptr, size_t *n, int delimiter, FILE *fp)
+__libc_getdelim (char **lineptr, size_t *n, int delimiter, FILE *fp)
 {
   ssize_t result;
   ssize_t cur_len = 0;
@@ -122,5 +122,6 @@ unlock_return:
   _IO_release_lock (fp);
   return result;
 }
-libc_hidden_def (__getdelim)
+libc_hidden_def (__libc_getdelim)
+strong_alias (__libc_getdelim, __getdelim)
 weak_alias (__getdelim, getdelim)
diff --git a/stdio-common/getline.c b/stdio-common/getline.c
index 18a489ca0b..329b1c7d4b 100644
--- a/stdio-common/getline.c
+++ b/stdio-common/getline.c
@@ -25,7 +25,7 @@
 ssize_t
 __getline (char **lineptr, size_t *n, FILE *stream)
 {
-  return __getdelim (lineptr, n, '\n', stream);
+  return __libc_getdelim (lineptr, n, '\n', stream);
 }
 
 weak_alias (__getline, getline)
diff --git a/sysdeps/unix/sysv/linux/readonly-area.c b/sysdeps/unix/sysv/linux/readonly-area.c
index 3a94d7c52f..b3f7a2fe75 100644
--- a/sysdeps/unix/sysv/linux/readonly-area.c
+++ b/sysdeps/unix/sysv/linux/readonly-area.c
@@ -55,7 +55,7 @@ __readonly_area (const char *ptr, size_t size)
 
   while (! __feof_unlocked (fp))
     {
-      if (__getdelim (&line, &linelen, '\n', fp) <= 0)
+      if (__libc_getdelim (&line, &linelen, '\n', fp) <= 0)
 	break;
 
       char *p;