diff options
author | Austin Foxley <austinf@cetoncorp.com> | 2009-09-22 00:20:48 -0700 |
---|---|---|
committer | Austin Foxley <austinf@cetoncorp.com> | 2009-09-22 00:20:48 -0700 |
commit | 906e1a9987ce8068bc5d539496dc570d9f5ba7b3 (patch) | |
tree | 95c61d7d45ccca5e724064af0963ba07285a02e2 /libpthread/nptl/sysdeps/unix/sysv/linux | |
parent | b6f255c6bfb016bbdb59614c11e4395d7845e723 (diff) | |
download | uClibc-alpine-906e1a9987ce8068bc5d539496dc570d9f5ba7b3.tar.bz2 uClibc-alpine-906e1a9987ce8068bc5d539496dc570d9f5ba7b3.tar.xz |
nptl/: fix .dep files not working for libpthread.a
the variable libpthread-a-y was holding %.o instead of %.os, so the .dep
make rules were rebuilding the whole lib every time
Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
Diffstat (limited to 'libpthread/nptl/sysdeps/unix/sysv/linux')
5 files changed, 20 insertions, 0 deletions
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.in b/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.in index 7e92e3535..5a6d8a253 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.in +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.in @@ -105,7 +105,11 @@ PTHREAD_LINUX_OUT := $(top_builddir)libpthread/nptl/sysdeps/unix/sysv/linux PTHREAD_LINUX_OBJ := $(patsubst %.c,$(PTHREAD_LINUX_OUT)/%.o,$(libpthread_CSRC)) PTHREAD_LINUX_OBJ += $(patsubst %.S,$(PTHREAD_LINUX_OUT)/%.o,$(libpthread_SSRC)) +ifeq ($(DOPIC),y) +libpthread-a-y += $(PTHREAD_LINUX_OBJ:.o=.os) +else libpthread-a-y += $(PTHREAD_LINUX_OBJ) +endif libpthread-so-y += $(PTHREAD_LINUX_OBJ:.o=.oS) libpthread-so-y += $(PTHREAD_LINUX_OUT)/pt-raise.oS libpthread-nomulti-y += $(PTHREAD_LINUX_OBJ) diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/arm/Makefile.arch b/libpthread/nptl/sysdeps/unix/sysv/linux/arm/Makefile.arch index 5c8d634cd..2256d6b2e 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/arm/Makefile.arch +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/arm/Makefile.arch @@ -33,7 +33,11 @@ LINUX_ARCH_OUT:=$(top_builddir)libpthread/nptl/sysdeps/unix/sysv/linux/arm LINUX_ARCH_OBJ:=$(patsubst %.S,$(LINUX_ARCH_OUT)/%.o,$(libpthread_SSRC)) LINUX_ARCH_OBJ+=$(patsubst %.c,$(LINUX_ARCH_OUT)/%.o,$(libpthread_CSRC)) +ifeq ($(DOPIC),y) +libpthread-a-y += $(LINUX_ARCH_OBJ:.o=.os) +else libpthread-a-y += $(LINUX_ARCH_OBJ) +endif libpthread-so-y += $(LINUX_ARCH_OBJ:.o=.oS) libpthread-nomulti-y+=$(LINUX_ARCH_OBJ) diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/mips/Makefile.arch b/libpthread/nptl/sysdeps/unix/sysv/linux/mips/Makefile.arch index 59759f0dd..a7de215e2 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/mips/Makefile.arch +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/mips/Makefile.arch @@ -27,7 +27,11 @@ LINUX_ARCH_OUT:=$(top_builddir)libpthread/nptl/sysdeps/unix/sysv/linux/mips LINUX_ARCH_OBJ:=$(patsubst %.S,$(LINUX_ARCH_OUT)/%.o,$(libpthread_SSRC)) LINUX_ARCH_OBJ+=$(patsubst %.c,$(LINUX_ARCH_OUT)/%.o,$(libpthread_CSRC)) +ifeq ($(DOPIC),y) +libpthread-a-y += $(LINUX_ARCH_OBJ:.o=.os) +else libpthread-a-y += $(LINUX_ARCH_OBJ) +endif libpthread-so-y += $(LINUX_ARCH_OBJ:.o=.oS) libpthread-nomulti-y+=$(LINUX_ARCH_OBJS) diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/Makefile.arch b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/Makefile.arch index 2fbf2b171..9bd7569c9 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/Makefile.arch +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/Makefile.arch @@ -61,7 +61,11 @@ LINUX_ARCH_OUT:=$(top_builddir)libpthread/nptl/sysdeps/unix/sysv/linux/sh LINUX_ARCH_OBJ:=$(patsubst %.S,$(LINUX_ARCH_OUT)/%.o,$(libpthread_SSRC)) +ifeq ($(DOPIC),y) +libpthread-a-y += $(LINUX_ARCH_OBJ:.o=.os) +else libpthread-a-y += $(LINUX_ARCH_OBJ) +endif libpthread-so-y += $(LINUX_ARCH_OBJ:.o=.oS) libpthread-nomulti-y+=$(LINUX_ARCH_OBJS) diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/sparc/Makefile.arch b/libpthread/nptl/sysdeps/unix/sysv/linux/sparc/Makefile.arch index 5f799499b..a8430278d 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/sparc/Makefile.arch +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sparc/Makefile.arch @@ -42,7 +42,11 @@ LINUX_ARCH_OUT:=$(top_builddir)libpthread/nptl/sysdeps/unix/sysv/linux/sparc LINUX_ARCH_OBJ:=$(patsubst %.c,$(LINUX_ARCH_OUT)/%.o,$(libpthread_CSRC)) LINUX_ARCH_OBJ+=$(patsubst %.c,$(LINUX_ARCH_OUT)/%.o,$(libpthread_CSRC)) +ifeq ($(DOPIC),y) +libpthread-a-y += $(LINUX_ARCH_OBJ:.o=.os) +else libpthread-a-y += $(LINUX_ARCH_OBJ) +endif libpthread-so-y += $(LINUX_ARCH_OBJ:.o=.oS) libpthread-nomulti-y+=$(LINUX_ARCH_OBJS) |