The same mangle generation variable is defined twice to the same value in both libpthread/nptl/sysdeps/Makefile.commonarch and libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.commonarch, define this to a common location in Rules.mak under the name PTHREAD_GENERATE_MANGLE since we are going to introduce a third user of it.
Signed-off-by: Florian Fainelli <[email protected]> --- Rules.mak | 2 ++ libpthread/nptl/sysdeps/Makefile.commonarch | 3 +-- libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.commonarch | 2 -- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Rules.mak b/Rules.mak index 96871e1..8943fbf 100644 --- a/Rules.mak +++ b/Rules.mak @@ -813,3 +813,5 @@ SHARED_END_FILES:=$(LIBGCC_DIR)crtendS.o $(top_builddir)lib/crtn.o endif LOCAL_INSTALL_PATH := install_dir + +PTHREAD_GENERATE_MANGLE ?= -n "s/^.*@@@name@@@\([^@]*\)@@@value@@@[^0-9Xxa-fA-F-]*\([0-9Xxa-fA-F-][0-9Xxa-fA-F-]*\).*@@@end@@@.*\$$/\#define \1 \2/p" diff --git a/libpthread/nptl/sysdeps/Makefile.commonarch b/libpthread/nptl/sysdeps/Makefile.commonarch index 0c19216..8f5d61d 100644 --- a/libpthread/nptl/sysdeps/Makefile.commonarch +++ b/libpthread/nptl/sysdeps/Makefile.commonarch @@ -47,9 +47,8 @@ $(libpthread_arch_OUT)/gen_tcb-offsets.c: $(libpthread_arch_DIR)/tcb-offsets.sym $(libpthread_arch_OUT)/gen_tcb-offsets.s: $(libpthread_arch_OUT)/gen_tcb-offsets.c | headers $(compile.c) libpthread-generated-y += $(libpthread_arch_OUT)/gen_tcb-offsets.s -PTHREAD_TCB_OFFSET_MANGLE ?= -n "s/^.*@@@name@@@\([^@]*\)@@@value@@@[^0-9Xxa-fA-F-]*\([0-9Xxa-fA-F-][0-9Xxa-fA-F-]*\).*@@@end@@@.*\$$/\#define \1 \2/p" $(libpthread_arch_OUT)/tcb-offsets.h: $(libpthread_arch_OUT)/gen_tcb-offsets.s - $(do_sed) $(PTHREAD_TCB_OFFSET_MANGLE) $< > $@ + $(do_sed) $(PTHREAD_GENERATE_MANGLE) $< > $@ @if test ! -s $@ ; then rm -f $@ ; false ; fi pregen-headers-$(UCLIBC_HAS_THREADS_NATIVE) += $(libpthread_arch_OUT)/tcb-offsets.h diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.commonarch b/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.commonarch index 477fb1a..3372214 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.commonarch +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.commonarch @@ -177,8 +177,6 @@ CFLAGS-gen_pthread-pi-defines.c = -S CFLAGS-gen_structsem.c = -S CFLAGS-gen_unwindbuf.c = -S -PTHREAD_GENERATE_MANGLE ?= -n "s/^.*@@@name@@@\([^@]*\)@@@value@@@[^0-9Xxa-fA-F-]*\([0-9Xxa-fA-F-][0-9Xxa-fA-F-]*\).*@@@end@@@.*\$$/\#define \1 \2/p" - PTHREAD_LINUX_SYM := $(notdir $(wildcard $(libpthread_linux_DIR)/*.sym)) PTHREAD_LINUX_SYM_C := $(addprefix $(libpthread_linux_OUT)/gen_,$(PTHREAD_LINUX_SYM:.sym=.c)) PTHREAD_LINUX_SYM_S := $(PTHREAD_LINUX_SYM_C:.c=.s) -- 1.7.10.4 _______________________________________________ uClibc mailing list [email protected] http://lists.busybox.net/mailman/listinfo/uclibc
