Final set of changes for NPTL and new build system. NPTL can now build with the new build system.

3 files changed, 18 insertions, 219 deletions

diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile b/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile
index 43f4bb409..34d647527 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile
@@ -1,118 +1,13 @@
-# Makefile for uClibc NPTL pthread library (Linux files)
+# Makefile for uClibc NPTL
 #
-# Copyright (C) 2005 Steven J. Hill <sjhill@realitydiluted.com>
+# Copyright (C) 2005 Steven J. Hill <sjhill@uclibc.org>
 #
-# 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.
+# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
-# 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.
-#
-# 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
-include ../../../../Rules.mak
-
-AR_LIBP_CSRC = pt-raise.c pthread_attr_getaffinity.c		\
-	       pthread_attr_setaffinity.c pthread_getaffinity.c	\
-	       pthread_getcpuclockid.c pthread_kill.c		\
-	       pthread_mutex_cond_lock.c pthread_setaffinity.c	\
-	       pthread_yield.c sem_post.c sem_timedwait.c	\
-	       sem_trywait.c sem_wait.c pt-fork.c
-SO_LIBP_CSRC = $(AR_LIBP_CSRC) 
-AR_LIBC_CSRC = libc_pthread_init.c libc_multiple_threads.c	\
-	       register-atfork.c unregister-atfork.c
-SO_LIBC_CSRC = $(AR_LIBC_CSRC)
-
-ifeq ($(strip $(TARGET_ARCH)),alpha)
-AR_LIBC_CSRC += libc-lowlevellock.c
-AR_LIBP_CSRC += lowlevellock.c
-endif
-ifeq ($(strip $(TARGET_ARCH)),mips)
-AR_LIBC_CSRC += libc-lowlevellock.c
-AR_LIBP_CSRC += lowlevellock.c
-endif
-ifeq ($(strip $(TARGET_ARCH)),powerpc)
-AR_LIBC_CSRC += libc-lowlevellock.c
-AR_LIBP_CSRC += lowlevellock.c
-endif
-ifeq ($(strip $(TARGET_ARCH)),sparc)
-AR_LIBC_CSRC += libc-lowlevellock.c
-AR_LIBP_CSRC += lowlevellock.c
-endif
-
-#
-# Needed to get pthread types.
-#
-CFLAGS-pt-fork.c = -D_GNU_SOURCE
-CFLAGS-pthread_getcpuclockid.c = -I$(TOPDIR)/librt
-
-AR_LIBP_COBJS = $(patsubst %.c, %.o, $(AR_LIBP_CSRC))
-SO_LIBP_COBJS = $(patsubst %.c, %.os, $(SO_LIBP_CSRC))
-AR_LIBC_COBJS = $(patsubst %.c, %.o, $(AR_LIBC_CSRC))
-SO_LIBC_COBJS = $(patsubst %.c, %.os, $(SO_LIBC_CSRC))
-
-all: $(AR_LIB_NAME) $(AR_SO_LIB_NAME)
-
-$(AR_LIB_NAME): $(AR_LIBP_COBJS)
-ifeq ($(strip $(PTHREADS_DEBUG_SUPPORT)),y)
-	$(STRIPTOOL) -X --strip-debug -R .note -R .comment $(AR_LIBP_COBJS)
-else
-	$(STRIPTOOL) -x -R .note -R .comment $(AR_LIBP_COBJS)
-endif
-	 $(AR) $(ARFLAGS) $(AR_LIB_NAME) $(AR_LIBP_COBJS)
-
-$(AR_SO_LIB_NAME): $(SO_LIBP_COBJS)
-ifeq ($(strip $(PTHREADS_DEBUG_SUPPORT)),y)
-	$(STRIPTOOL) -X --strip-debug -R .note -R .comment $(SO_LIBP_COBJS)
-else
-	$(STRIPTOOL) -x -R .note -R .comment $(SO_LIBP_COBJS)
-endif
-	 $(AR) $(ARFLAGS) $(AR_SO_LIB_NAME) $(SO_LIBP_COBJS)
-
-obj.pthread.ar: $(AR_LIBC_COBJS)
-ifeq ($(strip $(PTHREADS_DEBUG_SUPPORT)),y)
-	$(STRIPTOOL) -X --strip-debug -R .note -R .comment $(AR_LIBC_COBJS)
-else
-	$(STRIPTOOL) -x -R .note -R .comment $(AR_LIBC_COBJS)
-endif
-	@for objfile in $(AR_LIBC_COBJS); do \
-		echo ../libpthread/nptl/sysdeps/unix/sysv/linux/$$objfile >> \
-			$(TOPDIR)libc/$@; \
-	done
-
-obj.pthread.so: $(SO_LIBC_COBJS)
-ifeq ($(strip $(PTHREADS_DEBUG_SUPPORT)),y)
-	$(STRIPTOOL) -X --strip-debug -R .note -R .comment $(SO_LIBC_COBJS)
-else
-	$(STRIPTOOL) -x -R .note -R .comment $(SO_LIBC_COBJS)
-endif
-	@for objfile in $(SO_LIBC_COBJS); do \
-		echo ../libpthread/nptl/sysdeps/unix/sysv/linux/$$objfile >> \
-			$(TOPDIR)libc/$@; \
-	done
-
-$(AR_LIBP_COBJS): %.o : %.c
-	$(CC) $(CFLAGS-$<) $(CFLAGS-LIBP) -c $< -o $@
-
-$(SO_LIBP_COBJS): %.os : %.c
-	$(CC) $(CFLAGS-$<) $(CFLAGS-LIBP) -DSHARED -c $< -o $@
-
-$(AR_LIBC_COBJS): %.o : %.c
-	$(CC) $(CFLAGS-$<) $(CFLAGS-LIBC) -c $< -o $@
-
-$(SO_LIBC_COBJS): %.os : %.c
-	$(CC) $(CFLAGS-$<) $(CFLAGS-LIBC) -DSHARED -c $< -o $@
-
-clean:
-	$(RM) *.o *.os *~ core
 
