From 2726a5988973b0d73d01af9cfb58374de45ebb75 Mon Sep 17 00:00:00 2001 From: Austin Foxley Date: Fri, 11 Dec 2009 10:05:57 -0800 Subject: Revert "nptl: make build depend directly on nptl headers" This reverts commit 641e7e36ad0a9b2899b04f256c5b243ada7da279. Signed-off-by: Austin Foxley --- libpthread/nptl/sysdeps/mips/Makefile.arch | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'libpthread/nptl/sysdeps/mips') 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} -- cgit v1.2.3