Don't use __typeof__ (getcpu)

Message ID CAMe9rOo9+UzNdtZ40WhgYO1VOSmUeuLu3+Pr_ooz+o-byOw1Jg@mail.gmail.com
State New
Headers show
Series
  • Don't use __typeof__ (getcpu)
Related show

Commit Message

H.J. Lu Dec. 7, 2018, 8:29 p.m.
On Fri, Dec 7, 2018 at 9:15 AM Florian Weimer <fweimer@redhat.com> wrote:
>

> * H. J. Lu:

>

> > Here is the updated patch.  OK for master?

>

> Looks okay to me now.


This is needed for Hurd.

Tested with build-many-glibcs.py.  OK for master?

-- 
H.J.

Comments

Samuel Thibault Dec. 7, 2018, 8:38 p.m. | #1
H.J. Lu, le ven. 07 déc. 2018 12:29:50 -0800, a ecrit:
> On Fri, Dec 7, 2018 at 9:15 AM Florian Weimer <fweimer@redhat.com> wrote:

> >

> > * H. J. Lu:

> >

> > > Here is the updated patch.  OK for master?

> >

> > Looks okay to me now.

> 

> This is needed for Hurd.

> 

> Tested with build-many-glibcs.py.  OK for master?


I was testing the same patch :)

Please commit :)

Samuel
H.J. Lu Dec. 7, 2018, 8:49 p.m. | #2
On Fri, Dec 7, 2018 at 12:38 PM Samuel Thibault
<samuel.thibault@ens-lyon.org> wrote:
>

> H.J. Lu, le ven. 07 déc. 2018 12:29:50 -0800, a ecrit:

> > On Fri, Dec 7, 2018 at 9:15 AM Florian Weimer <fweimer@redhat.com> wrote:

> > >

> > > * H. J. Lu:

> > >

> > > > Here is the updated patch.  OK for master?

> > >

> > > Looks okay to me now.

> >

> > This is needed for Hurd.

> >

> > Tested with build-many-glibcs.py.  OK for master?

>

> I was testing the same patch :)

>

> Please commit :)

>


Done.

Thanks.

-- 
H.J.

Patch

From 2894f9226744f94a03bcd2d9ca3794a2bdbe8923 Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Fri, 7 Dec 2018 12:25:33 -0800
Subject: [PATCH] Don't use __typeof__ (getcpu)

We can't use "__typeof__ (getcpu)" since getcpu is Linux specific and
Hurd doesn't have it.

Tested with build-many-glibcs.py.

	* include/sched.h (__getcpu): Don't use __typeof__ (getcpu).
---
 include/sched.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/include/sched.h b/include/sched.h
index 0843c26d73..4abc440176 100644
--- a/include/sched.h
+++ b/include/sched.h
@@ -26,7 +26,9 @@  libc_hidden_proto (__clone)
 extern int __clone2 (int (*__fn) (void *__arg), void *__child_stack_base,
 		     size_t __child_stack_size, int __flags, void *__arg, ...);
 libc_hidden_proto (__clone2)
-extern __typeof__ (getcpu) __getcpu;
+/* NB: Can't use "__typeof__ (getcpu)" since getcpu is Linux specific
+   and Hurd doesn't have it.  */
+extern int __getcpu (unsigned int *, unsigned int *);
 libc_hidden_proto (__getcpu)
 #endif
 #endif
-- 
2.19.2