Browse Source

Add multi support to linuxthread_db

Peter S. Mazinger 19 years ago
parent
commit
dd32d7ba03
2 changed files with 22 additions and 6 deletions
  1. 11 3
      libpthread/linuxthreads.old_db/Makefile.in
  2. 11 3
      libpthread/linuxthreads_db/Makefile.in

+ 11 - 3
libpthread/linuxthreads.old_db/Makefile.in

@@ -1,6 +1,6 @@
 # Makefile for uClibc
 #
-# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org>
 #
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
@@ -28,26 +28,34 @@ else
 libthread_db-a-y  := $(libthread_db_OBJ)
 endif
 
-libthread_db-multi-y := $(libthread_db_SRC)
-
 lib-a-$(PTHREADS_DEBUG_SUPPORT) += $(top_builddir)lib/libthread_db.a
 lib-so-$(PTHREADS_DEBUG_SUPPORT) += $(top_builddir)lib/libthread_db.so
 objclean-y += libthread_db_clean
 headers-$(PTHREADS_DEBUG_SUPPORT) += linuxthreads_db_headers
 headers_clean-y += linuxthreads_db_headers_clean
 
+ifeq ($(DOMULTI),n)
 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)
+else
+$(top_builddir)lib/libthread_db.so: $(libthread_db_OUT)/libthread_db.oS $(libc)
+	$(call linkm.so,$(libthread_db_FULL_NAME),1)
+endif
 
 $(libthread_db_OUT)/libthread_db_so.a: $(libthread_db-so-y)
 	$(Q)$(RM) $@
 	$(do_strip)
 	$(do_ar)
 
+$(libthread_db_OUT)/libthread_db.oS: $(libthread_db_SRC)
+	$(Q)$(RM) $@
+	$(compile-m)
+	$(do_t_strip)
+
 $(top_builddir)lib/libthread_db.a: $(libthread_db-a-y)
 	$(Q)$(INSTALL) -d $(dir $@)
 	$(Q)$(RM) $@

+ 11 - 3
libpthread/linuxthreads_db/Makefile.in

@@ -1,6 +1,6 @@
 # Makefile for uClibc
 #
-# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org>
 #
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
@@ -29,26 +29,34 @@ else
 libthread_db-a-y  := $(libthread_db_OBJ)
 endif
 
-libthread_db-multi-y := $(libthread_db_SRC)
-
 lib-a-$(PTHREADS_DEBUG_SUPPORT) += $(top_builddir)lib/libthread_db.a
 lib-so-$(PTHREADS_DEBUG_SUPPORT) += $(top_builddir)lib/libthread_db.so
 objclean-y += libthread_db_clean
 headers-$(PTHREADS_DEBUG_SUPPORT) += linuxthreads_db_headers
 headers_clean-y += linuxthreads_db_headers_clean
 
+ifeq ($(DOMULTI),n)
 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)
+else
+$(top_builddir)lib/libthread_db.so: $(libthread_db_OUT)/libthread_db.oS $(libc)
+	$(call linkm.so,$(libthread_db_FULL_NAME),1)
+endif
 
 $(libthread_db_OUT)/libthread_db_so.a: $(libthread_db-so-y)
 	$(Q)$(RM) $@
 	$(do_strip)
 	$(do_ar)
 
+$(libthread_db_OUT)/libthread_db.oS: $(libthread_db_SRC)
+	$(Q)$(RM) $@
+	$(compile-m)
+	$(do_t_strip)
+
 $(top_builddir)lib/libthread_db.a: $(libthread_db-a-y)
 	$(Q)$(INSTALL) -d $(dir $@)
 	$(Q)$(RM) $@