diff options
Diffstat (limited to 'libpthread')
| -rw-r--r-- | libpthread/linuxthreads.old/Makefile.in | 20 | ||||
| -rw-r--r-- | libpthread/linuxthreads.old_db/Makefile.in | 18 |
2 files changed, 23 insertions, 15 deletions
diff --git a/libpthread/linuxthreads.old/Makefile.in b/libpthread/linuxthreads.old/Makefile.in index 7c0bdae88..cb8a52609 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)) +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-so-dep) +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,12 @@ 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) $(libpthread_OUT)/libpthread_so.a -endif +$(top_builddir)lib/libpthread.a: $(libpthread-a-y) $(Q)$(INSTALL) -d $(dir $@) $(Q)$(RM) $@ -ifneq ($(DOPIC),y) +ifeq ($(PTHREADS_DEBUG_SUPPORT),y) + $(do_strip:-x=-X --strip-debug) +else $(do_strip) endif $(do_ar) diff --git a/libpthread/linuxthreads.old_db/Makefile.in b/libpthread/linuxthreads.old_db/Makefile.in index f4985a483..bad600d89 100644 --- a/libpthread/linuxthreads.old_db/Makefile.in +++ b/libpthread/linuxthreads.old_db/Makefile.in @@ -21,7 +21,11 @@ libthread_db_SRC := $(wildcard $(libthread_db_DIR)/*.c) libthread_db_OBJ := $(patsubst $(libthread_db_DIR)/%.c,$(libthread_db_OUT)/%.o,$(libthread_db_SRC)) +ifeq ($(DOPIC),y) +libthread_db-a-y := $(libthread_db_OBJ:.o=.os) +else libthread_db-a-y := $(libthread_db_OBJ) +endif libthread_db-so-y := $(libthread_db_OBJ:.o=.os) libthread_db-multi-y := $(libthread_db_SRC) @@ -32,7 +36,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) @@ -40,16 +48,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: |