diff options
| -rw-r--r-- | Makefile.in | 3 | ||||
| -rw-r--r-- | libpthread/nptl/Makefile.in | 6 | ||||
| -rw-r--r-- | libpthread/nptl/sysdeps/arm/Makefile.arch | 4 | ||||
| -rw-r--r-- | libpthread/nptl/sysdeps/i386/Makefile.arch | 2 | ||||
| -rw-r--r-- | libpthread/nptl/sysdeps/mips/Makefile.arch | 4 | ||||
| -rw-r--r-- | libpthread/nptl/sysdeps/sh/Makefile.arch | 2 | ||||
| -rw-r--r-- | libpthread/nptl/sysdeps/sparc/Makefile.arch | 2 | ||||
| -rw-r--r-- | libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.in | 2 | ||||
| -rw-r--r-- | libpthread/nptl/sysdeps/x86_64/Makefile.arch | 2 |
9 files changed, 16 insertions, 11 deletions
diff --git a/Makefile.in b/Makefile.in index c89d6fedd..b62ee6ed6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -160,7 +160,8 @@ headers-y += $(target-headers-sysdep) headers: $(top_builddir)include/bits/uClibc_config.h subdirs: $(addprefix $(top_builddir),$(subdirs)) -pregen: $(top_builddir)include/bits/sysnum.h headers subdirs $(pthread_pregen) +pregen-headers-y := $(top_builddir)include/bits/sysnum.h +pregen: $(pregen-headers-y) headers subdirs $(Q)$(if $(UCLIBC_HAS_LOCALE),$(MAKE) -C extra/locale locale_headers) $(top_builddir)include/bits/sysnum.h: $(top_srcdir)extra/scripts/gen_bits_syscall_h.sh diff --git a/libpthread/nptl/Makefile.in b/libpthread/nptl/Makefile.in index a1c7ac130..253d36f08 100644 --- a/libpthread/nptl/Makefile.in +++ b/libpthread/nptl/Makefile.in @@ -270,7 +270,7 @@ headers_clean-y += nptl_headers_clean -include $(PTHREAD_DIR)/sysdeps/unix/sysv/linux/Makefile.in -include $(PTHREAD_DIR)/sysdeps/unix/sysv/linux/$(TARGET_ARCH)/Makefile.arch -pthread_pregen := nptl_headers nptl_arch_headers nptl_linux_headers +pregen-headers-$(UCLIBC_HAS_THREADS_NATIVE) += $(nptl_headers) $(nptl_arch_headers) $(nptl_linux_headers) lib-a-$(UCLIBC_HAS_THREADS) += $(top_builddir)lib/libpthread.a lib-so-$(UCLIBC_HAS_THREADS) += $(top_builddir)lib/libpthread.so @@ -326,14 +326,14 @@ $(top_builddir)include/bits/libc-lock.h: | include/bits $(top_builddir)include/bits/stdio-lock.h: | include/bits $(do_ln) ../../$(PTDIR)/sysdeps/pthread/bits/$(@F) $(top_builddir)$@ -nptl_headers_bootstrap:= $(top_builddir)include/pthread.h \ +nptl_headers_bootstrap := $(top_builddir)include/pthread.h \ $(top_builddir)include/semaphore.h \ $(top_builddir)include/bits/semaphore.h \ $(top_builddir)include/bits/pthreadtypes.h \ $(top_builddir)include/bits/libc-lock.h \ $(top_builddir)include/bits/stdio-lock.h -nptl_headers: $(PTHREAD_OUT)/pthread-errnos.h +nptl_headers := $(PTHREAD_OUT)/pthread-errnos.h nptl_headers_clean: $(do_rm) $(nptl_headers_bootstrap) \ diff --git a/libpthread/nptl/sysdeps/arm/Makefile.arch b/libpthread/nptl/sysdeps/arm/Makefile.arch index 6d16ae3fd..1f12f3093 100644 --- a/libpthread/nptl/sysdeps/arm/Makefile.arch +++ b/libpthread/nptl/sysdeps/arm/Makefile.arch @@ -57,9 +57,11 @@ $(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) -nptl_arch_headers: $(PTHREAD_ARCH_OUT)/tcb-offsets.s +$(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" $< > $(PTHREAD_ARCH_OUT)/tcb-offsets.h +nptl_arch_headers := $(PTHREAD_ARCH_OUT)/tcb-offsets.h + nptl_arch_headers_clean: $(RM) $(PTHREAD_ARCH_OUT)/tcb-offsets.c \ $(PTHREAD_ARCH_OUT)/tcb-offsets.s \ diff --git a/libpthread/nptl/sysdeps/i386/Makefile.arch b/libpthread/nptl/sysdeps/i386/Makefile.arch index 2b9a2dc7c..224e88c37 100644 --- a/libpthread/nptl/sysdeps/i386/Makefile.arch +++ b/libpthread/nptl/sysdeps/i386/Makefile.arch @@ -44,7 +44,7 @@ $(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 := $(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 5d77b0074..07234aae1 100644 --- a/libpthread/nptl/sysdeps/mips/Makefile.arch +++ b/libpthread/nptl/sysdeps/mips/Makefile.arch @@ -53,9 +53,11 @@ $(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) -nptl_arch_headers: $(PTHREAD_ARCH_OUT)/tcb-offsets.s +$(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" $< > $(PTHREAD_ARCH_OUT)/tcb-offsets.h +nptl_arch_headers := $(PTHREAD_ARCH_OUT)/tcb-offsets.h + nptl_arch_headers_clean: $(RM) $(PTHREAD_ARCH_OUT)/tcb-offsets.c \ $(PTHREAD_ARCH_OUT)/tcb-offsets.s \ diff --git a/libpthread/nptl/sysdeps/sh/Makefile.arch b/libpthread/nptl/sysdeps/sh/Makefile.arch index 83db10fbe..2a3e59c7f 100644 --- a/libpthread/nptl/sysdeps/sh/Makefile.arch +++ b/libpthread/nptl/sysdeps/sh/Makefile.arch @@ -47,7 +47,7 @@ $(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 := $(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 b13eee9f6..27c98a658 100644 --- a/libpthread/nptl/sysdeps/sparc/Makefile.arch +++ b/libpthread/nptl/sysdeps/sparc/Makefile.arch @@ -44,7 +44,7 @@ $(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 := $(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 3713007b2..66613e51d 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.in +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.in @@ -220,7 +220,7 @@ $(PTHREAD_LINUX_OUT)/structsem.h: $(PTHREAD_LINUX_OUT)/gen_lstructsem.s $(PTHREAD_LINUX_OUT)/pthread-pi-defines.h: $(PTHREAD_LINUX_OUT)/gen_lpthread-pi-defines.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 \ +nptl_linux_headers := $(PTHREAD_LINUX_OUT)/lowlevelbarrier.h \ $(PTHREAD_LINUX_OUT)/lowlevelcond.h \ $(PTHREAD_LINUX_OUT)/lowlevelrwlock.h \ $(PTHREAD_LINUX_OUT)/lowlevelrobustlock.h \ diff --git a/libpthread/nptl/sysdeps/x86_64/Makefile.arch b/libpthread/nptl/sysdeps/x86_64/Makefile.arch index c1d683fac..0ccf100c6 100644 --- a/libpthread/nptl/sysdeps/x86_64/Makefile.arch +++ b/libpthread/nptl/sysdeps/x86_64/Makefile.arch @@ -44,7 +44,7 @@ $(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 := $(PTHREAD_ARCH_OUT)/tcb-offsets.h nptl_arch_headers_clean: $(do_rm) $(addprefix $(PTHREAD_ARCH_OUT)/tcb-offsets., c s h) |