diff options
| -rw-r--r-- | Rules.mak | 2 | ||||
| -rw-r--r-- | libpthread/nptl/Makefile.in | 2 | ||||
| -rw-r--r-- | libpthread/nptl/sysdeps/i386/Makefile.arch | 4 | ||||
| -rw-r--r-- | libpthread/nptl/sysdeps/sparc/Makefile.arch | 4 | ||||
| -rw-r--r-- | librt/Makefile.in | 4 |
5 files changed, 9 insertions, 7 deletions
@@ -127,6 +127,8 @@ UCLIBC_LDSO := $(UCLIBC_LDSO_NAME).so.$(MAJOR_VERSION) NONSHARED_LIBNAME := uclibc_nonshared.a libc := $(top_builddir)lib/$(SHARED_MAJORNAME) libc.depend := $(top_builddir)lib/$(SHARED_MAJORNAME:.$(MAJOR_VERSION)=) +libdl.depend := $(top_builddir)lib/libdl.so +libpthread.depend := $(top_builddir)lib/libpthread.so interp := $(top_builddir)lib/interp.os ldso := $(top_builddir)lib/$(UCLIBC_LDSO) headers_dep := $(top_builddir)include/bits/sysnum.h diff --git a/libpthread/nptl/Makefile.in b/libpthread/nptl/Makefile.in index 253d36f08..f530361e7 100644 --- a/libpthread/nptl/Makefile.in +++ b/libpthread/nptl/Makefile.in @@ -275,7 +275,7 @@ pregen-headers-$(UCLIBC_HAS_THREADS_NATIVE) += $(nptl_headers) $(nptl_arch_heade lib-a-$(UCLIBC_HAS_THREADS) += $(top_builddir)lib/libpthread.a lib-so-$(UCLIBC_HAS_THREADS) += $(top_builddir)lib/libpthread.so -$(top_builddir)lib/libpthread.so: $(PTHREAD_OUT)/libpthread_so.a $(libc) $(top_builddir)lib/libpthread_nonshared.a +$(top_builddir)lib/libpthread.so: $(PTHREAD_OUT)/libpthread_so.a $(libc.depend) $(libdl.depend) $(top_builddir)lib/libpthread_nonshared.a $(call link.so,$(libpthread_FULL_NAME),$(MAJOR_VERSION)) $(Q)$(RM) $@ $(Q)cp $(top_srcdir)extra/scripts/format.lds $@ diff --git a/libpthread/nptl/sysdeps/i386/Makefile.arch b/libpthread/nptl/sysdeps/i386/Makefile.arch index 224e88c37..1b5b988a9 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)) diff --git a/libpthread/nptl/sysdeps/sparc/Makefile.arch b/libpthread/nptl/sysdeps/sparc/Makefile.arch index 27c98a658..ac6342caf 100644 --- a/libpthread/nptl/sysdeps/sparc/Makefile.arch +++ b/libpthread/nptl/sysdeps/sparc/Makefile.arch @@ -13,8 +13,8 @@ CFLAGS-pthread_spin_lock.c += -D_GNU_SOURCE CFLAGS-sparc = $(SSP_ALL_CFLAGS) #CFLAGS:=$(CFLAGS:-O1=-O2) -PTHREAD_ARCH_DIR := $(top_srcdir)libpthread/nptl/sysdeps/sparc/ -PTHREAD_ARCH_OUT := $(top_builddir)libpthread/nptl/sysdeps/sparc/ +PTHREAD_ARCH_DIR := $(top_srcdir)libpthread/nptl/sysdeps/sparc +PTHREAD_ARCH_OUT := $(top_builddir)libpthread/nptl/sysdeps/sparc PTHREAD_ARCH_OBJ := $(patsubst %.S,$(PTHREAD_ARCH_OUT)/%.o,$(libpthread_SSRC)) PTHREAD_ARCH_OBJ += $(patsubst %.c,$(PTHREAD_ARCH_OUT)/%.o,$(libpthread_CSRC)) diff --git a/librt/Makefile.in b/librt/Makefile.in index ea1d03eb8..88f4cbce4 100644 --- a/librt/Makefile.in +++ b/librt/Makefile.in @@ -53,9 +53,9 @@ endif ifeq ($(DOPIC)$(UCLIBC_HAS_THREADS_NATIVE),yn) -$(top_builddir)lib/librt.so: $(top_builddir)lib/librt.a $(libc.dpend) +$(top_builddir)lib/librt.so: $(top_builddir)lib/librt.a $(libc.depend) else -$(top_builddir)lib/librt.so: $(librt_OUT)/librt_so.a $(libc.depend) +$(top_builddir)lib/librt.so: $(librt_OUT)/librt_so.a $(libc.depend) $(libpthread.depend) $(libdl.depend) endif $(call link.so,$(librt_FULL_NAME),$(MAJOR_VERSION)) |