[glibc/azanella/clang] libio: Use __libc_ferror_unlocked instead of __ferror_unlocked

[Adhemerval Zanella <azanella@sourceware.org>]

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

commit 4f23160415b89fb4919d4f56dedbab6fd7158b8c
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date:   Mon Mar 14 15:14:36 2022 -0300

    libio: Use __libc_ferror_unlocked instead of __ferror_unlocked
    
    Internal __ferror_unlocked is done using a inline function (regardless
    of __USE_EXTERN_INLINES).  The internal alias is removed since it is
    not used.

Diff:
---
 include/stdio.h  | 9 ++++-----
 libio/ferror_u.c | 3 +--
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/include/stdio.h b/include/stdio.h
index 51a8d65f22..f1e388523b 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -243,8 +243,7 @@ libc_hidden_proto (fputs_unlocked)
 extern __typeof (fputs_unlocked) __fputs_unlocked;
 libc_hidden_proto (__fputs_unlocked)
 extern __typeof (feof_unlocked) __libc_feof_unlocked;
-libc_hidden_proto (ferror_unlocked)
-extern __typeof (ferror_unlocked) __ferror_unlocked attribute_hidden;
+extern __typeof (ferror_unlocked) __libc_ferror_unlocked;
 libc_hidden_proto (getc_unlocked)
 libc_hidden_proto (fputc_unlocked)
 libc_hidden_proto (putc_unlocked)
@@ -270,13 +269,13 @@ __feof_unlocked (FILE *__stream)
   return __feof_unlocked_body (__stream);
 }
 
-#  ifdef __USE_EXTERN_INLINES
-__extern_inline int
-__NTH (__ferror_unlocked (FILE *__stream))
+static inline int
+__ferror_unlocked (FILE *__stream)
 {
   return __ferror_unlocked_body (__stream);
 }
 
+#  ifdef __USE_EXTERN_INLINES
 __extern_inline int
 __getc_unlocked (FILE *__fp)
 {
diff --git a/libio/ferror_u.c b/libio/ferror_u.c
index edba404d32..ea2a97db8f 100644
--- a/libio/ferror_u.c
+++ b/libio/ferror_u.c
@@ -30,10 +30,9 @@
 #undef ferror_unlocked
 
 int
-__ferror_unlocked (FILE *fp)
+__libc_ferror_unlocked (FILE *fp)
 {
   CHECK_FILE (fp, EOF);
   return _IO_ferror_unlocked (fp);
 }
 weak_alias (__ferror_unlocked, ferror_unlocked)
-libc_hidden_weak (ferror_unlocked)