| Message ID | 20150715.152157.1923341079641036124.davem@davemloft.net |
|---|---|
| State | New |
| Headers | show |
> * sysdeps/sparc/sparc32/sparcv9/bits/atomic.h (atomic_spin_nop): Remove space from This line is too long. > +ifeq ($(subdir),nscd) > +routines += cpu_relax > +endif I think this merits a comment explaining that atomic_spin_nop (or you could just say "direct uses of our internal <atomic.h> interfaces") requires cpu_relax and that nscd uses those internal interfaces directly. Otherwise looks fine and I think it clearly falls under Carlos's rules for freeze-time commits without his explicit approval. Thanks, Roland
From: Roland McGrath <roland@hack.frob.com> Date: Wed, 15 Jul 2015 15:45:53 -0700 (PDT) >> * sysdeps/sparc/sparc32/sparcv9/bits/atomic.h (atomic_spin_nop): Remove space from > > This line is too long. Ok. >> +ifeq ($(subdir),nscd) >> +routines += cpu_relax >> +endif > > I think this merits a comment explaining that atomic_spin_nop (or you could > just say "direct uses of our internal <atomic.h> interfaces") requires > cpu_relax and that nscd uses those internal interfaces directly. I'll add a comment. > Otherwise looks fine and I think it clearly falls under Carlos's rules for > freeze-time commits without his explicit approval. Thanks, will commit after I fix the above.
On 07/15/2015 07:05 PM, David Miller wrote: >> Otherwise looks fine and I think it clearly falls under Carlos's rules for >> freeze-time commits without his explicit approval. > > Thanks, will commit after I fix the above. > Would you mind updating the sparc testing status too? :-) https://sourceware.org/glibc/wiki/Release/2.22 c.
diff --git a/sysdeps/sparc/nptl/pthread_barrier_init.c b/sysdeps/sparc/nptl/pthread_barrier_init.c index 86ec7d0..d13c32a 100644 --- a/sysdeps/sparc/nptl/pthread_barrier_init.c +++ b/sysdeps/sparc/nptl/pthread_barrier_init.c @@ -19,6 +19,7 @@ #include <errno.h> #include "pthreadP.h" #include <lowlevellock.h> +#include <futex-internal.h> #include <sparc-nptl.h> int diff --git a/sysdeps/sparc/sparc32/sparcv9/Makefile b/sysdeps/sparc/sparc32/sparcv9/Makefile index 925fa4f..5baaf2b 100644 --- a/sysdeps/sparc/sparc32/sparcv9/Makefile +++ b/sysdeps/sparc/sparc32/sparcv9/Makefile @@ -14,6 +14,10 @@ ASFLAGS-.og += -Wa,-Av9a ASFLAGS-.oS += -Wa,-Av9a endif +ifeq ($(subdir),nscd) +routines += cpu_relax +endif + ifeq ($(subdir), nptl) libpthread-routines += cpu_relax endif diff --git a/sysdeps/sparc/sparc32/sparcv9/bits/atomic.h b/sysdeps/sparc/sparc32/sparcv9/bits/atomic.h index 2122afb..0ff5dcd 100644 --- a/sysdeps/sparc/sparc32/sparcv9/bits/atomic.h +++ b/sysdeps/sparc/sparc32/sparcv9/bits/atomic.h @@ -102,4 +102,4 @@ typedef uintmax_t uatomic_max_t; __asm __volatile ("membar #LoadStore | #StoreStore" : : : "memory") extern void __cpu_relax (void); -#define atomic_spin_nop () __cpu_relax () +#define atomic_spin_nop() __cpu_relax () diff --git a/sysdeps/sparc/sparc64/Makefile b/sysdeps/sparc/sparc64/Makefile index dfc118c..13eb1c3 100644 --- a/sysdeps/sparc/sparc64/Makefile +++ b/sysdeps/sparc/sparc64/Makefile @@ -10,6 +10,10 @@ ASFLAGS-.og += -Wa,-Av9d ASFLAGS-.oS += -Wa,-Av9d endif +ifeq ($(subdir),nscd) +routines += cpu_relax +endif + ifeq ($(subdir),nptl) libpthread-routines += cpu_relax endif diff --git a/sysdeps/sparc/sparc64/bits/atomic.h b/sysdeps/sparc/sparc64/bits/atomic.h index 48b7fd6..79f4a1d 100644 --- a/sysdeps/sparc/sparc64/bits/atomic.h +++ b/sysdeps/sparc/sparc64/bits/atomic.h @@ -123,4 +123,4 @@ typedef uintmax_t uatomic_max_t; __asm __volatile ("membar #LoadStore | #StoreStore" : : : "memory") extern void __cpu_relax (void); -#define atomic_spin_nop () __cpu_relax () +#define atomic_spin_nop() __cpu_relax ()