summaryrefslogtreecommitdiffstats
path: root/libpthread
diff options
context:
space:
mode:
Diffstat (limited to 'libpthread')
-rw-r--r--libpthread/linuxthreads.old/Makefile.in23
-rw-r--r--libpthread/linuxthreads.old_db/Makefile.in6
-rw-r--r--libpthread/linuxthreads_db/Makefile.in20
3 files changed, 29 insertions, 20 deletions
diff --git a/libpthread/linuxthreads.old/Makefile.in b/libpthread/linuxthreads.old/Makefile.in
index 98ef6307b..79e47515c 100644
--- a/libpthread/linuxthreads.old/Makefile.in
+++ b/libpthread/linuxthreads.old/Makefile.in
@@ -50,7 +50,11 @@ endif
libpthread_OBJ := $(patsubst $(libpthread_DIR)/%.c,$(libpthread_OUT)/%.o,$(libpthread_SRC))
-libpthread-a-y += $(libpthread_OBJ)
+ifeq ($(DOPIC),y)
+libpthread-a-y += $(libpthread_OBJ:.o=.os)
+else
+libpthread-a-y += $(libpthread_OBJ)
+endif
libpthread-so-y += $(libpthread_OBJ:.o=.os)
libpthread-multi-y += $(libpthread_SRC)
@@ -62,7 +66,11 @@ objclean-y += libpthread_clean
headers-$(UCLIBC_HAS_THREADS) += linuxthreads_headers
headers_clean-y += linuxthreads_headers_clean
-$(top_builddir)lib/libpthread.so: $(libpthread_OUT)/libpthread_so.a libc-y
+ifeq ($(DOPIC),y)
+$(top_builddir)lib/libpthread.so: $(top_builddir)lib/libpthread.a $(libc)
+else
+$(top_builddir)lib/libpthread.so: $(libpthread_OUT)/libpthread_so.a $(libc)
+endif
$(call link.so,$(libpthread_FULL_NAME),$(MAJOR_VERSION))
$(libpthread_OUT)/libpthread_so.a: $(libpthread-so-y)
@@ -74,14 +82,14 @@ else
endif
$(do_ar)
-ifeq ($(DOPIC),y)
-$(top_builddir)lib/libpthread.a: $(libpthread-a-y:.o=.os)
-else
$(top_builddir)lib/libpthread.a: $(libpthread-a-y)
-endif
$(Q)$(INSTALL) -d $(dir $@)
$(Q)$(RM) $@
+ifeq ($(PTHREADS_DEBUG_SUPPORT),y)
+ $(do_strip:-x=-X --strip-debug)
+else
$(do_strip)
+endif
$(do_ar)
linuxthreads_headers:
@@ -90,9 +98,8 @@ linuxthreads_headers:
$(INSTALL) -d $(top_builddir)include/bits
$(LN) -sf ../../$(PTDIR)/sysdeps/pthread/bits/pthreadtypes.h $(top_builddir)include/bits/
-
linuxthreads_headers_clean:
- $(RM) $(top_builddir)include/pthread.h $(top_builddir)include/semaphore.h \
+ $(RM) $(top_builddir)include/pthread.h $(top_builddir)include/semaphore.h \
$(top_builddir)include/bits/pthreadtypes.h
libpthread_clean:
diff --git a/libpthread/linuxthreads.old_db/Makefile.in b/libpthread/linuxthreads.old_db/Makefile.in
index bad600d89..c203232e7 100644
--- a/libpthread/linuxthreads.old_db/Makefile.in
+++ b/libpthread/linuxthreads.old_db/Makefile.in
@@ -21,12 +21,12 @@ libthread_db_SRC := $(wildcard $(libthread_db_DIR)/*.c)
libthread_db_OBJ := $(patsubst $(libthread_db_DIR)/%.c,$(libthread_db_OUT)/%.o,$(libthread_db_SRC))
+libthread_db-so-y := $(libthread_db_OBJ:.o=.os)
ifeq ($(DOPIC),y)
-libthread_db-a-y := $(libthread_db_OBJ:.o=.os)
+libthread_db-a-y := $(libthread_db-so-y)
else
-libthread_db-a-y := $(libthread_db_OBJ)
+libthread_db-a-y := $(libthread_db_OBJ)
endif
-libthread_db-so-y := $(libthread_db_OBJ:.o=.os)
libthread_db-multi-y := $(libthread_db_SRC)
diff --git a/libpthread/linuxthreads_db/Makefile.in b/libpthread/linuxthreads_db/Makefile.in
index c80e32c53..7833e1bad 100644
--- a/libpthread/linuxthreads_db/Makefile.in
+++ b/libpthread/linuxthreads_db/Makefile.in
@@ -22,8 +22,12 @@ libthread_db_SRC := $(wildcard $(libthread_db_DIR)/*.c)
libthread_db_OBJ := $(patsubst $(libthread_db_DIR)/%.c,$(libthread_db_OUT)/%.o,$(libthread_db_SRC))
-libthread_db-a-y := $(libthread_db_OBJ)
libthread_db-so-y := $(libthread_db_OBJ:.o=.os)
+ifeq ($(DOPIC),y)
+libthread_db-a-y := $(libthread_db-so-y)
+else
+libthread_db-a-y := $(libthread_db_OBJ)
+endif
libthread_db-multi-y := $(libthread_db_SRC)
@@ -33,7 +37,11 @@ objclean-y += libthread_db_clean
headers-$(PTHREADS_DEBUG_SUPPORT) += linuxthreads_db_headers
headers_clean-y += linuxthreads_db_headers_clean
-$(top_builddir)lib/libthread_db.so: $(libthread_db_OUT)/libthread_db_so.a libc-y
+ifeq ($(DOPIC),y)
+$(top_builddir)lib/libthread_db.so: $(top_builddir)lib/libthread_db.a $(libc)
+else
+$(top_builddir)lib/libthread_db.so: $(libthread_db_OUT)/libthread_db_so.a $(libc)
+endif
$(call link.so,$(libthread_db_FULL_NAME),1)
$(libthread_db_OUT)/libthread_db_so.a: $(libthread_db-so-y)
@@ -41,16 +49,10 @@ $(libthread_db_OUT)/libthread_db_so.a: $(libthread_db-so-y)
$(do_strip)
$(do_ar)
-ifeq ($(DOPIC),y)
-$(top_builddir)lib/libthread_db.a: $(libthread_db-a-y:.o=.os)
-else
-$(top_builddir)lib/libthread_db.a: $(libthread_db-a-y) $(libthread_db_OUT)/libthread_db_so.a
-endif
+$(top_builddir)lib/libthread_db.a: $(libthread_db-a-y)
$(Q)$(INSTALL) -d $(dir $@)
$(Q)$(RM) $@
-ifneq ($(DOPIC),y)
$(do_strip)
-endif
$(do_ar)
linuxthreads_db_headers: