public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc/azanella/clang] misc: Handle sysmacros.h internal alias for !__USE_EXTERN_INLINES
@ 2022-06-09 21:25 Adhemerval Zanella
0 siblings, 0 replies; 9+ messages in thread
From: Adhemerval Zanella @ 2022-06-09 21:25 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=45e9182843922ee087bda78fa2a5b4cd65a1c70c
commit 45e9182843922ee087bda78fa2a5b4cd65a1c70c
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)
^ permalink raw reply [flat|nested] 9+ messages in thread
* [glibc/azanella/clang] misc: Handle sysmacros.h internal alias for !__USE_EXTERN_INLINES
@ 2022-06-09 13:21 Adhemerval Zanella
0 siblings, 0 replies; 9+ messages in thread
From: Adhemerval Zanella @ 2022-06-09 13:21 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=45e9182843922ee087bda78fa2a5b4cd65a1c70c
commit 45e9182843922ee087bda78fa2a5b4cd65a1c70c
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)
^ permalink raw reply [flat|nested] 9+ messages in thread
* [glibc/azanella/clang] misc: Handle sysmacros.h internal alias for !__USE_EXTERN_INLINES
@ 2022-06-03 14:10 Adhemerval Zanella
0 siblings, 0 replies; 9+ messages in thread
From: Adhemerval Zanella @ 2022-06-03 14:10 UTC (permalink / raw)
To: glibc-cvs
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)
^ permalink raw reply [flat|nested] 9+ messages in thread
* [glibc/azanella/clang] misc: Handle sysmacros.h internal alias for !__USE_EXTERN_INLINES
@ 2022-05-13 14:24 Adhemerval Zanella
0 siblings, 0 replies; 9+ messages in thread
From: Adhemerval Zanella @ 2022-05-13 14:24 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=5a24c209300473c5db2e00fb5782ec3c74c073bd
commit 5a24c209300473c5db2e00fb5782ec3c74c073bd
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)
^ permalink raw reply [flat|nested] 9+ messages in thread
* [glibc/azanella/clang] misc: Handle sysmacros.h internal alias for !__USE_EXTERN_INLINES
@ 2022-05-12 19:38 Adhemerval Zanella
0 siblings, 0 replies; 9+ messages in thread
From: Adhemerval Zanella @ 2022-05-12 19:38 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=7f949067b426e81dbab40a580be3c2d0dae74db0
commit 7f949067b426e81dbab40a580be3c2d0dae74db0
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)
^ permalink raw reply [flat|nested] 9+ messages in thread
* [glibc/azanella/clang] misc: Handle sysmacros.h internal alias for !__USE_EXTERN_INLINES
@ 2022-05-10 18:28 Adhemerval Zanella
0 siblings, 0 replies; 9+ messages in thread
From: Adhemerval Zanella @ 2022-05-10 18:28 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=67e0a662d916f22d19b411d02d99b723925d2722
commit 67e0a662d916f22d19b411d02d99b723925d2722
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)
^ permalink raw reply [flat|nested] 9+ messages in thread
* [glibc/azanella/clang] misc: Handle sysmacros.h internal alias for !__USE_EXTERN_INLINES
@ 2022-04-29 14:08 Adhemerval Zanella
0 siblings, 0 replies; 9+ messages in thread
From: Adhemerval Zanella @ 2022-04-29 14:08 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=64a9913c31959b2cda22958ab7cbce2487e738d0
commit 64a9913c31959b2cda22958ab7cbce2487e738d0
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)
^ permalink raw reply [flat|nested] 9+ messages in thread
* [glibc/azanella/clang] misc: Handle sysmacros.h internal alias for !__USE_EXTERN_INLINES
@ 2022-04-04 12:59 Adhemerval Zanella
0 siblings, 0 replies; 9+ messages in thread
From: Adhemerval Zanella @ 2022-04-04 12:59 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=ec6aeb25eda689b2a99df912cc39616615f4e0b4
commit ec6aeb25eda689b2a99df912cc39616615f4e0b4
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)
^ permalink raw reply [flat|nested] 9+ messages in thread
* [glibc/azanella/clang] misc: Handle sysmacros.h internal alias for !__USE_EXTERN_INLINES
@ 2022-03-31 19:11 Adhemerval Zanella
0 siblings, 0 replies; 9+ messages in thread
From: Adhemerval Zanella @ 2022-03-31 19:11 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=8c28475949510dc8ea9a61eb7af9bcd00202f98a
commit 8c28475949510dc8ea9a61eb7af9bcd00202f98a
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)
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2022-06-09 21:25 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-09 21:25 [glibc/azanella/clang] misc: Handle sysmacros.h internal alias for !__USE_EXTERN_INLINES Adhemerval Zanella
-- strict thread matches above, loose matches on Subject: below --
2022-06-09 13:21 Adhemerval Zanella
2022-06-03 14:10 Adhemerval Zanella
2022-05-13 14:24 Adhemerval Zanella
2022-05-12 19:38 Adhemerval Zanella
2022-05-10 18:28 Adhemerval Zanella
2022-04-29 14:08 Adhemerval Zanella
2022-04-04 12:59 Adhemerval Zanella
2022-03-31 19:11 Adhemerval Zanella
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).