-.PHONY: $(AR_LIB_NAME) $(AR_SO_LIB_NAME)
+top_srcdir=../../../../../../
+top_builddir=../../../../../../
+all: objs
+include $(top_builddir)Rules.mak
+include Makefile.in
+include $(top_srcdir)Makerules
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/libc_pthread_init.c b/libpthread/nptl/sysdeps/unix/sysv/linux/libc_pthread_init.c
index 3d1c02181..cf5150341 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/libc_pthread_init.c
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/libc_pthread_init.c
@@ -20,7 +20,6 @@
 #include <unistd.h>
 #include <list.h>
 #include "fork.h"
-#include <dl-sysdep.h>
 #include <tls.h>
 #include <string.h>
 #include <pthreadP.h>
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/mips/Makefile b/libpthread/nptl/sysdeps/unix/sysv/linux/mips/Makefile
index 084708397..43a6fad84 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/mips/Makefile
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/mips/Makefile
@@ -1,108 +1,13 @@
-# Makefile for uClibc NPTL pthread library (Linux/MIPS)
+# Makefile for uClibc NPTL
 #
-# Copyright (C) 2005 Steven J. Hill <sjhill@realitydiluted.com>
+# Copyright (C) 2005 Steven J. Hill <sjhill@uclibc.org>
 #
