move pthread_barrier_{init,destroy} to sysdeps/pthread

for archs that implement their own like sparc and x86_64

Signed-off-by: Austin Foxley <austinf@cetoncorp.com>

diff --git a/libpthread/nptl/Makefile.in b/libpthread/nptl/Makefile.in
index d3386a3..ee59631 100644 (file)
--- a/libpthread/nptl/Makefile.in
+++ b/libpthread/nptl/Makefile.in
@@ -189,6 +189,7 @@ libpthread-misc-routines = pthread_rwlock_rdlock pthread_rwlock_timedrdlock \
                           pthread_cond_broadcast pthread_spin_init \
                           pthread_spin_destroy pthread_spin_lock \
                           pthread_spin_trylock pthread_spin_unlock \
+                          pthread_barrier_init pthread_barrier_destroy \
                           pthread_barrier_wait pthread_sigmask \
                           pthread_kill pthread_once \
                           pthread_getcpuclockid sem_wait \
@@ -250,6 +251,7 @@ libc-shared-y += $(patsubst %.c, $(PTHREAD_OUT)/%.oS, forward.c             \
        libc-cancellation.c)
 libpthread-nonshared-y += $(patsubst %,$(PTHREAD_OUT)/%.oS,$(libpthread_static_SRC))
 
+
 ifeq ($(DOPIC),y)
 libpthread-a-y := $(patsubst $(PTHREAD_DIR)/%.c,$(PTHREAD_OUT)/%.os,$(libpthread_a_SRC))
 else

diff --git a/libpthread/nptl/sysdeps/pthread/Makefile.in b/libpthread/nptl/sysdeps/pthread/Makefile.in
index 303b04f..e417e6c 100644 (file)
--- a/libpthread/nptl/sysdeps/pthread/Makefile.in
+++ b/libpthread/nptl/sysdeps/pthread/Makefile.in
@@ -10,7 +10,8 @@
 #       pt-longjmp.c in libc and libpthread. For uClibc, they are
 #       in libc only.
 #
-libpthread_CSRC = pthread_barrier_wait.c pthread_cond_broadcast.c      \
+libpthread_CSRC = pthread_barrier_init.c pthread_barrier_destroy.c    \
+                 pthread_barrier_wait.c pthread_cond_broadcast.c       \
                  pthread_cond_signal.c pthread_cond_timedwait.c        \
                  pthread_cond_wait.c pthread_rwlock_rdlock.c           \
                  pthread_rwlock_timedrdlock.c                          \
@@ -63,6 +64,8 @@ endif
 
 
 CFLAGS-pt-common = -DNOT_IN_libc=1 $(SSP_ALL_CFLAGS)
+CFLAGS-pthread_barrier_init.c = $(CFLAGS-pt-common)    -DIS_IN_libpthread=1
+CFLAGS-pthread_barrier_destroy.c = $(CFLAGS-pt-common) -DIS_IN_libpthread=1
 CFLAGS-pthread_barrier_wait.c = -D_GNU_SOURCE $(CFLAGS-pt-common)      \
                                -DIS_IN_libpthread=1
 CFLAGS-pthread_cond_broadcast.c = $(CFLAGS-pt-common) -DIS_IN_libpthread=1

diff --git a/libpthread/nptl/pthread_barrier_destroy.c b/libpthread/nptl/sysdeps/pthread/pthread_barrier_destroy.c
similarity index 100%
rename from libpthread/nptl/pthread_barrier_destroy.c
rename to libpthread/nptl/sysdeps/pthread/pthread_barrier_destroy.c

diff --git a/libpthread/nptl/pthread_barrier_init.c b/libpthread/nptl/sysdeps/pthread/pthread_barrier_init.c
similarity index 100%
rename from libpthread/nptl/pthread_barrier_init.c
rename to libpthread/nptl/sysdeps/pthread/pthread_barrier_init.c

diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/sparc/pthread_barrier_wait.c b/libpthread/nptl/sysdeps/unix/sysv/linux/sparc/pthread_barrier_wait.c
new file mode 100644 (file)
index 0000000..73eaa69
--- /dev/null
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sparc/pthread_barrier_wait.c
@@ -0,0 +1 @@
+#include "sparc32/pthread_barrier_wait.c"