Revert "nptl: make build depend directly on nptl headers"

This reverts commit 641e7e36ad0a9b2899b04f256c5b243ada7da279.

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

6 files changed, 32 insertions, 26 deletions

diff --git a/libpthread/nptl/sysdeps/arm/Makefile.arch b/libpthread/nptl/sysdeps/arm/Makefile.arch
index 79c883260..6d16ae3fd 100644
--- a/libpthread/nptl/sysdeps/arm/Makefile.arch
+++ b/libpthread/nptl/sysdeps/arm/Makefile.arch
@@ -43,8 +43,7 @@ librt-so-y += $(LIBRT_ARCH_OBJ:.o=.oS)
 
 libpthread-nomulti-y += $(PTHREAD_ARCH_OBJ)
 
-objclean-y += nptl_arch_clean
-headers-y += $(PTHREAD_ARCH_OUT)/tcb-offsets.h
+objclean-y += nptl_arch_objclean
 headers_clean-y += nptl_arch_headers_clean
 
 #
@@ -58,11 +57,13 @@ $(PTHREAD_ARCH_OUT)/tcb-offsets.c: $(PTHREAD_ARCH_DIR)/tcb-offsets.sym
 $(PTHREAD_ARCH_OUT)/tcb-offsets.s: $(PTHREAD_ARCH_OUT)/tcb-offsets.c
 	$(compile.c)
 
-$(PTHREAD_ARCH_OUT)/tcb-offsets.h: $(PTHREAD_ARCH_OUT)/tcb-offsets.s
-	$(do_sed) -n "s/^.*@@@name@@@\([^@]*\)@@@value@@@[^0-9Xxa-fA-F-]*\([0-9Xxa-fA-F-][0-9Xxa-fA-F-]*\).*@@@end@@@.*$\/#define \1 \2/p" $< > $@
+nptl_arch_headers: $(PTHREAD_ARCH_OUT)/tcb-offsets.s
+	$(do_sed) -n "s/^.*@@@name@@@\([^@]*\)@@@value@@@[^0-9Xxa-fA-F-]*\([0-9Xxa-fA-F-][0-9Xxa-fA-F-]*\).*@@@end@@@.*$\/#define \1 \2/p" $< > $(PTHREAD_ARCH_OUT)/tcb-offsets.h
 
 nptl_arch_headers_clean:
-	$(do_rm) $(addprefix $(PTHREAD_ARCH_OUT)/tcb-offsets., c s h)
+	$(RM) $(PTHREAD_ARCH_OUT)/tcb-offsets.c		\
+	      $(PTHREAD_ARCH_OUT)/tcb-offsets.s		\
+	      $(PTHREAD_ARCH_OUT)/tcb-offsets.h
 
