diff options
Diffstat (limited to 'libpthread/nptl_db')
| -rw-r--r-- | libpthread/nptl_db/Makefile | 69 | ||||
| -rw-r--r-- | libpthread/nptl_db/td_ta_new.c | 8 |
2 files changed, 13 insertions, 64 deletions
diff --git a/libpthread/nptl_db/Makefile b/libpthread/nptl_db/Makefile index 54b48be78..f92f205a5 100644 --- a/libpthread/nptl_db/Makefile +++ b/libpthread/nptl_db/Makefile @@ -1,66 +1,15 @@ -# Makefile for uClibc's native pthread debug library -# -# Copyright (C) 2005 Steven J. Hill <sjhill@realitydiluted.com> +# Makefile for uClibc # -# This program is free software; you can redistribute it and/or modify it under -# the terms of the GNU Library General Public License as published by the Free -# Software Foundation; either version 2 of the License, or (at your option) any -# later version. +# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org> # -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more -# details. +# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # -# You should have received a copy of the GNU Library General Public License -# along with this program; if not, write to the Free Software Foundation, Inc., -# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# Makefile for uClibc TOPDIR=../../ -include $(TOPDIR)Rules.mak - -LIB_NAME=libthread_db -AR_LIB_NAME=$(TOPDIR)lib/$(LIB_NAME).a -SO_LIB_NAME=$(TOPDIR)lib/$(LIB_NAME).so -SO_FULL_NAME=$(LIB_NAME)-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so - -ifeq ($(strip $(TARGET_ARCH)),mips) -CFLAGS := $(CFLAGS:-O1=-O2) -DNOT_IN_libc=1 -DIS_IN_libthread_db=1 $(PTINC) \ - -std=gnu99 -DLIBPTHREAD_SO="\"libpthread.so.$(MAJOR_VERSION)\"" -else -CFLAGS := $(CFLAGS:-O0=-O2) -DNOT_IN_libc=1 -DIS_IN_libthread_db=1 $(PTINC) \ - -std=gnu99 -DLIBPTHREAD_SO="\"libpthread.so.$(MAJOR_VERSION)\"" -endif - -# Remove any -z defs since this lib will have undefined symbols -LDFLAGS := $(subst -z defs,,$(LDFLAGS)) --warn-unresolved-symbols - -OBJS = $(patsubst %.c, %.o, $(filter-out db_info.c, $(wildcard *.c))) - -ifeq ($(strip $(HAVE_SHARED)),y) -all: $(SO_LIB_NAME) -else -all: $(AR_LIB_NAME) -endif - -$(AR_LIB_NAME): $(OBJS) - $(INSTALL) -d $(TOPDIR)lib - $(RM) $(AR_LIB_NAME) - $(AR) $(ARFLAGS) $(AR_LIB_NAME) $(OBJS) - -$(SO_LIB_NAME): $(AR_LIB_NAME) - $(RM) $(TOPDIR)lib/$(SO_FULL_NAME) $(SO_LIB_NAME).1 $(SO_LIB_NAME) - $(LD) $(LDFLAGS) -soname=$(LIB_NAME).so.1 \ - -o $(TOPDIR)lib/$(SO_FULL_NAME) --whole-archive $(AR_LIB_NAME) \ - --no-whole-archive $(TOPDIR)libc/misc/internals/interp.o \ - -L$(TOPDIR)lib -lc $(LDADD_LIBFLOAT) $(LIBGCC) - $(LN) -sf $(SO_FULL_NAME) $(SO_LIB_NAME).1 - $(LN) -sf $(SO_FULL_NAME) $(SO_LIB_NAME) - -$(OBJS): %.o : %.c - $(CC) $(CFLAGS) -c $< -o $@ - $(STRIPTOOL) -x -R .note -R .comment $*.o -clean: - $(RM) *.o *~ core +top_srcdir=$(TOPDIR) +top_builddir=../../ +include $(top_builddir)Rules.mak +all: libs +include Makefile.in +include $(top_srcdir)Makerules diff --git a/libpthread/nptl_db/td_ta_new.c b/libpthread/nptl_db/td_ta_new.c index 152c27b5e..bc8caee20 100644 --- a/libpthread/nptl_db/td_ta_new.c +++ b/libpthread/nptl_db/td_ta_new.c @@ -21,11 +21,11 @@ #include <stddef.h> #include <stdlib.h> #include <string.h> -#ifdef __UCLIBC__ -#include <../nptl/version.h> -#else +//#ifdef __UCLIBC__ +//#include <../nptl/version.h> +//#else #include <version.h> -#endif +//#endif #include "thread_dbP.h" |