-# 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.
+# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
-# 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.
-#
-# 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
-include ../../../../../Rules.mak
-
-#AR_LIBP_ASRC = pt-vfork.S clone.S
-AR_LIBP_ASRC = pt-vfork.S
-SO_LIBP_ASRC = $(AR_LIBP_ASRC)
-AR_LIBP_CSRC = pthread_once.c
-SO_LIBP_CSRC = $(AR_LIBP_CSRC)
-AR_LIBC_CSRC = fork-nptl.c
-SO_LIBC_CSRC = $(AR_LIBC_CSRC)
-
-AR_LIBP_AOBJS = $(patsubst %.S, %.o, $(AR_LIBP_ASRC))
-SO_LIBP_AOBJS = $(patsubst %.S, %.os, $(SO_LIBP_ASRC))
-AR_LIBP_COBJS = $(patsubst %.c, %.o, $(AR_LIBP_CSRC))
-SO_LIBP_COBJS = $(patsubst %.c, %.os, $(SO_LIBP_CSRC))
-AR_LIBC_COBJS = $(patsubst %.c, %.o, $(AR_LIBC_CSRC))
-SO_LIBC_COBJS = $(patsubst %.c, %.os, $(SO_LIBC_CSRC))
-
-ifeq ($(UCLIBC_HAS_STDIO_FUTEXES),y)
-CFLAGS-fork-nptl.c = -D__USE_STDIO_FUTEXES__
-endif
-
-all: $(AR_LIB_NAME) $(AR_SO_LIB_NAME)
-
-$(AR_LIB_NAME): $(AR_LIBP_AOBJS) $(AR_LIBP_COBJS)
-ifeq ($(strip $(PTHREADS_DEBUG_SUPPORT)),y)
-	$(STRIPTOOL) -X --strip-debug -R .note -R .comment	\
-		$(AR_LIBP_AOBJS) $(AR_LIBP_COBJS)
-else
-	$(STRIPTOOL) -x -R .note -R .comment			\
-		$(AR_LIBP_AOBJS) $(AR_LIBP_COBJS)
-endif
-	$(AR) $(ARFLAGS) $(AR_LIB_NAME) $(AR_LIBP_AOBJS) $(AR_LIBP_COBJS)
-
-$(AR_SO_LIB_NAME): $(SO_LIBP_AOBJS) $(SO_LIBP_COBJS)
-ifeq ($(strip $(PTHREADS_DEBUG_SUPPORT)),y)
-	$(STRIPTOOL) -X --strip-debug -R .note -R .comment	\
-		$(SO_LIBP_AOBJS) $(SO_LIBP_COBJS)
-else
-	$(STRIPTOOL) -x -R .note -R .comment			\
-		$(SO_LIBP_AOBJS) $(SO_LIBP_COBJS)
-endif
-	$(AR) $(ARFLAGS) $(AR_SO_LIB_NAME) $(SO_LIBP_AOBJS) $(SO_LIBP_COBJS)
-
-obj.pthread.ar: $(AR_LIBC_COBJS)
-ifeq ($(strip $(PTHREADS_DEBUG_SUPPORT)),y)
-	$(STRIPTOOL) -X --strip-debug -R .note -R .comment $(AR_LIBC_COBJS)
-else
-	$(STRIPTOOL) -x -R .note -R .comment $(AR_LIBC_COBJS)
-endif
-	@for objfile in $(AR_LIBC_COBJS); do \
-		echo ../libpthread/nptl/sysdeps/unix/sysv/linux/mips/$$objfile \
-			>> $(TOPDIR)libc/$@; \
-	done
-
-obj.pthread.so: $(SO_LIBC_COBJS)
-ifeq ($(strip $(PTHREADS_DEBUG_SUPPORT)),y)
-	$(STRIPTOOL) -X --strip-debug -R .note -R .comment $(SO_LIBC_COBJS)
-else
-	$(STRIPTOOL) -x -R .note -R .comment $(SO_LIBC_COBJS)
-endif
-	@for objfile in $(SO_LIBC_COBJS); do \
-		echo ../libpthread/nptl/sysdeps/unix/sysv/linux/mips/$$objfile \
-			>> $(TOPDIR)libc/$@; \
-	done
-
-$(AR_LIBP_AOBJS): %.o : %.S
-	$(CC) $(ASFLAGS-LIBP) -c $< -o $@
-
-$(SO_LIBP_AOBJS): %.os : %.S
-	$(CC) $(ASFLAGS-LIBP) -DSHARED -c $< -o $@
-
-$(AR_LIBP_COBJS): %.o : %.c
-	$(CC) $(CFLAGS-$<) $(CFLAGS-LIBP) -c $< -o $@
-
-$(SO_LIBP_COBJS): %.os : %.c
-	$(CC) $(CFLAGS-$<) $(CFLAGS-LIBP) -DSHARED -c $< -o $@
-
-$(AR_LIBC_COBJS): %.o : %.c
-	$(CC) $(CFLAGS-$<) $(CFLAGS-LIBC) -c $< -o $@
-
-$(SO_LIBC_COBJS): %.os : %.c
-	$(CC) $(CFLAGS-$<) $(CFLAGS-LIBC) -DSHARED -c $< -o $@
-
-clean:
-	$(RM) *.o *.os *~ core
 
-.PHONY: $(AR_LIB_NAME) $(AR_SO_LIB_NAME)
+top_srcdir=../../../../../../../
+top_builddir=../../../../../../../
+all: objs
+include $(top_builddir)Rules.mak
+include Makefile.arch
+include $(top_srcdir)Makerules