-nptl_arch_clean:
-	$(do_rm) $(addprefix $(PTHREAD_ARCH_OUT)/*., o os oS)
+nptl_arch_objclean:
+	$(RM) $(PTHREAD_ARCH_OUT)/*.{o,os,oS}
diff --git a/libpthread/nptl/sysdeps/i386/Makefile.arch b/libpthread/nptl/sysdeps/i386/Makefile.arch
index 2b8fbbfec..2b9a2dc7c 100644
--- a/libpthread/nptl/sysdeps/i386/Makefile.arch
+++ b/libpthread/nptl/sysdeps/i386/Makefile.arch
@@ -13,8 +13,8 @@ CFLAGS-pthread_spin_lock.c += -D_GNU_SOURCE
 CFLAGS-i386 = $(SSP_ALL_CFLAGS)
 #CFLAGS:=$(CFLAGS:-O1=-O2)
 
-PTHREAD_ARCH_DIR := $(top_srcdir)libpthread/nptl/sysdeps/i386
-PTHREAD_ARCH_OUT := $(top_builddir)libpthread/nptl/sysdeps/i386
+PTHREAD_ARCH_DIR := $(top_srcdir)libpthread/nptl/sysdeps/i386/
+PTHREAD_ARCH_OUT := $(top_builddir)libpthread/nptl/sysdeps/i386/
 PTHREAD_ARCH_OBJ := $(patsubst %.S,$(PTHREAD_ARCH_OUT)/%.o,$(libpthread_SSRC))
 PTHREAD_ARCH_OBJ += $(patsubst %.c,$(PTHREAD_ARCH_OUT)/%.o,$(libpthread_CSRC))
 
@@ -28,7 +28,6 @@ libpthread-so-y += $(PTHREAD_ARCH_OBJ:.o=.oS)
 libpthread-nomulti-y += $(PTHREAD_ARCH_OBJ)
 
 objclean-y += nptl_arch_clean
-headers-y += $(PTHREAD_ARCH_OUT)/tcb-offsets.h
 headers_clean-y += nptl_arch_headers_clean
 
 #
@@ -45,6 +44,8 @@ $(PTHREAD_ARCH_OUT)/tcb-offsets.s: $(PTHREAD_ARCH_OUT)/tcb-offsets.c
 $(PTHREAD_ARCH_OUT)/tcb-offsets.h: $(PTHREAD_ARCH_OUT)/tcb-offsets.s
 	@sed -n "s/^.*@@@name@@@\([^@]*\)@@@value@@@[^0-9Xxa-fA-F-]*\([0-9Xxa-fA-F-][0-9Xxa-fA-F-]*\).*@@@end@@@.*$\/#define \1 \2/p" $< > $@
 
+nptl_arch_headers: $(PTHREAD_ARCH_OUT)/tcb-offsets.h
+
 nptl_arch_headers_clean:
 	$(do_rm) $(addprefix $(PTHREAD_ARCH_OUT)/tcb-offsets., c s h)
 
diff --git a/libpthread/nptl/sysdeps/mips/Makefile.arch b/libpthread/nptl/sysdeps/mips/Makefile.arch
index 9e93eca7a..5d77b0074 100644
--- a/libpthread/nptl/sysdeps/mips/Makefile.arch
+++ b/libpthread/nptl/sysdeps/mips/Makefile.arch
@@ -39,8 +39,7 @@ libc-static-y += $(LIBC_ARCH_OBJ)
 
 libc-nomulti-y += $(LIBC_ARCH_OBJ)
 
-objclean-y += nptl_arch_clean
-headers-y += $(PTHREAD_ARCH_OUT)/tcb-offsets.h
+objclean-y += nptl_arch_objclean
 headers_clean-y += nptl_arch_headers_clean
 
 #
@@ -49,16 +48,18 @@ headers_clean-y += nptl_arch_headers_clean
 CFLAGS-tcb-offsets.c = -S
 
 $(PTHREAD_ARCH_OUT)/tcb-offsets.c: $(PTHREAD_ARCH_DIR)/tcb-offsets.sym
-	$(do_awk) $(top_srcdir)extra/scripts/gen-as-const.awk $< > $@
+	awk -f $(top_srcdir)extra/scripts/gen-as-const.awk $< > $@
 
 $(PTHREAD_ARCH_OUT)/tcb-offsets.s: $(PTHREAD_ARCH_OUT)/tcb-offsets.c
 	$(compile.c)
 
-$(PTHREAD_ARCH_OUT)/tcb-offsets.h: $(PTHREAD_ARCH_OUT)/tcb-offsets.s
-	$(do_sed) -n "s/^.*@@@name@@@\([^@]*\)@@@value@@@[^0-9Xxa-fA-F-]*\([0-9Xxa-fA-F-][0-9Xxa-fA-F-]*\).*@@@end@@@.*$\/#define \1 \2/p" $< > $@
+nptl_arch_headers: $(PTHREAD_ARCH_OUT)/tcb-offsets.s
+	$(do_sed) -n "s/^.*@@@name@@@\([^@]*\)@@@value@@@[^0-9Xxa-fA-F-]*\([0-9Xxa-fA-F-][0-9Xxa-fA-F-]*\).*@@@end@@@.*$\/#define \1 \2/p" $< > $(PTHREAD_ARCH_OUT)/tcb-offsets.h
 
 nptl_arch_headers_clean:
-	$(do_rm) $(addprefix $(PTHREAD_ARCH_OUT)/tcb-offsets., c s h)
+	$(RM) $(PTHREAD_ARCH_OUT)/tcb-offsets.c		\
+	      $(PTHREAD_ARCH_OUT)/tcb-offsets.s		\
+	      $(PTHREAD_ARCH_OUT)/tcb-offsets.h
 
-nptl_arch_clean:
-	$(do_rm) $(addprefix $(PTHREAD_ARCH_OUT)/*., o os oS)
+nptl_arch_objclean:
+	$(RM) $(PTHREAD_ARCH_OUT)/*.{o,os,oS}
diff --git a/libpthread/nptl/sysdeps/sh/Makefile.arch b/libpthread/nptl/sysdeps/sh/Makefile.arch
index 322b45534..83db10fbe 100644
--- a/libpthread/nptl/sysdeps/sh/Makefile.arch
+++ b/libpthread/nptl/sysdeps/sh/Makefile.arch
@@ -31,7 +31,6 @@ libpthread-so-y += $(PTHREAD_ARCH_OBJ:.o=.oS)
 libpthread-nomulti-y += $(PTHREAD_ARCH_OBJ)
 
 objclean-y += nptl_arch_clean
-headers-y += $(PTHREAD_ARCH_OUT)/tcb-offsets.h
 headers_clean-y += nptl_arch_headers_clean
 
 #
@@ -48,6 +47,8 @@ $(PTHREAD_ARCH_OUT)/tcb-offsets.s: $(PTHREAD_ARCH_OUT)/tcb-offsets.c
 $(PTHREAD_ARCH_OUT)/tcb-offsets.h: $(PTHREAD_ARCH_OUT)/tcb-offsets.s
 	$(do_sed) -n "s/^.*@@@name@@@\([^@]*\)@@@value@@@[^0-9Xxa-fA-F-]*\([0-9Xxa-fA-F-][0-9Xxa-fA-F-]*\).*@@@end@@@.*$\/#define \1 \2/p" $< > $@
 
+nptl_arch_headers: $(PTHREAD_ARCH_OUT)/tcb-offsets.h
+
 nptl_arch_headers_clean:
 	$(do_rm) $(addprefix $(PTHREAD_ARCH_OUT)/tcb-offsets., c s h)
 
diff --git a/libpthread/nptl/sysdeps/sparc/Makefile.arch b/libpthread/nptl/sysdeps/sparc/Makefile.arch
index 378e32287..b13eee9f6 100644
--- a/libpthread/nptl/sysdeps/sparc/Makefile.arch
+++ b/libpthread/nptl/sysdeps/sparc/Makefile.arch
@@ -13,8 +13,8 @@ CFLAGS-pthread_spin_lock.c += -D_GNU_SOURCE
 CFLAGS-sparc = $(SSP_ALL_CFLAGS)
 #CFLAGS:=$(CFLAGS:-O1=-O2)
 
-PTHREAD_ARCH_DIR := $(top_srcdir)libpthread/nptl/sysdeps/sparc
-PTHREAD_ARCH_OUT := $(top_builddir)libpthread/nptl/sysdeps/sparc
+PTHREAD_ARCH_DIR := $(top_srcdir)libpthread/nptl/sysdeps/sparc/
+PTHREAD_ARCH_OUT := $(top_builddir)libpthread/nptl/sysdeps/sparc/
 PTHREAD_ARCH_OBJ := $(patsubst %.S,$(PTHREAD_ARCH_OUT)/%.o,$(libpthread_SSRC))
 PTHREAD_ARCH_OBJ += $(patsubst %.c,$(PTHREAD_ARCH_OUT)/%.o,$(libpthread_CSRC))
 
@@ -28,7 +28,6 @@ libpthread-so-y += $(PTHREAD_ARCH_OBJ:.o=.oS)
 libpthread-nomulti-y += $(PTHREAD_ARCH_OBJ)
 
 objclean-y += nptl_arch_clean
-headers-y += $(PTHREAD_ARCH_OUT)/tcb-offsets.h
 headers_clean-y += nptl_arch_headers_clean
 
 #
@@ -45,6 +44,8 @@ $(PTHREAD_ARCH_OUT)/tcb-offsets.s: $(PTHREAD_ARCH_OUT)/tcb-offsets.c
 $(PTHREAD_ARCH_OUT)/tcb-offsets.h: $(PTHREAD_ARCH_OUT)/tcb-offsets.s
 	@sed -n "s/^.*@@@name@@@\([^@]*\)@@@value@@@[^0-9Xxa-fA-F-]*\([0-9Xxa-fA-F-][0-9Xxa-fA-F-]*\).*@@@end@@@.*$\/#define \1 \2/p" $< > $@
 
+nptl_arch_headers: $(PTHREAD_ARCH_OUT)/tcb-offsets.h
+
 nptl_arch_headers_clean:
 	$(do_rm) $(addprefix $(PTHREAD_ARCH_OUT)/tcb-offsets., c s h)
 
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.in b/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.in
index fce368f5a..186fefbea 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.in
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.in
@@ -140,10 +140,6 @@ librt-a-y += $(LIBRT_LINUX_OBJ)
 librt-so-y += $(LIBRT_LINUX_OBJ:.o=.oS)
 
 objclean-y += nptl_linux_clean
-headers-y += $(PTHREAD_LINUX_OUT)/lowlevelbarrier.h \
-                        $(PTHREAD_LINUX_OUT)/lowlevelcond.h \
-                        $(PTHREAD_LINUX_OUT)/lowlevelrwlock.h \
-                        $(PTHREAD_LINUX_OUT)/unwindbuf.h
 headers_clean-y += nptl_linux_headers_clean
 
 #
@@ -190,6 +186,11 @@ $(PTHREAD_LINUX_OUT)/lowlevelrwlock.h: $(PTHREAD_LINUX_OUT)/lowlevelrwlock.s
 $(PTHREAD_LINUX_OUT)/unwindbuf.h: $(PTHREAD_LINUX_OUT)/unwindbuf.s
 	$(do_sed) -n "s/^.*@@@name@@@\([^@]*\)@@@value@@@[^0-9Xxa-fA-F-]*\([0-9Xxa-fA-F-][0-9Xxa-fA-F-]*\).*@@@end@@@.*$\/#define \1 \2/p" $< > $@
 
+nptl_linux_headers: $(PTHREAD_LINUX_OUT)/lowlevelbarrier.h \
+					$(PTHREAD_LINUX_OUT)/lowlevelcond.h \
+					$(PTHREAD_LINUX_OUT)/lowlevelrwlock.h \
+					$(PTHREAD_LINUX_OUT)/unwindbuf.h
+
 HEADERS_BITS_PTHREAD     := $(notdir $(wildcard $(PTHREAD_LINUX_DIR)/bits/*.h))
 ALL_HEADERS_BITS_PTHREAD := $(addprefix include/bits/,$(HEADERS_BITS_PTHREAD))