[glibc/azanella/clang] misc: Handle sysmacros.h internal alias for !__USE_EXTERN_INLINES

[Adhemerval Zanella <azanella@sourceware.org>]

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

commit 29b1b435a5b211da52bfbd2368b21c317f6b8647
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date:   Thu Mar 31 10:58:56 2022 -0300

    misc: Handle sysmacros.h internal alias for !__USE_EXTERN_INLINES

Diff:
---
 include/sys/sysmacros.h | 16 +++++++++++++---
 misc/makedev.c          |  6 +++---
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/include/sys/sysmacros.h b/include/sys/sysmacros.h
index ae8d8f00da..d7d3f5d9c3 100644
--- a/include/sys/sysmacros.h
+++ b/include/sys/sysmacros.h
@@ -25,9 +25,12 @@
 #if !defined _SYS_SYSMACROS_H_WRAPPER && !defined _ISOMAC
 # define _SYS_SYSMACROS_H_WRAPPER 1
 
-libc_hidden_proto (gnu_dev_major)
-libc_hidden_proto (gnu_dev_minor)
-libc_hidden_proto (gnu_dev_makedev)
+__typeof (gnu_dev_major) __gnu_dev_major;
+libc_hidden_proto (__gnu_dev_major)
+__typeof (gnu_dev_minor) __gnu_dev_minor;
+libc_hidden_proto (__gnu_dev_minor)
+__typeof (gnu_dev_makedev) __gnu_dev_makedev;
+libc_hidden_proto (__gnu_dev_makedev)
 
 # undef __SYSMACROS_DECL_TEMPL
 # define __SYSMACROS_DECL_TEMPL(rtype, name, proto)	\
@@ -47,6 +50,13 @@ __SYSMACROS_DECLARE_MAKEDEV (__SYSMACROS_DECL_TEMPL)
 __SYSMACROS_DEFINE_MAJOR (__SYSMACROS_IMPL_TEMPL)
 __SYSMACROS_DEFINE_MINOR (__SYSMACROS_IMPL_TEMPL)
 __SYSMACROS_DEFINE_MAKEDEV (__SYSMACROS_IMPL_TEMPL)
+# elif IS_IN (libc)
+#  undef major
+#  define major(dev) __gnu_dev_major (dev)
+#  undef minor
+#  define minor(dev) __gnu_dev_minor (dev)
+#  undef makedev
+#  define makedev(maj, min) __gnu_dev_makedev (maj, min)
 # endif
 
 #endif
diff --git a/misc/makedev.c b/misc/makedev.c
index 1629b80a26..c39c306206 100644
--- a/misc/makedev.c
+++ b/misc/makedev.c
@@ -27,10 +27,10 @@
 
 __SYSMACROS_DEFINE_MAJOR(OUT_OF_LINE_IMPL_TEMPL)
 weak_alias (__gnu_dev_major, gnu_dev_major)
-libc_hidden_weak (gnu_dev_major)
+libc_hidden_weak (__gnu_dev_major)
 __SYSMACROS_DEFINE_MINOR(OUT_OF_LINE_IMPL_TEMPL)
 weak_alias (__gnu_dev_minor, gnu_dev_minor)
-libc_hidden_weak (gnu_dev_minor)
+libc_hidden_weak (__gnu_dev_minor)
 __SYSMACROS_DEFINE_MAKEDEV(OUT_OF_LINE_IMPL_TEMPL)
 weak_alias (__gnu_dev_makedev, gnu_dev_makedev)
-libc_hidden_weak (gnu_dev_makedev)
+libc_hidden_weak (__gnu_dev_makedev)