update

[l4.git] / l4 / pkg / uclibc / lib / libpthread / src / Makefile

diff --git a/l4/pkg/uclibc/lib/libpthread/src/Makefile b/l4/pkg/uclibc/lib/libpthread/src/Makefile
index 698362c361413dba2baa55b3c3cb667fc892c604..a4847258578d8e82ef0126ad3320a896209c5c3a 100644 (file)
--- a/l4/pkg/uclibc/lib/libpthread/src/Makefile
+++ b/l4/pkg/uclibc/lib/libpthread/src/Makefile
@@ -1,34 +1,50 @@
 PKGDIR     ?= ../../..
 L4DIR      ?= $(PKGDIR)/../..
 
-TARGET      = r/libpthread.a r/libpthread.so
+TARGET      = libpthread.a libpthread.so
 
 PC_FILENAME = libpthread
 PC_LIBS_libpthread := -lpthread
 
+CONTRIBDIR = $(PKGDIR)/../uclibc/lib/contrib/uclibc
+LDSODIR    = $(CONTRIBDIR)/ldso/ldso
+
 SRC_CC      = manager.cc l4.cc
 SRC_C      += spinlock.c mutex.c condvar.c rwlock.c errno.c specific.c \
               semaphore.c attr.c barrier.c join.c pthread.c \
-              errno-loc.c cancel.c ptcleanup.c libc_pthread_init.c
+              cancel.c ptcleanup.c errno-loc.c
+SRC_C_libpthread.a += libc_pthread_init.c
 SRC_S       = tramp-$(ARCH).S
 SO_INIT     = so_init-$(ARCH)
 
+vpath %.c $(SRC_DIR)/sysdeps/generic
+#vpath dl-tls.c $(PKGDIR)/lib/contrib/uclibc/ldso/ldso
+
+DIR_amd64 := x86_64
+DIR_x86   := i386
+DIR_arm   := arm
+DIR_ppc32 := powerpc
+DIR_sparc := sparc
+
 
 INCDIR-x86   = $(SRC_DIR)/sysdeps/i386/i686 $(SRC_DIR)/sysdeps/i386 \
-               $(PKGDIR)/lib/contrib/uclibc/libc
-INCDIR-amd64 = $(SRC_DIR)/sysdeps/x86_64
+               $(CONTRIBDIR)/libc \
+               $(LDSODIR)/$(DIR_$(ARCH))
+INCDIR-amd64 = $(SRC_DIR)/sysdeps/$(DIR_$(ARCH))
 INCDIR-arm   = $(SRC_DIR)/sysdeps/arm
 INCDIR-ppc32 = $(SRC_DIR)/sysdeps/powerpc
 INCDIR-sparc = $(SRC_DIR)/sysdeps/sparc
 
-PRIVATE_INCDIR = $(SRC_DIR) $(INCDIR-$(ARCH))
+PRIVATE_INCDIR = $(SRC_DIR) $(INCDIR-$(ARCH)) $(CONTRIBDIR)/ldso/include
 
 DEFINES   := -DL4_THREAD_SAFE -D__USE_XOPEN2K -D_POSIX_C_SOURCE=200112L \
              -D_GNU_SOURCE=1 -D__NO_WEAK_PTHREAD_ALIASES=1 \
-            -D_LIBC=1 -DIS_IN_libpthread=1
+            -D_LIBC=1 -DIS_IN_libpthread=1 -DNOT_IN_libc=1
+
+DEFINES_x86-l4f := -DUSE___THREAD=1 
 
-CFLAGS    += -include $(PKGDIR)/lib/contrib/uclibc/include/libc-symbols.h
-CXXFLAGS  += -include $(PKGDIR)/lib/contrib/uclibc/include/libc-symbols.h
+CFLAGS    += -include $(CONTRIBDIR)/include/libc-symbols.h
+CXXFLAGS  += -include $(CONTRIBDIR)/include/libc-symbols.h
 CXXFLAGS  += -fno-exceptions
 
 include $(L4DIR)/mk/lib.mk
@@ -36,5 +52,6 @@ CRT0 = $(CRTI_so) $(SO_INIT).s.o $(CRTBEGIN_so) $(CRT1_so)
 
 CFLAGS := $(filter-out -Wextra,$(CFLAGS))
 CXXFLAGS := $(filter-out -Wextra,$(CXXFLAGS))
+PICFLAGS += -DSHARED
 
-r/libpthread.so: $(SO_INIT).s.o
+libpthread.so: $(SO_INIT).s.o