diff options
| author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-11-29 03:51:02 +0000 |
|---|---|---|
| committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-11-29 03:51:02 +0000 |
| commit | 2d9da2f6be3e662889ef0e72759fe0f1a1495812 (patch) | |
| tree | 8305337a5a2dee0085b57e970426f15c8d96dac5 /libpthread/linuxthreads_db | |
| parent | 52d5212ff513bcc37a2c146ac99a76fd93189372 (diff) | |
| download | uClibc-alpine-2d9da2f6be3e662889ef0e72759fe0f1a1495812.tar.bz2 uClibc-alpine-2d9da2f6be3e662889ef0e72759fe0f1a1495812.tar.xz | |
Merge from trunk that gives us a valid NPTL dynamic loader and the start of the new build system. I have probably another 300 and some files to go *sigh*.
Diffstat (limited to 'libpthread/linuxthreads_db')
| -rw-r--r-- | libpthread/linuxthreads_db/CVS/Entries | 2 | ||||
| -rw-r--r-- | libpthread/linuxthreads_db/Makefile | 4 | ||||
| -rw-r--r-- | libpthread/linuxthreads_db/Makefile.in | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/libpthread/linuxthreads_db/CVS/Entries b/libpthread/linuxthreads_db/CVS/Entries index eed928270..99a94cb65 100644 --- a/libpthread/linuxthreads_db/CVS/Entries +++ b/libpthread/linuxthreads_db/CVS/Entries @@ -43,7 +43,7 @@ /td_thr_tls_get_addr.c/1.8/Tue Nov 15 14:20:48 2005// /td_thr_tlsbase.c/1.4/Tue Nov 15 14:20:48 2005// /td_thr_tsd.c/1.6/Tue Nov 15 14:20:48 2005// -/td_thr_validate.c/1.8/Tue Nov 15 14:20:48 2005// /thread_db.h/1.14/Tue Nov 15 14:20:48 2005// /thread_dbP.h/1.14/Tue Nov 15 14:20:48 2005// +/td_thr_validate.c/1.8/Tue Nov 22 18:25:09 2005// D diff --git a/libpthread/linuxthreads_db/Makefile b/libpthread/linuxthreads_db/Makefile index f92f205a5..f9100219a 100644 --- a/libpthread/linuxthreads_db/Makefile +++ b/libpthread/linuxthreads_db/Makefile @@ -5,9 +5,7 @@ # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # -TOPDIR=../../ - -top_srcdir=$(TOPDIR) +top_srcdir=../../ top_builddir=../../ include $(top_builddir)Rules.mak all: libs diff --git a/libpthread/linuxthreads_db/Makefile.in b/libpthread/linuxthreads_db/Makefile.in index ad2401c02..c80e32c53 100644 --- a/libpthread/linuxthreads_db/Makefile.in +++ b/libpthread/linuxthreads_db/Makefile.in @@ -7,7 +7,7 @@ # Get the thread include dependencies and shared object name CFLAGS-linuxthreads_db := -DLIBPTHREAD_SO="\"libpthread.so.$(MAJOR_VERSION)\"" -CFLAGS-linuxthreads_db += -I$(top_srcdir)libpthread -D_GNU_SOURCE +CFLAGS-linuxthreads_db += -D_GNU_SOURCE LDFLAGS-libthread_db.so := $(LDFLAGS_NOSTRIP) -s --warn-unresolved-symbols @@ -44,11 +44,13 @@ $(libthread_db_OUT)/libthread_db_so.a: $(libthread_db-so-y) 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) +$(top_builddir)lib/libthread_db.a: $(libthread_db-a-y) $(libthread_db_OUT)/libthread_db_so.a endif $(Q)$(INSTALL) -d $(dir $@) $(Q)$(RM) $@ +ifneq ($(DOPIC),y) $(do_strip) +endif $(do_ar) linuxthreads_db_headers: |