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/i386/Makefile.arch | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'libpthread/nptl/sysdeps/i386') 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) -- cgit v1.2.3