Fix sparc build.

	* sysdeps/sparc/nptl/pthread_barrier_init.c: Include
	futex-intenal.h
	* sysdeps/sparc/sparc32/sparcv9/Makefile (nscd): Add cpu_relax.
	* sysdeps/sparc/sparc64/Makefile: Likewise.
	* sysdeps/sparc/sparc32/sparcv9/bits/atomic.h (atomic_spin_nop):
	Remove space from macro define.
	* sysdeps/sparc/sparc64/bits/atomic.h (atomic_spin_nop): Likewise.

diff --git a/ChangeLog b/ChangeLog
index ffeb4d387f4583460346e2dd74cb020da06c3711..b0eba065fd3d90fe92eff908446de86dba8660bb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2015-07-15  David S. Miller  <davem@davemloft.net>
+
+       * sysdeps/sparc/nptl/pthread_barrier_init.c: Include
+       futex-intenal.h
+       * sysdeps/sparc/sparc32/sparcv9/Makefile (nscd): Add cpu_relax.
+       * sysdeps/sparc/sparc64/Makefile: Likewise.
+       * sysdeps/sparc/sparc32/sparcv9/bits/atomic.h (atomic_spin_nop):
+       Remove space from macro define.
+       * sysdeps/sparc/sparc64/bits/atomic.h (atomic_spin_nop): Likewise.
+
 2015-07-15  Pravin Satpute  <psatpute@redhat.com>
 
        [BZ #17475]

diff --git a/sysdeps/sparc/nptl/pthread_barrier_init.c b/sysdeps/sparc/nptl/pthread_barrier_init.c
index 86ec7d0348d4d0c1a13f59d960d6e6ca8943716e..d13c32afbb6cf0e68839b5388273333c37add927 100644 (file)
--- 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 925fa4ff73108ba2625ddd4542b7a4097fdbf0e9..fefc742478b2b30b7d0a9b692b6d95e609f66ded 100644 (file)
--- a/sysdeps/sparc/sparc32/sparcv9/Makefile
+++ b/sysdeps/sparc/sparc32/sparcv9/Makefile
@@ -14,6 +14,11 @@ ASFLAGS-.og += -Wa,-Av9a
 ASFLAGS-.oS += -Wa,-Av9a
 endif
 
+# nscd uses atomic_spin_nop which in turn requires cpu_relax
+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 2122afbb0924076a29618c168ddbce2a6ddb3d58..0ff5dcd69dda40b58ddfd209926d3bf59296c359 100644 (file)
--- 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 dfc118cfef2d1d0f6cad5eae2e701a0bdd80c171..3a12510307139e2a70cb45f3c1d31e6b1b4da2ad 100644 (file)
--- a/sysdeps/sparc/sparc64/Makefile
+++ b/sysdeps/sparc/sparc64/Makefile
@@ -10,6 +10,11 @@ ASFLAGS-.og += -Wa,-Av9d
 ASFLAGS-.oS += -Wa,-Av9d
 endif
 
+# nscd uses atomic_spin_nop which in turn requires cpu_relax
+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 48b7fd621676f424cc914aa9d8b6d7ce735a00b8..79f4a1d9be195325fe49f47b3032c7f9860e58be 100644 (file)
--- 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 ()